Changeset 9933 for stable/HeuristicLab.MainForm

Timestamp:

09/03/13 15:55:36 (11 years ago)

Author:

ascheibe

Message:

#1042 merged r9849, r9851, r9865, r9867, r9868, r9893, r9894, r9895, r9896, r9900, r9901, r9905, r9907 into stable branch

Location:

stable

Files:

• . (modified) (1 prop)
• HeuristicLab.MainForm/3.3/Interfaces/IProgress.cs (modified) (3 diffs)
• HeuristicLab.MainForm/3.3/Progress.cs (modified) (8 diffs)

stable/HeuristicLab.MainForm/3.3/Interfaces/IProgress.cs

@@ -28 +28 @@
   public interface IProgress : IContent {
     /// <summary>
-    /// Gets the currently associated status text with the progress.
+    /// Gets or sets the currently associated status text with the progress.
     /// </summary>
-    string Status { get; }
+    string Status { get; set; }
     /// <summary>
-    /// Gets the currently associated progress value in the range (0;1].
+    /// Gets or sets the currently associated progress value in the range (0;1].
     ///  Values outside this range are permitted and need to be handled in some feasible manner.
     /// </summary>
-    double ProgressValue { get; }
+    double ProgressValue { get; set; }
     /// <summary>
-    /// Gets the current state of the progress. Every progress starts in state
+    /// Gets or sets the current state of the progress. Every progress starts in state
     /// Started and then becomes either Canceled or Finished.
     /// If it is reused it may be Started again.
@@ -54 +54 @@
     /// </summary>
     /// <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();
+    /// <summary>
+    /// Sets the ProgressValue to 1 and the ProgressState to Finished.
+    /// </summary>
+    void Finish();
+
+    /// <summary>
+    /// Starts or restarts a Progress. 
+    /// </summary>
+    void Start();
+
+    void Start(string status);
 
     /// <summary>
@@ -74 +84 @@
     event EventHandler CanBeCanceledChanged;
     /// <summary>
-    /// A cancelation is requested with a certain timeout (in ms) in which it should occur gracefully. If the timeout is surpassed, it should be forcibly canceled.
+    /// A cancelation is requested.
     /// </summary>
-    event EventHandler<EventArgs<int>> CancelRequested;
+    event EventHandler CancelRequested;
   }
 }

stable/HeuristicLab.MainForm/3.3/Progress.cs

@@ -21 +21 @@
 
 using System;
-using HeuristicLab.Common;
 
 namespace HeuristicLab.MainForm {
@@ -50 +49 @@
     public ProgressState ProgressState {
       get { return progressState; }
-      set {
+      private set {
         if (progressState != value) {
           progressState = value;
@@ -70 +69 @@
 
     public Progress() {
-      progressState = ProgressState.Started;
+      progressState = ProgressState.Finished;
+      canBeCanceled = false;
     }
     public Progress(string status)
@@ -76 +76 @@
       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() {
       if (canBeCanceled)
-        OnCancelRequested(timeoutMs);
+        OnCancelRequested();
     }
 
-    /// <summary>
-    /// Sets the ProgressValue to 1 and the ProgressState to Finished.
-    /// </summary>
     public void Finish() {
       if (ProgressValue != 1.0) ProgressValue = 1.0;
       ProgressState = ProgressState.Finished;
+    }
+
+    public void Start() {
+      ProgressValue = 0.0;
+      ProgressState = ProgressState.Started;
+    }
+
+    public void Start(string status) {
+      Start();
+      Status = status;
     }
 
@@ -98 +106 @@
     private void OnStatusChanged() {
       var handler = StatusChanged;
-      try {
-        if (handler != null) handler(this, EventArgs.Empty);
-      } catch { }
+      if (handler != null) handler(this, EventArgs.Empty);
     }
 
@@ -106 +112 @@
     private void OnProgressChanged() {
       var handler = ProgressValueChanged;
-      try {
-        if (handler != null) handler(this, EventArgs.Empty);
-      } catch { }
+      if (handler != null) handler(this, EventArgs.Empty);
     }
 
@@ -114 +118 @@
     private void OnProgressStateChanged() {
       var handler = ProgressStateChanged;
-      try {
-        if (handler != null) handler(this, EventArgs.Empty);
-      } catch { }
+      if (handler != null) handler(this, EventArgs.Empty);
     }
 
@@ -122 +124 @@
     private void OnCanBeCanceledChanged() {
       var handler = CanBeCanceledChanged;
-      try {
-        if (handler != null) handler(this, EventArgs.Empty);
-      } catch { }
+      if (handler != null) handler(this, EventArgs.Empty);
     }
 
-    public event EventHandler<EventArgs<int>> CancelRequested;
-    private void OnCancelRequested(int timeoutMs) {
+    public event EventHandler CancelRequested;
+    private void OnCancelRequested() {
       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, EventArgs.Empty);
     }
     #endregion