Changeset 8206 for branches/GP-MoveOperators/HeuristicLab.Clients.Hive.Views/3.3/HiveTasks/OptimizerHiveTaskView.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.Clients.Hive.Views/3.3/HiveTasks/OptimizerHiveTaskView.cs (modified) (7 diffs)

branches/GP-MoveOperators/HeuristicLab.Clients.Hive.Views/3.3/HiveTasks/OptimizerHiveTaskView.cs

@@ -31 +31 @@
   [Content(typeof(OptimizerHiveTask), true)]
   public partial class OptimizerHiveTaskView : HiveTaskView {
+    private Progress progress;
     private ProgressView progressView;
 
@@ -44 +45 @@
     public OptimizerHiveTaskView() {
       InitializeComponent();
+      progress = new Progress() {
+        CanBeCanceled = false,
+        ProgressState = ProgressState.Finished
+      };
     }
 
@@ -57 +62 @@
       base.RegisterContentEvents();
       Content.IsControllableChanged += new EventHandler(Content_IsControllableChanged);
+      progressView = new ProgressView(this, progress);
     }
 
     protected override void DeregisterContentEvents() {
       Content.IsControllableChanged -= new EventHandler(Content_IsControllableChanged);
+      if (progressView != null) {
+        progressView.Content = null;
+        progressView.Dispose();
+        progressView = null;
+      }
       base.DeregisterContentEvents();
     }
@@ -74 +85 @@
       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);
@@ -82 +93 @@
       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);
@@ -90 +101 @@
       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);
@@ -97 +108 @@
 
     private void PauseTaskAsync() {
-      IProgress prog = new Progress();
-      prog.Status = "Pausing task. Please be patient for the command to take effect.";
-      SetProgressView(prog);
+      progress.Status = "Pausing task. Please be patient for the command to take effect.";
+      progress.ProgressState = ProgressState.Started;
       Content.Pause();
-      FinishProgressView();
+      progress.Finish();
     }
 
     private void StopTaskAsync() {
-      IProgress prog = new Progress();
-      prog.Status = "Stopping task. Please be patient for the command to take effect.";
-      SetProgressView(prog);
+      progress.Status = "Stopping task. Please be patient for the command to take effect.";
+      progress.ProgressState = ProgressState.Started;
       Content.Stop();
-      FinishProgressView();
+      progress.Finish();
     }
 
     private void ResumeTaskAsync() {
-      IProgress prog = new Progress();
-      prog.Status = "Resuming task. Please be patient for the command to take effect.";
-      SetProgressView(prog);
+      progress.Status = "Resuming task. Please be patient for the command to take effect.";
+      progress.ProgressState = ProgressState.Started;
       Content.Restart();
-      FinishProgressView();
-    }
-
-    private void SetProgressView(IProgress progress) {
-      if (InvokeRequired) {
-        Invoke(new Action<IProgress>(SetProgressView), progress);
-      } else {
-        if (progressView == null) {
-          progressView = new ProgressView(this, progress);
-        } else {
-          progressView.Progress = progress;
-        }
-      }
-    }
-
-    private void FinishProgressView() {
-      if (InvokeRequired) {
-        Invoke(new Action(FinishProgressView));
-      } else {
-        if (progressView != null) {
-          progressView.Finish();
-          progressView = null;
-          SetEnabledStateOfControls();
-        }
-      }
+      progress.Finish();
     }