Changeset 8145 for trunk/sources/HeuristicLab.MainForm/3.3

Timestamp:

06/28/12 12:00:51 (12 years ago)

Author:

ascheibe

Message:

#1762 implemented review comments:

• removed self disposing. The progress view now reacts if a progress is set and Finish() is now called on the progress object and not the view.
• Moved Cancel event from ProgressView to Progress
• throw ArgumentNullException if the parent view is null

Location:

trunk/sources/HeuristicLab.MainForm/3.3

Files:

• Interfaces/IProgress.cs (modified) (1 diff)
• Progress.cs (modified) (2 diffs)

trunk/sources/HeuristicLab.MainForm/3.3/Interfaces/IProgress.cs

@@ -28 +28 @@
 
     void Finish();
+    void SignalSuccessfulCancelation();
 
     event EventHandler Finished;
     event EventHandler StatusChanged;
     event EventHandler ProgressValueChanged;
+
+    bool CancelRequested { get; set; }
+    event EventHandler Canceled;
+
+
   }
 }

trunk/sources/HeuristicLab.MainForm/3.3/Progress.cs

@@ -37 +37 @@
     }
 
+    public bool CancelRequested { get; set; }
+
     private double progressValue;
     public double ProgressValue {
@@ -60 +62 @@
     }
 
+    public void SignalSuccessfulCancelation() {
+      OnCanceled();
+    }
+
     #region Event Handler
+    public event EventHandler Canceled;
+    private void OnCanceled() {
+      var handler = Canceled;
+      try {
+        if (handler != null) handler(this, EventArgs.Empty);
+      }
+      catch (Exception) { }
+    }
+
     public event EventHandler Finished;
     private void OnFinished() {