Changeset 8145 for trunk/sources/HeuristicLab.Clients.OKB.Views

Timestamp:

06/28/12 12:00:51 (12 years ago)

Author:

ascheibe

Message:

#1762 implemented review comments:

• removed self disposing. The progress view now reacts if a progress is set and Finish() is now called on the progress object and not the view.
• Moved Cancel event from ProgressView to Progress
• throw ArgumentNullException if the parent view is null

File:

• trunk/sources/HeuristicLab.Clients.OKB.Views/3.3/RunCreation/Views/OKBExperimentUploadView.cs (modified) (6 diffs)

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

@@ -57 +57 @@
     Problem selectedProblem = null;
     private ProgressView progressView;
+    private IProgress progress;
 
     public OKBExperimentUploadView() {
       InitializeComponent();
+      progressView = new ProgressView(this);
     }
 
@@ -176 +178 @@
         Invoke(new EventHandler(RunCreationClient_Refreshing), sender, e);
       } else {
-        IProgress prog = new Progress();
-        prog.Status = "Refreshing algorithms and problems...";
-        SetProgressView(prog);
+        progress = new Progress();
+        progress.Status = "Refreshing algorithms and problems...";
+        SetProgressView(progress);
       }
     }
@@ -200 +202 @@
 
     private void UploadAsync() {
-      IProgress prog = new Progress();
-      prog.Status = "Uploading runs to OKB...";
-      prog.ProgressValue = 0;
+      progress = new Progress();
+      progress.Status = "Uploading runs to OKB...";
+      progress.ProgressValue = 0;
       double count = dataGridView.Rows.Count;
       int i = 0;
 
-      SetProgressView(prog);
+      SetProgressView(progress);
       foreach (DataGridViewRow row in dataGridView.Rows) {
         selectedAlgorithm = algorithms.Where(x => x.Name == row.Cells[algorithmColumnIndex].Value.ToString()).FirstOrDefault();
@@ -217 +219 @@
         run.Store();
         i++;
-        prog.ProgressValue = ((double)i) / count;
+        progress.ProgressValue = ((double)i) / count;
       }
       FinishProgressView();
@@ -226 +228 @@
         Invoke(new Action<IProgress>(SetProgressView), progress);
       } else {
-        if (progressView == null) {
-          progressView = new ProgressView(this, progress);
-        } else {
-          progressView.Progress = progress;
-        }
+        progressView.Progress = progress;
       }
     }
@@ -238 +236 @@
         Invoke(new Action(FinishProgressView));
       } else {
-        if (progressView != null) {
-          progressView.Finish();
-          progressView = null;
-          SetEnabledStateOfControls();
-          ClearRuns();
-        }
+        progress.Finish();
+        SetEnabledStateOfControls();
+        ClearRuns();
       }
     }