Changeset 8165 for trunk/sources/HeuristicLab.Clients.OKB.Views/3.3/RunCreation

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.OKB.Views/3.3/RunCreation/Views/OKBExperimentUploadView.cs (modified) (9 diffs)

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

@@ -39 +39 @@
     public new IOptimizer Content {
       get { return (IOptimizer)base.Content; }
-      set {
-        base.Content = value;
-      }
+      set { base.Content = value; }
     }
 
@@ -56 +54 @@
     Algorithm selectedAlgorithm = null;
     Problem selectedProblem = null;
-    private ProgressView progressView;
-    private IProgress progress;
+    private ProgressView progressView; // this has to be disposed manually!
+    private Progress progress;
 
     public OKBExperimentUploadView() {
       InitializeComponent();
-      progressView = new ProgressView(this);
+      progress = new Progress() {
+        CanBeCanceled = false,
+        ProgressState = ProgressState.Finished
+      };
     }
 
@@ -95 +96 @@
       RunCreationClient.Instance.Refreshing += new EventHandler(RunCreationClient_Refreshing);
       RunCreationClient.Instance.Refreshed += new EventHandler(RunCreationClient_Refreshed);
+      progressView = new ProgressView(this, progress);
     }
 
@@ -100 +102 @@
       RunCreationClient.Instance.Refreshing -= new EventHandler(RunCreationClient_Refreshing);
       RunCreationClient.Instance.Refreshed -= new EventHandler(RunCreationClient_Refreshed);
+      if (progressView != null) {
+        progressView.Content = null;
+        progressView.Dispose();
+        progressView = null;
+      }
       base.DeregisterContentEvents();
     }
@@ -191 +198 @@
         Invoke(new EventHandler(RunCreationClient_Refreshing), sender, e);
       } else {
-        progress = new Progress();
         progress.Status = "Refreshing algorithms and problems...";
-        SetProgressView(progress);
+        progress.ProgressState = ProgressState.Started;
       }
     }
@@ -201 +207 @@
         Invoke(new EventHandler(RunCreationClient_Refreshed), sender, e);
       } else {
-        FinishProgressView();
+        progress.Finish();
         SetEnabledStateOfControls();
       }
@@ -209 +215 @@
       var task = System.Threading.Tasks.Task.Factory.StartNew(UploadAsync);
       task.ContinueWith((t) => {
-        FinishProgressView();
+        progress.Finish();
         PluginInfrastructure.ErrorHandling.ShowErrorDialog("An exception occured while uploading the runs to the OKB.", t.Exception);
       }, TaskContinuationOptions.OnlyOnFaulted);
@@ -215 +221 @@
 
     private void UploadAsync() {
-      progress = new Progress();
       progress.Status = "Uploading runs to OKB...";
       progress.ProgressValue = 0;
@@ -221 +226 @@
       int i = 0;
 
-      SetProgressView(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;
-      }
-      FinishProgressView();
+      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;
+        }
+      }
       ClearRuns();
-    }
-
-    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();
-      }
     }