Changeset 8165 for trunk/sources/HeuristicLab.Clients.Hive.JobManager

Timestamp:

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

Author:

abeham

Message:

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

Location:

trunk/sources/HeuristicLab.Clients.Hive.JobManager/3.3/Views

Files:

• HiveResourceSelector.cs (modified) (5 diffs)
• HiveResourceSelectorDialog.Designer.cs (modified) (1 diff)
• RefreshableHiveJobView.cs (modified) (9 diffs)

trunk/sources/HeuristicLab.Clients.Hive.JobManager/3.3/Views/HiveResourceSelector.cs

@@ -42 +42 @@
     private ISet<TreeNode> filteredTreeNodes;
     private ISet<TreeNode> nodeStore;
-    private IProgress currentProgress;
+    private Progress progress;
+    private ProgressView progressView;
 
     private ISet<Resource> selectedResources;
@@ -48 +49 @@
       get { return selectedResources; }
       set { selectedResources = value; }
-    }
-
-    private ProgressView progressView;
-    public ProgressView ProgressView {
-      get { return progressView; }
-      set { progressView = value; }
     }
 
@@ -69 +64 @@
       imageList.Images.Add(HeuristicLab.Common.Resources.VSImageLibrary.MonitorLarge);
       imageList.Images.Add(HeuristicLab.Common.Resources.VSImageLibrary.NetworkCenterLarge);
+      progress = new Progress() {
+        CanBeCanceled = false,
+        ProgressState = ProgressState.Finished
+      };
+    }
+
+    protected override void DeregisterContentEvents() {
+      if (progressView != null) {
+        progressView.Content = null;
+        progressView.Dispose();
+        progressView = null;
+      }
+      base.DeregisterContentEvents();
+    }
+
+    protected override void RegisterContentEvents() {
+      base.RegisterContentEvents();
+      progressView = new ProgressView(this, progress);
     }
 
@@ -75 +88 @@
         Invoke(new Action(StartProgressView));
       } else {
-        currentProgress = new Progress();
-        currentProgress.Status = "Downloading resources. Please be patient.";
-        if (progressView == null) {
-          progressView = new ProgressView(this);
-        }
-        progressView.Progress = currentProgress;
+        progress.Status = "Downloading resources. Please be patient.";
+        progress.ProgressState = ProgressState.Started;
       }
     }
@@ -88 +97 @@
         Invoke(new Action(FinishProgressView));
       } else {
-        currentProgress.Finish();
+        progress.Finish();
       }
     }

trunk/sources/HeuristicLab.Clients.Hive.JobManager/3.3/Views/HiveResourceSelectorDialog.Designer.cs

@@ -73 +73 @@
       this.hiveResourceSelector.Location = new System.Drawing.Point(12, 12);
       this.hiveResourceSelector.Name = "hiveResourceSelector";
-      this.hiveResourceSelector.ProgressView = null;
       this.hiveResourceSelector.ReadOnly = false;
       this.hiveResourceSelector.Size = new System.Drawing.Size(549, 591);

trunk/sources/HeuristicLab.Clients.Hive.JobManager/3.3/Views/RefreshableHiveJobView.cs

@@ -42 +42 @@
   [Content(typeof(RefreshableJob), true)]
   public partial class RefreshableHiveJobView : HeuristicLab.Core.Views.ItemView {
+    private Progress progress;
     private ProgressView progressView;
     private HiveResourceSelectorDialog hiveResourceSelectorDialog;
@@ -55 +56 @@
     public RefreshableHiveJobView() {
       InitializeComponent();
-      progressView = new ProgressView(this);
+      progress = new Progress() {
+        CanBeCanceled = true,
+        ProgressState = ProgressState.Finished
+      };
     }
 
@@ -73 +77 @@
       Content.Loaded += new EventHandler(Content_Loaded);
       Content.TaskReceived += new EventHandler(Content_TaskReceived);
+      progressView = new ProgressView(this, progress);
     }
 
@@ -88 +93 @@
       Content.Loaded -= new EventHandler(Content_Loaded);
       Content.TaskReceived -= new EventHandler(Content_TaskReceived);
+      if (progressView != null) {
+        progressView.Content = null;
+        progressView.Dispose();
+        progressView = null;
+      }
       base.DeregisterContentEvents();
     }
@@ -356 +366 @@
         var task = System.Threading.Tasks.Task.Factory.StartNew(ResumeJobAsync, Content);
         task.ContinueWith((t) => {
-          FinishProgressView();
+          progress.Finish();
           MessageBox.Show("An error occured resuming the job. See the log for more information.", "HeuristicLab Hive Job Manager", MessageBoxButtons.OK, MessageBoxIcon.Error);
           Content.Log.LogException(t.Exception);
@@ -368 +378 @@
       var task = System.Threading.Tasks.Task.Factory.StartNew(PauseJobAsync, Content);
       task.ContinueWith((t) => {
-        FinishProgressView();
+        progress.Finish();
         MessageBox.Show("An error occured pausing the job. See the log for more information.", "HeuristicLab Hive Job Manager", MessageBoxButtons.OK, MessageBoxIcon.Error);
         Content.Log.LogException(t.Exception);
@@ -377 +387 @@
       var task = System.Threading.Tasks.Task.Factory.StartNew(StopJobAsync, Content);
       task.ContinueWith((t) => {
-        FinishProgressView();
+        progress.Finish();
         MessageBox.Show("An error occured stopping the job. See the log for more information.", "HeuristicLab Hive Job Manager", MessageBoxButtons.OK, MessageBoxIcon.Error);
         Content.Log.LogException(t.Exception);
@@ -385 +395 @@
 
     private void PauseJobAsync(object job) {
-      IProgress prog = new Progress();
-      prog.Status = "Pausing job...";
-      SetProgressView(prog);
+      progress.Status = "Pausing job...";
+      progress.ProgressState = ProgressState.Started;
       HiveClient.PauseJob((RefreshableJob)job);
-      FinishProgressView();
     }
 
     private void StopJobAsync(object job) {
-      IProgress prog = new Progress();
-      prog.Status = "Stopping job...";
-      SetProgressView(prog);
+      progress.Status = "Stopping job...";
+      progress.ProgressState = ProgressState.Started;
       HiveClient.StopJob((RefreshableJob)job);
-      FinishProgressView();
     }
 
     private void ResumeJobAsync(object job) {
-      IProgress prog = new Progress();
-      prog.Status = "Resuming job...";
-      SetProgressView(prog);
+      progress.Status = "Resuming job...";
+      progress.ProgressState = ProgressState.Started;
       HiveClient.ResumeJob((RefreshableJob)job);
-      FinishProgressView();
     }
 
@@ -466 +470 @@
       } else {
         if (Content != null && Content.Progress != null && Content.IsProgressing) {
-          SetProgressView();
+          progressView.Content = Content.Progress;
         } else {
-          progressView.Progress = null;
-        }
-      }
-    }
-
-    private void SetProgressView() {
-      if (InvokeRequired) {
-        Invoke(new Action(SetProgressView));
-      } else {
-        progressView.Progress = Content.Progress;
-      }
-    }
-
-    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 {
-        if (Content != null && Content.Progress != null)
-          Content.Progress.Finish();
+          progressView.Content = progress;
+        }
       }
     }