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

Timestamp:

11/29/12 11:31:44 (12 years ago)

Author:

abeham

Message:

#1985:

• Moved arithmetic progression dialog to MainForm (created a folder dialogs)
• Added a button to generate such a progression for snapshot times
• Changed TimeLimitRun to react on ExecutionTimeChanged instead of maintaining its own timers
• Changed to allow manual snapshoting only during Paused state
• Perform a pause + snapshot when terminating the algorithm instead of stop + snapshot (allows the algorithm in the final snapshot to continue running if the option was selected)

Location:

branches/RuntimeOptimizer/HeuristicLab.Optimization.Views/3.3

Files:

• TimeLimitRunView.Designer.cs (modified) (5 diffs)
• TimeLimitRunView.cs (modified) (2 diffs)

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

@@ -51 +51 @@
       this.openFileDialog = new System.Windows.Forms.OpenFileDialog();
       this.snapshotButton = new System.Windows.Forms.Button();
+      this.sequenceButton = new System.Windows.Forms.Button();
       ((System.ComponentModel.ISupportInitialize)(this.errorProvider)).BeginInit();
       this.tabControl.SuspendLayout();
@@ -135 +136 @@
       this.snapshotsTextBox.Location = new System.Drawing.Point(69, 52);
       this.snapshotsTextBox.Name = "snapshotsTextBox";
-      this.snapshotsTextBox.Size = new System.Drawing.Size(259, 20);
+      this.snapshotsTextBox.Size = new System.Drawing.Size(175, 20);
       this.snapshotsTextBox.TabIndex = 6;
       this.snapshotsTextBox.Validating += new System.ComponentModel.CancelEventHandler(this.snapshotsTextBox_Validating);
@@ -286 +287 @@
       this.snapshotButton.Click += new System.EventHandler(this.snapshotButton_Click);
       // 
+      // sequenceButton
+      // 
+      this.sequenceButton.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
+      this.sequenceButton.Location = new System.Drawing.Point(250, 50);
+      this.sequenceButton.Name = "sequenceButton";
+      this.sequenceButton.Size = new System.Drawing.Size(75, 23);
+      this.sequenceButton.TabIndex = 16;
+      this.sequenceButton.Text = "Sequence...";
+      this.sequenceButton.UseVisualStyleBackColor = true;
+      this.sequenceButton.Click += new System.EventHandler(this.sequenceButton_Click);
+      // 
       // TimeLimitRunView
       // 
       this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Inherit;
+      this.Controls.Add(this.sequenceButton);
       this.Controls.Add(this.snapshotButton);
       this.Controls.Add(this.tabControl);
@@ -314 +327 @@
       this.Controls.SetChildIndex(this.startButton, 0);
       this.Controls.SetChildIndex(this.snapshotButton, 0);
+      this.Controls.SetChildIndex(this.sequenceButton, 0);
       ((System.ComponentModel.ISupportInitialize)(this.errorProvider)).EndInit();
       this.tabControl.ResumeLayout(false);
@@ -342 +356 @@
     private System.Windows.Forms.OpenFileDialog openFileDialog;
     private System.Windows.Forms.Button snapshotButton;
+    private System.Windows.Forms.Button sequenceButton;
   }
 }

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

@@ -114 +114 @@
     protected override void SetEnabledStateOfExecutableButtons() {
       base.SetEnabledStateOfExecutableButtons();
-      snapshotButton.Enabled = Content != null && (Content.ExecutionState == ExecutionState.Started || Content.ExecutionState == ExecutionState.Paused);
+      snapshotButton.Enabled = Content != null && Content.Algorithm != null && Content.ExecutionState == ExecutionState.Paused;
     }
 
@@ -290 +290 @@
     private void snapshotButton_Click(object sender, EventArgs e) {
       Content.Snapshot();
+    }
+
+    private void sequenceButton_Click(object sender, EventArgs e) {
+      using (var dialog = new DefineArithmeticProgressionDialog(false, 1, Content.MaximumExecutionTime.TotalSeconds, 1)) {
+        if (dialog.ShowDialog() == DialogResult.OK) {
+          Content.SnapshotTimes = new ObservableList<TimeSpan>(dialog.Values.Select(TimeSpan.FromSeconds));
+        }
+      }
     }
     #endregion