Changeset 8165 for trunk/sources/HeuristicLab.Clients.Hive.Views/3.3/HiveTasks

Timestamp:

06/29/12 23:12:32 (13 years ago)

Author:

abeham

Message:

#1762: Some changes to progress handling, see the ticket for more details

File:

• trunk/sources/HeuristicLab.Clients.Hive.Views/3.3/HiveTasks/OptimizerHiveTaskView.cs (modified) (6 diffs)

trunk/sources/HeuristicLab.Clients.Hive.Views/3.3/HiveTasks/OptimizerHiveTaskView.cs

@@ -31 +31 @@
   [Content(typeof(OptimizerHiveTask), true)]
   public partial class OptimizerHiveTaskView : HiveTaskView {
-    private ProgressView progressView;
-    private IProgress progress;
+    private Progress progress;
 
     public new OptimizerHiveTask Content {
@@ -45 +44 @@
     public OptimizerHiveTaskView() {
       InitializeComponent();
-      progressView = new ProgressView(this);
+      progress = new Progress() {
+        CanBeCanceled = false
+      };
     }
 
@@ -76 +77 @@
       var task = System.Threading.Tasks.Task.Factory.StartNew(ResumeTaskAsync);
       task.ContinueWith((t) => {
-        FinishProgressView();
+        progress.Finish();
         ErrorHandling.ShowErrorDialog(this, "An error occured while resuming the task.", t.Exception);
       }, TaskContinuationOptions.OnlyOnFaulted);
@@ -84 +85 @@
       var task = System.Threading.Tasks.Task.Factory.StartNew(PauseTaskAsync);
       task.ContinueWith((t) => {
-        FinishProgressView();
+        progress.Finish();
         ErrorHandling.ShowErrorDialog(this, "An error occured while pausing the task.", t.Exception);
       }, TaskContinuationOptions.OnlyOnFaulted);
@@ -92 +93 @@
       var task = System.Threading.Tasks.Task.Factory.StartNew(StopTaskAsync);
       task.ContinueWith((t) => {
-        FinishProgressView();
+        progress.Finish();
         ErrorHandling.ShowErrorDialog(this, "An error occured while stopping the task.", t.Exception);
       }, TaskContinuationOptions.OnlyOnFaulted);
@@ -99 +100 @@
 
     private void PauseTaskAsync() {
-      progress = new Progress();
       progress.Status = "Pausing task. Please be patient for the command to take effect.";
-      SetProgressView(progress);
-      Content.Pause();
-      FinishProgressView();
+      progress.ProgressState = ProgressState.Started;
+      using (var view = new ProgressView(this, progress)) {
+        Content.Pause();
+      }
     }
 
     private void StopTaskAsync() {
-      progress = new Progress();
       progress.Status = "Stopping task. Please be patient for the command to take effect.";
-      SetProgressView(progress);
-      Content.Stop();
-      FinishProgressView();
+      progress.ProgressState = ProgressState.Started;
+      using (var view = new ProgressView(this, progress)) {
+        Content.Stop();
+      }
     }
 
     private void ResumeTaskAsync() {
-      progress = new Progress();
       progress.Status = "Resuming task. Please be patient for the command to take effect.";
-      SetProgressView(progress);
-      Content.Restart();
-      FinishProgressView();
-    }
-
-    private void SetProgressView(IProgress progress) {
-      if (InvokeRequired) {
-        Invoke(new Action<IProgress>(SetProgressView), progress);
-      } else {
-        progressView.Progress = progress;
-      }
-    }
-
-    private void FinishProgressView() {
-      if (InvokeRequired) {
-        Invoke(new Action(FinishProgressView));
-      } else {
-        progress.Finish();
+      progress.ProgressState = ProgressState.Started;
+      using (var view = new ProgressView(this, progress)) {
+        Content.Restart();
       }
     }