Changeset 9893 for trunk/sources/HeuristicLab.MainForm

Timestamp:

08/21/13 23:08:47 (11 years ago)

Author:

ascheibe

Message:

#1042

• applied mkommends progress view patch
• adapted Hive views accordingly
• made some minor improvements (more to come...)

Location:

trunk/sources/HeuristicLab.MainForm/3.3

Files:

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

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

@@ -55 +55 @@
     /// <exception cref="NotSupportedException">Thrown when cancellation is not supported.</exception>
     /// <param name="timeoutMs">The operation is given a certain timeout to cancel. If the operation doesn't cancel in this time it will be forcibly closed.</param>
-    void Cancel(int timeoutMs);
+    void Cancel(int timeoutMs = 0);
     /// <summary>
     /// Sets the ProgressValue to 1 and the ProgressState to Finished.
     /// </summary>
     void Finish();
+
+    void Start(string status);
+
+    void Start();
 
     /// <summary>

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

@@ -70 +70 @@
 
     public Progress() {
-      progressState = ProgressState.Started;
+      progressState = ProgressState.Finished;
+      canBeCanceled = false;
     }
     public Progress(string status)
@@ -76 +77 @@
       this.status = status;
     }
-    public Progress(string status, double progressValue)
-      : this(status) {
-      this.progressValue = progressValue;
+    public Progress(string status, ProgressState state)
+      : this() {
+      this.status = status;
+      this.progressState = state;
     }
 
-    public void Cancel(int timeoutMs) {
+    public void Cancel(int timeoutMs = 0) {
       if (canBeCanceled)
         OnCancelRequested(timeoutMs);
@@ -91 +93 @@
     }
 
+    public void Start() {
+      ProgressValue = 0.0;
+      ProgressState = ProgressState.Started;
+    }
+
+    public void Start(string status) {
+      Start();
+      Status = status;
+    }
+
     #region Event Handler
     public event EventHandler StatusChanged;
     private void OnStatusChanged() {
       var handler = StatusChanged;
-      try {
-        if (handler != null) handler(this, EventArgs.Empty);
-      } catch { }
+      if (handler != null) handler(this, EventArgs.Empty);
     }
 
@@ -103 +113 @@
     private void OnProgressChanged() {
       var handler = ProgressValueChanged;
-      try {
-        if (handler != null) handler(this, EventArgs.Empty);
-      } catch { }
+      if (handler != null) handler(this, EventArgs.Empty);
     }
 
@@ -111 +119 @@
     private void OnProgressStateChanged() {
       var handler = ProgressStateChanged;
-      try {
-        if (handler != null) handler(this, EventArgs.Empty);
-      } catch { }
+      if (handler != null) handler(this, EventArgs.Empty);
     }
 
@@ -119 +125 @@
     private void OnCanBeCanceledChanged() {
       var handler = CanBeCanceledChanged;
-      try {
-        if (handler != null) handler(this, EventArgs.Empty);
-      } catch { }
+      if (handler != null) handler(this, EventArgs.Empty);
+
     }
 
@@ -127 +132 @@
     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 { }
+      if (handler != null) throw new NotSupportedException("Cancel request was ignored.");
+      else handler(this, new EventArgs<int>(timeoutMs));
     }
     #endregion