Changeset 8181

Timestamp:

07/02/12 16:39:06 (12 years ago)

Author:

abeham

Message:

#1762: Fixed progressView creation

Location:

trunk/sources

Files:

• HeuristicLab.Clients.Hive.Views/3.3/HiveTasks/OptimizerHiveTaskView.cs (modified) (5 diffs)
• HeuristicLab.Clients.OKB.Views/3.3/RunCreation/Views/OKBExperimentUploadView.cs (modified) (2 diffs)

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

@@ -32 +32 @@
   public partial class OptimizerHiveTaskView : HiveTaskView {
     private Progress progress;
+    private ProgressView progressView;
 
     public new OptimizerHiveTask Content {
@@ -60 +61 @@
       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();
     }
@@ -102 +109 @@
       progress.Status = "Pausing task. Please be patient for the command to take effect.";
       progress.ProgressState = ProgressState.Started;
-      using (var view = new ProgressView(this, progress)) {
-        Content.Pause();
-      }
+      Content.Pause();
     }
 
@@ -110 +115 @@
       progress.Status = "Stopping task. Please be patient for the command to take effect.";
       progress.ProgressState = ProgressState.Started;
-      using (var view = new ProgressView(this, progress)) {
-        Content.Stop();
-      }
+      Content.Stop();
     }
 
@@ -118 +121 @@
       progress.Status = "Resuming task. Please be patient for the command to take effect.";
       progress.ProgressState = ProgressState.Started;
-      using (var view = new ProgressView(this, progress)) {
-        Content.Restart();
-      }
+      Content.Restart();
     }
 

trunk/sources/HeuristicLab.Clients.OKB.Views/3.3/RunCreation/Views/OKBExperimentUploadView.cs

@@ -54 +54 @@
     Algorithm selectedAlgorithm = null;
     Problem selectedProblem = null;
-    private ProgressView progressView; // this has to be disposed manually!
+    private ProgressView progressView;
     private Progress progress;
 
@@ -223 +223 @@
       progress.Status = "Uploading runs to OKB...";
       progress.ProgressValue = 0;
+      progress.ProgressState = ProgressState.Started;
       double count = dataGridView.Rows.Count;
       int i = 0;
-
-      using (var view = new ProgressView(this, progress)) {
-        foreach (DataGridViewRow row in dataGridView.Rows) {
-          selectedAlgorithm = algorithms.Where(x => x.Name == row.Cells[algorithmColumnIndex].Value.ToString()).FirstOrDefault();
-          selectedProblem = problems.Where(x => x.Name == row.Cells[problemColumnIndex].Value.ToString()).FirstOrDefault();
-          if (selectedAlgorithm == null || selectedProblem == null) {
-            throw new ArgumentException("Can't retrieve the algorithm/problem to upload");
-          }
-
-          OKBRun run = new OKBRun(selectedAlgorithm.Id, selectedProblem.Id, row.Tag as IRun, UserInformation.Instance.User.Id);
-          run.Store();
-          i++;
-          progress.ProgressValue = ((double)i) / count;
-        }
+      foreach (DataGridViewRow row in dataGridView.Rows) {
+        selectedAlgorithm = algorithms.Where(x => x.Name == row.Cells[algorithmColumnIndex].Value.ToString()).FirstOrDefault();
+        selectedProblem = problems.Where(x => x.Name == row.Cells[problemColumnIndex].Value.ToString()).FirstOrDefault();
+        if (selectedAlgorithm == null || selectedProblem == null) {
+          throw new ArgumentException("Can't retrieve the algorithm/problem to upload");
+        }
+
+        OKBRun run = new OKBRun(selectedAlgorithm.Id, selectedProblem.Id, row.Tag as IRun, UserInformation.Instance.User.Id);
+        run.Store();
+        i++;
+        progress.ProgressValue = ((double)i) / count;
       }
       ClearRuns();