Changeset 15933 for branches/2839_HiveProjectManagement/HeuristicLab.Clients.Hive.JobManager

Timestamp:

05/13/18 20:33:39 (7 years ago)

Author:

jzenisek

Message:

#2839: several fixes

• rebuilt run in hive
• adapted numeric selector (added FixedNumericUpDown.cs)

Location:

branches/2839_HiveProjectManagement/HeuristicLab.Clients.Hive.JobManager/3.3

Files:

• MenuItems/RunInHiveMenuItem.cs (modified) (2 diffs)
• Views/HiveResourceSelectorDialog.Designer.cs (modified) (2 diffs)
• Views/HiveResourceSelectorDialog.cs (modified) (2 diffs)

branches/2839_HiveProjectManagement/HeuristicLab.Clients.Hive.JobManager/3.3/MenuItems/RunInHiveMenuItem.cs

@@ -28 +28 @@
 using HeuristicLab.Optimizer;
 using HeuristicLab.PluginInfrastructure;
+using HeuristicLab.Clients.Hive.JobManager.Views;
+using System.Windows.Forms;
+using System.Linq;
 
 namespace HeuristicLab.Clients.Hive.JobManager {
@@ -82 +85 @@
       task.ItemTask.ComputeInParallel = content is Experiment || content is BatchRun;
 
-      progress = MainFormManager.GetMainForm<MainForm.WindowsForms.MainForm>().AddOperationProgressToContent(this.content, "Uploading to Hive...");
-      rJob.Progress = progress;
-      progress.ProgressStateChanged += progress_ProgressStateChanged;
 
-      HiveClient.StartJob(new Action<Exception>(HandleEx), rJob, new CancellationToken());
+      var hiveResourceSelectorDialog = new HiveResourceSelectorDialog(rJob.Job.Id, rJob.Job.ProjectId);
+      if (hiveResourceSelectorDialog.ShowDialog((UserControl)activeView) == DialogResult.OK) {
+        var selectedProject = hiveResourceSelectorDialog.SelectedProject;
+        if (selectedProject != null) {
+          rJob.Job.ProjectId = selectedProject.Id;
+          rJob.Job.ResourceIds = hiveResourceSelectorDialog.SelectedResources.Select(x => x.Id).ToList();
+
+          progress = MainFormManager.GetMainForm<MainForm.WindowsForms.MainForm>().AddOperationProgressToContent(this.content, "Uploading to Hive...");
+          rJob.Progress = progress;
+          progress.ProgressStateChanged += progress_ProgressStateChanged;
+
+          HiveClient.StartJob(new Action<Exception>(HandleEx), rJob, new CancellationToken());
+        }
+      }
     }
 

branches/2839_HiveProjectManagement/HeuristicLab.Clients.Hive.JobManager/3.3/Views/HiveResourceSelectorDialog.Designer.cs

@@ -55 +55 @@
       this.okButton.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
       this.okButton.DialogResult = System.Windows.Forms.DialogResult.OK;
+      this.okButton.Enabled = false;
       this.okButton.Location = new System.Drawing.Point(405, 609);
       this.okButton.Name = "okButton";
@@ -91 +92 @@
       this.hiveResourceSelector.Caption = "View";
       this.hiveResourceSelector.Content = null;
+      this.hiveResourceSelector.JobId = new System.Guid("00000000-0000-0000-0000-000000000000");
       this.hiveResourceSelector.Location = new System.Drawing.Point(12, 12);
       this.hiveResourceSelector.Name = "hiveResourceSelector";
+      this.hiveResourceSelector.ProjectId = null;
       this.hiveResourceSelector.ReadOnly = false;
       this.hiveResourceSelector.SelectedProject = null;
+      this.hiveResourceSelector.SelectedProjectId = null;
+      this.hiveResourceSelector.SelectedResourceIds = null;
       this.hiveResourceSelector.Size = new System.Drawing.Size(549, 591);
       this.hiveResourceSelector.TabIndex = 0;

branches/2839_HiveProjectManagement/HeuristicLab.Clients.Hive.JobManager/3.3/Views/HiveResourceSelectorDialog.cs

@@ -129 +129 @@
 
       await SecurityExceptionUtil.TryAsyncAndReportSecurityExceptions(
-        action: () => UpdateInstance(),
+        action: () => UpdateProjects(),
         finallyCallback: () => updatingProjects = false);
     }
@@ -151 +151 @@
 
     #region Helpers
-    private void UpdateInstance() {
-      HiveClient.Instance.Refresh();
-    }
-
     private void UpdateProjects() {
       HiveClient.Instance.RefreshProjectsAndResources();