Changeset 8206 for branches/GP-MoveOperators/HeuristicLab.MainForm/3.3/Progress.cs

Timestamp:

07/03/12 16:46:35 (12 years ago)

Author:

gkronber

Message:

#1847: merged r8084:8205 from trunk into GP move operators branch

Location:

branches/GP-MoveOperators

Files:

• . (modified) (1 prop)
• HeuristicLab.MainForm/3.3/Progress.cs (modified) (6 diffs)

branches/GP-MoveOperators/HeuristicLab.MainForm/3.3/Progress.cs

@@ -21 +21 @@
 
 using System;
+using HeuristicLab.Common;
 
 namespace HeuristicLab.MainForm {
@@ -26 +27 @@
     private string status;
     public string Status {
-      get {
-        return this.status;
-      }
+      get { return status; }
       set {
-        if (this.status != value) {
-          this.status = value;
+        if (status != value) {
+          status = value;
           OnStatusChanged();
         }
@@ -39 +38 @@
     private double progressValue;
     public double ProgressValue {
-      get {
-        return this.progressValue;
-      }
+      get { return progressValue; }
       set {
-        if (this.progressValue != value) {
-          this.progressValue = value;
+        if (progressValue != value) {
+          progressValue = value;
           OnProgressChanged();
         }
@@ -50 +47 @@
     }
 
-    public Progress() { }
-
-    public Progress(string status) {
-      this.Status = status;
+    private ProgressState progressState;
+    public ProgressState ProgressState {
+      get { return progressState; }
+      set {
+        if (progressState != value) {
+          progressState = value;
+          OnProgressStateChanged();
+        }
+      }
     }
 
+    private bool canBeCanceled;
+    public bool CanBeCanceled {
+      get { return canBeCanceled; }
+      set {
+        if (canBeCanceled != value) {
+          canBeCanceled = value;
+          OnCanBeCanceledChanged();
+        }
+      }
+    }
+
+    public Progress() {
+      progressState = ProgressState.Started;
+    }
+    public Progress(string status)
+      : this() {
+      this.status = status;
+    }
+    public Progress(string status, double progressValue)
+      : this(status) {
+      this.progressValue = progressValue;
+    }
+
+    public void Cancel(int timeoutMs) {
+      if (canBeCanceled)
+        OnCancelRequested(timeoutMs);
+    }
+
+    /// <summary>
+    /// Sets the ProgressValue to 1 and the ProgressState to Finished.
+    /// </summary>
     public void Finish() {
-      OnFinished();
+      if (ProgressValue != 1.0) ProgressValue = 1.0;
+      ProgressState = ProgressState.Finished;
     }
 
     #region Event Handler
-    public event EventHandler Finished;
-    private void OnFinished() {
-      var handler = Finished;
-      try {
-        if (handler != null) handler(this, EventArgs.Empty);
-      }
-      catch (Exception) { }
-    }
-
     public event EventHandler StatusChanged;
     private void OnStatusChanged() {
@@ -75 +100 @@
       try {
         if (handler != null) handler(this, EventArgs.Empty);
-      }
-      catch (Exception) { }
+      } catch { }
     }
 
@@ -84 +108 @@
       try {
         if (handler != null) handler(this, EventArgs.Empty);
-      }
-      catch (Exception) { }
+      } catch { }
+    }
+
+    public event EventHandler ProgressStateChanged;
+    private void OnProgressStateChanged() {
+      var handler = ProgressStateChanged;
+      try {
+        if (handler != null) handler(this, EventArgs.Empty);
+      } catch { }
+    }
+
+    public event EventHandler CanBeCanceledChanged;
+    private void OnCanBeCanceledChanged() {
+      var handler = CanBeCanceledChanged;
+      try {
+        if (handler != null) handler(this, EventArgs.Empty);
+      } catch { }
+    }
+
+    public event EventHandler<EventArgs<int>> CancelRequested;
+    private void OnCancelRequested(int timeoutMs) {
+      var handler = CancelRequested;
+      try {
+        if (handler == null) throw new NotSupportedException("Cancel request was ignored.");
+        else handler(this, new EventArgs<int>(timeoutMs));
+      } catch { }
     }
     #endregion