Changeset 7584 for branches/OKB (trunk integration)

Timestamp:

03/07/12 22:16:01 (13 years ago)

Author:

ascheibe

Message:

#1174 added displaying of progress when uploading runs

Location:

branches/OKB (trunk integration)/HeuristicLab.Clients.OKB/3.3

Files:

• HeuristicLab.Clients.OKB-3.3.csproj (modified) (1 diff)
• RunCreation/Views/OKBExperimentUploadView.cs (modified) (3 diffs)

branches/OKB (trunk integration)/HeuristicLab.Clients.OKB/3.3/HeuristicLab.Clients.OKB-3.3.csproj

@@ -383 +383 @@
     <None Include="HeuristicLab.snk" />
   </ItemGroup>
-  <ItemGroup>
-    <EmbeddedResource Include="RunCreation\Views\OKBExperimentUploadView.resx">
-      <DependentUpon>OKBExperimentUploadView.cs</DependentUpon>
-    </EmbeddedResource>
-    <EmbeddedResource Include="RunCreation\Views\OKBRunConfigSelectionView.resx">
-      <DependentUpon>OKBRunConfigSelectionView.cs</DependentUpon>
-    </EmbeddedResource>
-  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <PropertyGroup>

branches/OKB (trunk integration)/HeuristicLab.Clients.OKB/3.3/RunCreation/Views/OKBExperimentUploadView.cs

@@ -23 +23 @@
 using System.Collections.Generic;
 using System.Linq;
+using System.Threading.Tasks;
 using System.Windows.Forms;
 using HeuristicLab.Clients.Access;
 using HeuristicLab.Core.Views;
 using HeuristicLab.MainForm;
+using HeuristicLab.MainForm.WindowsForms;
 using HeuristicLab.Optimization;
 
@@ -38 +40 @@
     }
 
+    private ProgressView progressView;
     List<OKBRunConfigSelectionView> runConfigViews = new List<OKBRunConfigSelectionView>();
     private List<Problem> problems = new List<Problem>();
@@ -104 +107 @@
         Invoke(new EventHandler(RunCreationClient_Refreshing), sender, e);
       } else {
-        //TODO: display loading dialog
-        Cursor = Cursors.AppStarting;
-        Enabled = false;
+        IProgress prog = new Progress();
+        prog.Status = "Refreshing algorithms and problems...";
+        SetProgressView(prog);
       }
     }
+
     private void RunCreationClient_Refreshed(object sender, EventArgs e) {
       if (InvokeRequired) {
         Invoke(new EventHandler(RunCreationClient_Refreshed), sender, e);
       } else {
+        FinishProgressView();
+
         CreateUI();
-
-        Enabled = true;
         SetEnabledStateOfControls();
-        Cursor = Cursors.Default;
       }
     }
 
     private void btnUpload_Click(object sender, EventArgs e) {
+      var task = System.Threading.Tasks.Task.Factory.StartNew(UploadAsync);
+      task.ContinueWith((t) => {
+        FinishProgressView();
+        PluginInfrastructure.ErrorHandling.ShowErrorDialog("An exception occured while uploading the runs to the OKB.", t.Exception);
+      }, TaskContinuationOptions.OnlyOnFaulted);
+    }
+
+    private void UploadAsync() {
+      IProgress prog = new Progress();
+      prog.Status = "Uploading runs to OKB...";
+      prog.ProgressValue = 0;
+      double count = runConfigViews.Count(x => x.UploadToOKB());
+      int i = 0;
+
+      SetProgressView(prog);
       foreach (var runConfigView in runConfigViews) {
         if (runConfigView.UploadToOKB()) {
-          //TODO: show progress
           OKBRun run = new OKBRun(runConfigView.GetSelectedAlgorithm().Id, runConfigView.GetSelectedProblem().Id, runConfigView.ExperimentRun, UserInformation.Instance.User.Id);
-          try { run.Store(); }
-          catch (Exception ex) {
-            PluginInfrastructure.ErrorHandling.ShowErrorDialog("An exception occured while uploading the runs to the OKB.", ex);
-          }
+          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();
         }
       }