Changeset 8956 for branches/RuntimeOptimizer/HeuristicLab.Optimization.Views

Timestamp:

11/28/12 01:59:10 (12 years ago)

Author:

abeham

Message:

#1985:

• Removed .resx file
• Fixed bugs

Location:

branches/RuntimeOptimizer/HeuristicLab.Optimization.Views/3.3

Files:

• HeuristicLab.Optimization.Views-3.3.csproj (modified) (1 diff)
• TimeLimitRunView.Designer.cs (modified) (7 diffs)
• TimeLimitRunView.cs (modified) (9 diffs)
• TimeLimitRunView.resx (deleted)

branches/RuntimeOptimizer/HeuristicLab.Optimization.Views/3.3/HeuristicLab.Optimization.Views-3.3.csproj

@@ -398 +398 @@
     </ProjectReference>
   </ItemGroup>
-  <ItemGroup>
-    <EmbeddedResource Include="TimeLimitRunView.resx">
-      <DependentUpon>TimeLimitRunView.cs</DependentUpon>
-    </EmbeddedResource>
-  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 

branches/RuntimeOptimizer/HeuristicLab.Optimization.Views/3.3/TimeLimitRunView.Designer.cs

@@ -50 +50 @@
       this.runsView = new HeuristicLab.Optimization.Views.RunCollectionView();
       this.openFileDialog = new System.Windows.Forms.OpenFileDialog();
+      this.snapshotButton = new System.Windows.Forms.Button();
       ((System.ComponentModel.ISupportInitialize)(this.errorProvider)).BeginInit();
       this.tabControl.SuspendLayout();
@@ -109 +110 @@
       this.timeLimitTextBox.Size = new System.Drawing.Size(338, 20);
       this.timeLimitTextBox.TabIndex = 17;
-      this.timeLimitTextBox.Leave += new System.EventHandler(this.timeLimitTextBox_Leave);
       this.timeLimitTextBox.Validating += new System.ComponentModel.CancelEventHandler(this.timeLimitTextBox_Validating);
       // 
@@ -127 +127 @@
       this.snapShotsTextBox.Location = new System.Drawing.Point(69, 52);
       this.snapShotsTextBox.Name = "snapShotsTextBox";
-      this.snapShotsTextBox.Size = new System.Drawing.Size(148, 20);
+      this.snapShotsTextBox.Size = new System.Drawing.Size(142, 20);
       this.snapShotsTextBox.TabIndex = 17;
       // 
@@ -266 +266 @@
       this.openFileDialog.Title = "Open Optimizer";
       // 
+      // snapshotButton
+      // 
+      this.snapshotButton.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
+      this.snapshotButton.Location = new System.Drawing.Point(120, 440);
+      this.snapshotButton.Name = "snapshotButton";
+      this.snapshotButton.Size = new System.Drawing.Size(24, 24);
+      this.snapshotButton.TabIndex = 20;
+      this.snapshotButton.Text = "Snapshot";
+      this.snapshotButton.UseVisualStyleBackColor = true;
+      this.snapshotButton.Click += new System.EventHandler(this.snapshotButton_Click);
+      // 
       // TimeLimitRunView
       // 
-      this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
-      this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+      this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Inherit;
+      this.Controls.Add(this.snapshotButton);
       this.Controls.Add(this.tabControl);
       this.Controls.Add(this.timeLimitTextBox);
@@ -283 +294 @@
       this.Controls.SetChildIndex(this.timeLimitLabel, 0);
       this.Controls.SetChildIndex(this.timeLimitTextBox, 0);
+      this.Controls.SetChildIndex(this.tabControl, 0);
       this.Controls.SetChildIndex(this.nameLabel, 0);
       this.Controls.SetChildIndex(this.nameTextBox, 0);
@@ -292 +304 @@
       this.Controls.SetChildIndex(this.executionTimeTextBox, 0);
       this.Controls.SetChildIndex(this.startButton, 0);
-      this.Controls.SetChildIndex(this.tabControl, 0);
+      this.Controls.SetChildIndex(this.snapshotButton, 0);
       ((System.ComponentModel.ISupportInitialize)(this.errorProvider)).EndInit();
       this.tabControl.ResumeLayout(false);
@@ -320 +332 @@
     private RunCollectionView runsView;
     private System.Windows.Forms.OpenFileDialog openFileDialog;
+    private System.Windows.Forms.Button snapshotButton;
   }
 }

branches/RuntimeOptimizer/HeuristicLab.Optimization.Views/3.3/TimeLimitRunView.cs

@@ -25 +25 @@
 using System.Windows.Forms;
 using HeuristicLab.Common;
+using HeuristicLab.Common.Resources;
 using HeuristicLab.Core;
 using HeuristicLab.Core.Views;
@@ -45 +46 @@
     public TimeLimitRunView() {
       InitializeComponent();
+      snapshotButton.Text = String.Empty;
+      snapshotButton.Image = VSImageLibrary.Breakpoint;
     }
 
@@ -69 +72 @@
       try {
         if (Content == null) {
-          timeLimitTextBox.Tag = TimeSpan.FromSeconds(60);
-          timeLimitTextBox.Text = FormatTimeSpan((TimeSpan)timeLimitTextBox.Tag);
+          timeLimitTextBox.Text = FormatTimeSpan(TimeSpan.FromSeconds(60));
           snapShotsTextBox.Text = String.Empty;
           storeAlgorithmInEachSnapshotCheckBox.Checked = false;
@@ -77 +79 @@
           runsView.Content = null;
         } else {
-          timeLimitTextBox.Tag = Content.MaximumExecutionTime;
           timeLimitTextBox.Text = FormatTimeSpan(Content.MaximumExecutionTime);
           snapShotsTextBox.Text = String.Join(" ; ", Content.SnapshotTimes);
@@ -87 +88 @@
       } finally { SuppressEvents = false; }
     }
+
     protected override void SetEnabledStateOfControls() {
       base.SetEnabledStateOfControls();
@@ -99 +101 @@
     }
 
+    protected override void SetEnabledStateOfExecutableButtons() {
+      base.SetEnabledStateOfExecutableButtons();
+      snapshotButton.Enabled = Content != null && (Content.ExecutionState == ExecutionState.Started || Content.ExecutionState == ExecutionState.Paused);
+    }
+
     protected override void OnClosed(FormClosedEventArgs e) {
       if ((Content != null) && (Content.ExecutionState == ExecutionState.Started)) {
@@ -151 +158 @@
 
     #region Control events
-    private void timeLimitTextBox_Leave(object sender, EventArgs e) {
-      if (SuppressEvents) return;
-      SuppressEvents = true;
-      try {
-        timeLimitTextBox.Text = FormatTimeSpan((TimeSpan)timeLimitTextBox.Tag);
-      } finally { SuppressEvents = false; }
-    }
-
     private void timeLimitTextBox_Validating(object sender, CancelEventArgs e) {
       if (SuppressEvents) return;
@@ -179 +178 @@
           ts = GetTimeSpanFromFormat(value, text.Substring(length - 1, text.Length - (length - 1)).TrimStart());
         } else ts = TimeSpan.FromSeconds(value);
-        timeLimitTextBox.Tag = ts;
+        Content.MaximumExecutionTime = ts;
         e.Cancel = false;
         errorProvider.SetError(timeLimitTextBox, String.Empty);
@@ -252 +251 @@
       }
     }
+
+    private void snapshotButton_Click(object sender, EventArgs e) {
+      Content.Snapshot();
+    }
     #endregion
     #endregion