Changeset 8331 for branches/ScatterSearch (trunk integration)/HeuristicLab.MainForm/3.3

Timestamp:

07/26/12 09:51:13 (12 years ago)

Author:

jkarder

Message:

#1331: merged r8086:8330 from trunk

Location:

branches/ScatterSearch (trunk integration)

Files:

• . (modified) (2 props)
• HeuristicLab.MainForm/3.3/HeuristicLab.MainForm-3.3.csproj (modified) (1 diff)
• HeuristicLab.MainForm/3.3/Interfaces/IProgress.cs (modified) (1 diff)
• HeuristicLab.MainForm/3.3/Interfaces/IProgressReporter.cs (deleted)
• HeuristicLab.MainForm/3.3/Plugin.cs.frame (modified) (1 diff)
• HeuristicLab.MainForm/3.3/Progress.cs (modified) (6 diffs)
• HeuristicLab.MainForm/3.3/Properties/AssemblyInfo.cs.frame (modified) (1 diff)

branches/ScatterSearch (trunk integration)

@@ -21 +21 @@
 protoc.exe
 _ReSharper.HeuristicLab 3.3 Tests
+Google.ProtocolBuffers-2.4.1.473.dll

@@ -21 +21 @@
 protoc.exe
 _ReSharper.HeuristicLab 3.3 Tests
+Google.ProtocolBuffers-2.4.1.473.dll

branches/ScatterSearch (trunk integration)/HeuristicLab.MainForm/3.3/HeuristicLab.MainForm-3.3.csproj

@@ -117 +117 @@
     <Compile Include="Interfaces\IConfigureableView.cs" />
     <Compile Include="Interfaces\IProgress.cs" />
-    <Compile Include="Interfaces\IProgressReporter.cs" />
     <Compile Include="Plugin.cs" />
     <Compile Include="Progress.cs" />

branches/ScatterSearch (trunk integration)/HeuristicLab.MainForm/3.3/Interfaces/IProgress.cs

@@ -21 +21 @@
 
 using System;
+using HeuristicLab.Common;
 
 namespace HeuristicLab.MainForm {
-  public interface IProgress {
-    string Status { get; set; }
-    double ProgressValue { get; set; }
+  public enum ProgressState { Started = 1, Canceled = 2, Finished = 3 };
 
-    void Finish();
+  public interface IProgress : IContent {
+    /// <summary>
+    /// Gets the currently associated status text with the progress.
+    /// </summary>
+    string Status { get; }
+    /// <summary>
+    /// Gets 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; }
+    /// <summary>
+    /// Gets 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.
+    /// </summary>
+    ProgressState ProgressState { get; }
+    /// <summary>
+    /// Returns whether the operation can be canceled or not.
+    /// This can change during the course of the progress.
+    /// </summary>
+    bool CanBeCanceled { get; }
 
-    event EventHandler Finished;
+    /// <summary>
+    /// Requests the operation behind the process to cancel.
+    /// Check the !ProgressState property when the cancellation succeeded.
+    /// The corresponding event will also notify of a success.
+    /// </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);
+
+    /// <summary>
+    /// The status text changed.
+    /// </summary>
     event EventHandler StatusChanged;
+    /// <summary>
+    /// The value of the progress changed. This is the (0;1] progress value from starting to finish. Values outside this range are permitted and need to be handled in some feasible manner.
+    /// </summary>
     event EventHandler ProgressValueChanged;
+    /// <summary>
+    /// The state of the progress changed. The handler is supposed to query the ProgressState property.
+    /// </summary>
+    event EventHandler ProgressStateChanged;
+    /// <summary>
+    /// The progress' ability to cancel changed.
+    /// </summary>
+    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.
+    /// </summary>
+    event EventHandler<EventArgs<int>> CancelRequested;
   }
 }

branches/ScatterSearch (trunk integration)/HeuristicLab.MainForm/3.3/Plugin.cs.frame

@@ -26 +26 @@
 
 namespace HeuristicLab.MainForm {
-  [Plugin("HeuristicLab.MainForm", "3.3.6.$WCREV$")]
+  [Plugin("HeuristicLab.MainForm", "3.3.7.$WCREV$")]
   [PluginFile("HeuristicLab.MainForm-3.3.dll", PluginFileType.Assembly)]
   [PluginDependency("HeuristicLab.Common", "3.3")]

branches/ScatterSearch (trunk integration)/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

branches/ScatterSearch (trunk integration)/HeuristicLab.MainForm/3.3/Properties/AssemblyInfo.cs.frame

@@ -54 +54 @@
 // by using the '*' as shown below:
 [assembly: AssemblyVersion("3.3.0.0")]
-[assembly: AssemblyFileVersion("3.3.6.$WCREV$")]
+[assembly: AssemblyFileVersion("3.3.7.$WCREV$")]

@@ -21 +21 @@
 protoc.exe
 _ReSharper.HeuristicLab 3.3 Tests
+Google.ProtocolBuffers-2.4.1.473.dll