Changeset 9933 for stable/HeuristicLab.Clients.OKB.Views

Timestamp:

09/03/13 15:55:36 (11 years ago)

Author:

ascheibe

Message:

#1042 merged r9849, r9851, r9865, r9867, r9868, r9893, r9894, r9895, r9896, r9900, r9901, r9905, r9907 into stable branch

Location:

stable

Files:

• . (modified) (1 prop)
• HeuristicLab.Clients.OKB.Views/3.3/RunCreation/Views/OKBExperimentUploadView.cs (modified) (8 diffs)

stable/HeuristicLab.Clients.OKB.Views/3.3/RunCreation/Views/OKBExperimentUploadView.cs

@@ -54 +54 @@
     Algorithm selectedAlgorithm = null;
     Problem selectedProblem = null;
-    private ProgressView progressView;
-    private Progress progress;
 
     public OKBExperimentUploadView() {
       InitializeComponent();
-      progress = new Progress() {
-        CanBeCanceled = false,
-        ProgressState = ProgressState.Finished
-      };
     }
 
@@ -96 +90 @@
       RunCreationClient.Instance.Refreshing += new EventHandler(RunCreationClient_Refreshing);
       RunCreationClient.Instance.Refreshed += new EventHandler(RunCreationClient_Refreshed);
-      progressView = new ProgressView(this, progress);
     }
 
@@ -102 +95 @@
       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();
     }
@@ -198 +187 @@
         Invoke(new EventHandler(RunCreationClient_Refreshing), sender, e);
       } else {
-        progress.Status = "Refreshing algorithms and problems...";
-        progress.ProgressState = ProgressState.Started;
+        var message = "Refreshing algorithms and problems...";
+        MainFormManager.GetMainForm<HeuristicLab.MainForm.WindowsForms.MainForm>().AddOperationProgressToView(this, message);
       }
     }
@@ -207 +196 @@
         Invoke(new EventHandler(RunCreationClient_Refreshed), sender, e);
       } else {
-        progress.Finish();
+        MainFormManager.GetMainForm<HeuristicLab.MainForm.WindowsForms.MainForm>().RemoveOperationProgressFromView(this);
         SetEnabledStateOfControls();
       }
@@ -215 +204 @@
       var task = System.Threading.Tasks.Task.Factory.StartNew(UploadAsync);
       task.ContinueWith((t) => {
-        progress.Finish();
+        MainFormManager.GetMainForm<HeuristicLab.MainForm.WindowsForms.MainForm>().RemoveOperationProgressFromView(this);
         PluginInfrastructure.ErrorHandling.ShowErrorDialog("An exception occured while uploading the runs to the OKB.", t.Exception);
       }, TaskContinuationOptions.OnlyOnFaulted);
@@ -221 +210 @@
 
     private void UploadAsync() {
-      progress.Status = "Uploading runs to OKB...";
-      progress.ProgressValue = 0;
-      progress.ProgressState = ProgressState.Started;
+      var message = "Uploading runs to OKB...";
+      IProgress progress = MainFormManager.GetMainForm<HeuristicLab.MainForm.WindowsForms.MainForm>().AddOperationProgressToView(this, message);
       double count = dataGridView.Rows.Count;
       int i = 0;
@@ -238 +226 @@
         progress.ProgressValue = ((double)i) / count;
       }
-      progress.Finish();
+      MainFormManager.GetMainForm<HeuristicLab.MainForm.WindowsForms.MainForm>().RemoveOperationProgressFromView(this);
       ClearRuns();
     }