Changeset 8206 for branches/GP-MoveOperators/HeuristicLab.Clients.OKB.Views/3.3/RunCreation/Views

Timestamp:

07/03/12 16:46:35 (12 years ago)

Author:

gkronber

Message:

#1847: merged r8084:8205 from trunk into GP move operators branch

Location:

branches/GP-MoveOperators

Files:

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

branches/GP-MoveOperators/HeuristicLab.Clients.OKB.Views/3.3/RunCreation/Views/OKBExperimentUploadView.cs

@@ -35 +35 @@
 namespace HeuristicLab.Clients.OKB.RunCreation {
   [View("OKBExperimentUpload View")]
-  [Content(typeof(RunCollection), false)]
   [Content(typeof(IOptimizer), false)]
   public partial class OKBExperimentUploadView : ItemView {
     public new IOptimizer Content {
       get { return (IOptimizer)base.Content; }
-      set {
-        base.Content = value;
-      }
+      set { base.Content = value; }
     }
 
@@ -58 +55 @@
     Problem selectedProblem = null;
     private ProgressView progressView;
+    private Progress progress;
 
     public OKBExperimentUploadView() {
       InitializeComponent();
+      progress = new Progress() {
+        CanBeCanceled = false,
+        ProgressState = ProgressState.Finished
+      };
     }
 
@@ -94 +96 @@
       RunCreationClient.Instance.Refreshing += new EventHandler(RunCreationClient_Refreshing);
       RunCreationClient.Instance.Refreshed += new EventHandler(RunCreationClient_Refreshed);
+      progressView = new ProgressView(this, progress);
     }
 
@@ -99 +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();
     }
@@ -108 +116 @@
     private void DisplayRuns(RunCollection runs) {
       if (RunCreationClient.Instance.Algorithms == null || RunCreationClient.Instance.Algorithms.Count() == 0) {
-        RunCreationClient.Instance.RefreshAsync(DisplayError);
+        Action a = new Action(delegate {
+          RunCreationClient.Instance.Refresh();
+          CreateUI(runs);
+        });
+
+        Task.Factory.StartNew(a).ContinueWith((t) => { DisplayError(t.Exception); }, TaskContinuationOptions.OnlyOnFaulted);
       } else {
         CreateUI(runs);
@@ -115 +128 @@
 
     private void CreateUI(RunCollection runs) {
-      if (problems.Count == 0)
-        problems.AddRange(RunCreationClient.Instance.Problems);
-      if (algorithms.Count == 0)
-        algorithms.AddRange(RunCreationClient.Instance.Algorithms);
-
-      IItem algorithmType;
-      IItem problemType;
-      IItem algorithmName;
-      IItem problemName;
-
-      DataGridViewComboBoxColumn cmbAlgorithm = dataGridView.Columns[algorithmColumnIndex] as DataGridViewComboBoxColumn;
-      cmbAlgorithm.DataSource = algorithms;
-      cmbAlgorithm.DisplayMember = "Name";
-
-      DataGridViewComboBoxColumn cmbProblem = dataGridView.Columns[problemColumnIndex] as DataGridViewComboBoxColumn;
-      cmbProblem.DataSource = problems;
-      cmbProblem.DisplayMember = "Name";
-
-      foreach (IRun run in runs) {
-        int idx = dataGridView.Rows.Add(run.Name);
-        DataGridViewRow curRow = dataGridView.Rows[idx];
-        curRow.Tag = run;
-
-        if (run.Parameters.TryGetValue(algorithmTypeParameterName, out algorithmType)) {
-          HeuristicLab.Data.StringValue algStr = algorithmType as HeuristicLab.Data.StringValue;
-          if (algStr != null) {
-            curRow.Cells[1].Value = algStr;
-          }
-        }
-
-        if (run.Parameters.TryGetValue(algorithmNameParameterName, out algorithmName)) {
-          HeuristicLab.Data.StringValue algStr = algorithmName as HeuristicLab.Data.StringValue;
-          if (algStr != null) {
-            curRow.Cells[2].Value = algStr;
-          }
-        }
-
-        if (run.Parameters.TryGetValue(problemTypeParameterName, out problemType)) {
-          HeuristicLab.Data.StringValue prbStr = problemType as HeuristicLab.Data.StringValue;
-          if (prbStr != null) {
-            curRow.Cells[4].Value = prbStr;
-          }
-        }
-
-        if (run.Parameters.TryGetValue(problemNameParameterName, out problemName)) {
-          HeuristicLab.Data.StringValue prbStr = problemName as HeuristicLab.Data.StringValue;
-          if (prbStr != null) {
-            curRow.Cells[5].Value = prbStr;
+      if (InvokeRequired) {
+        Invoke(new Action<RunCollection>(CreateUI), runs);
+      } else {
+        if (problems.Count == 0)
+          problems.AddRange(RunCreationClient.Instance.Problems);
+        if (algorithms.Count == 0)
+          algorithms.AddRange(RunCreationClient.Instance.Algorithms);
+
+        IItem algorithmType;
+        IItem problemType;
+        IItem algorithmName;
+        IItem problemName;
+
+        DataGridViewComboBoxColumn cmbAlgorithm = dataGridView.Columns[algorithmColumnIndex] as DataGridViewComboBoxColumn;
+        cmbAlgorithm.DataSource = algorithms;
+        cmbAlgorithm.DisplayMember = "Name";
+
+        DataGridViewComboBoxColumn cmbProblem = dataGridView.Columns[problemColumnIndex] as DataGridViewComboBoxColumn;
+        cmbProblem.DataSource = problems;
+        cmbProblem.DisplayMember = "Name";
+
+        foreach (IRun run in runs) {
+          int idx = dataGridView.Rows.Add(run.Name);
+          DataGridViewRow curRow = dataGridView.Rows[idx];
+          curRow.Tag = run;
+
+          if (run.Parameters.TryGetValue(algorithmTypeParameterName, out algorithmType)) {
+            HeuristicLab.Data.StringValue algStr = algorithmType as HeuristicLab.Data.StringValue;
+            if (algStr != null) {
+              curRow.Cells[1].Value = algStr;
+            }
+          }
+
+          if (run.Parameters.TryGetValue(algorithmNameParameterName, out algorithmName)) {
+            HeuristicLab.Data.StringValue algStr = algorithmName as HeuristicLab.Data.StringValue;
+            if (algStr != null) {
+              curRow.Cells[2].Value = algStr;
+            }
+          }
+
+          if (run.Parameters.TryGetValue(problemTypeParameterName, out problemType)) {
+            HeuristicLab.Data.StringValue prbStr = problemType as HeuristicLab.Data.StringValue;
+            if (prbStr != null) {
+              curRow.Cells[4].Value = prbStr;
+            }
+          }
+
+          if (run.Parameters.TryGetValue(problemNameParameterName, out problemName)) {
+            HeuristicLab.Data.StringValue prbStr = problemName as HeuristicLab.Data.StringValue;
+            if (prbStr != null) {
+              curRow.Cells[5].Value = prbStr;
+            }
           }
         }
@@ -169 +186 @@
 
     private void ClearRuns() {
-      dataGridView.Rows.Clear();
-      runs.Clear();
+      if (InvokeRequired) {
+        Invoke(new Action(ClearRuns));
+      } else {
+        dataGridView.Rows.Clear();
+        runs.Clear();
+      }
     }
 
@@ -177 +198 @@
         Invoke(new EventHandler(RunCreationClient_Refreshing), sender, e);
       } else {
-        IProgress prog = new Progress();
-        prog.Status = "Refreshing algorithms and problems...";
-        SetProgressView(prog);
+        progress.Status = "Refreshing algorithms and problems...";
+        progress.ProgressState = ProgressState.Started;
       }
     }
@@ -187 +207 @@
         Invoke(new EventHandler(RunCreationClient_Refreshed), sender, e);
       } else {
-        FinishProgressView();
+        progress.Finish();
         SetEnabledStateOfControls();
       }
@@ -195 +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);
@@ -201 +221 @@
 
     private void UploadAsync() {
-      IProgress prog = new Progress();
-      prog.Status = "Uploading runs to OKB...";
-      prog.ProgressValue = 0;
+      progress.Status = "Uploading runs to OKB...";
+      progress.ProgressValue = 0;
+      progress.ProgressState = ProgressState.Started;
       double count = dataGridView.Rows.Count;
       int i = 0;
-
-      SetProgressView(prog);
       foreach (DataGridViewRow row in dataGridView.Rows) {
         selectedAlgorithm = algorithms.Where(x => x.Name == row.Cells[algorithmColumnIndex].Value.ToString()).FirstOrDefault();
@@ -218 +236 @@
         run.Store();
         i++;
-        prog.ProgressValue = ((double)i) / count;
-      }
-      FinishProgressView();
-    }
-
-    private void SetProgressView(IProgress progress) {
-      if (InvokeRequired) {
-        Invoke(new Action<IProgress>(SetProgressView), progress);
-      } else {
-        if (progressView == null) {
-          progressView = new ProgressView(this, progress);
-        } else {
-          progressView.Progress = progress;
-        }
-      }
-    }
-
-    private void FinishProgressView() {
-      if (InvokeRequired) {
-        Invoke(new Action(FinishProgressView));
-      } else {
-        if (progressView != null) {
-          progressView.Finish();
-          progressView = null;
-          SetEnabledStateOfControls();
-          ClearRuns();
-        }
-      }
+        progress.ProgressValue = ((double)i) / count;
+      }
+      progress.Finish();
+      ClearRuns();
     }