Changeset 6834 for branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive.JobManager

Timestamp:

09/26/11 18:26:02 (13 years ago)

Author:

ascheibe

Message:

#1233

• implemented last couple of slave ui review comments
• added global runs view to the job manager
• some minor ui improvements

Location:

branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive.JobManager/3.3/Views

Files:

• RefreshableHiveJobListView.cs (modified) (1 diff)
• RefreshableHiveJobView.Designer.cs (modified) (5 diffs)
• RefreshableHiveJobView.cs (modified) (9 diffs)

branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive.JobManager/3.3/Views/RefreshableHiveJobListView.cs

@@ -52 +52 @@
 
     protected override void removeButton_Click(object sender, EventArgs e) {
-      DialogResult result = MessageBox.Show("This action will permanently delete this experiment (also on the hive server). Continue?", "Delete Experiment", MessageBoxButtons.OKCancel);
+      DialogResult result = MessageBox.Show("This action will permanently delete this job (also on the hive server). Continue?", "Delete Job", MessageBoxButtons.OKCancel, MessageBoxIcon.Question);
       if (result == DialogResult.OK) {
         base.removeButton_Click(sender, e);

branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive.JobManager/3.3/Views/RefreshableHiveJobView.Designer.cs

@@ -58 +58 @@
       this.calculatingLabel = new System.Windows.Forms.Label();
       this.jobsLabel = new System.Windows.Forms.Label();
+      this.runCollectionViewHost = new HeuristicLab.MainForm.WindowsForms.ViewHost();
       this.tabControl.SuspendLayout();
       this.tasksTabPage.SuspendLayout();
       this.permissionTabPage.SuspendLayout();
+      this.runsTabPage.SuspendLayout();
       this.stateTabPage.SuspendLayout();
       this.logTabPage.SuspendLayout();
@@ -149 +151 @@
       // runsTabPage
       // 
+      this.runsTabPage.Controls.Add(this.runCollectionViewHost);
       this.runsTabPage.Location = new System.Drawing.Point(4, 22);
       this.runsTabPage.Name = "runsTabPage";
@@ -418 +421 @@
       this.jobsLabel.Text = "Waiting:";
       // 
-      // RefreshableHiveExperimentView
+      // runCollectionViewHost
+      // 
+      this.runCollectionViewHost.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
+                  | System.Windows.Forms.AnchorStyles.Left)
+                  | System.Windows.Forms.AnchorStyles.Right)));
+      this.runCollectionViewHost.Caption = "View";
+      this.runCollectionViewHost.Content = null;
+      this.runCollectionViewHost.Enabled = false;
+      this.runCollectionViewHost.Location = new System.Drawing.Point(3, 3);
+      this.runCollectionViewHost.Name = "runCollectionViewHost";
+      this.runCollectionViewHost.ReadOnly = false;
+      this.runCollectionViewHost.Size = new System.Drawing.Size(703, 420);
+      this.runCollectionViewHost.TabIndex = 2;
+      this.runCollectionViewHost.ViewsLabelVisible = true;
+      this.runCollectionViewHost.ViewType = null;
+      // 
+      // RefreshableHiveJobView
       // 
       this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
@@ -437 +456 @@
       this.Controls.Add(this.stopButton);
       this.Controls.Add(this.resetButton);
-      this.Name = "RefreshableHiveExperimentView";
+      this.Name = "RefreshableHiveJobView";
       this.Size = new System.Drawing.Size(717, 560);
       this.tabControl.ResumeLayout(false);
       this.tasksTabPage.ResumeLayout(false);
       this.permissionTabPage.ResumeLayout(false);
+      this.runsTabPage.ResumeLayout(false);
       this.stateTabPage.ResumeLayout(false);
       this.logTabPage.ResumeLayout(false);
@@ -484 +504 @@
     private System.Windows.Forms.Button refreshPermissionsButton;
     private System.Windows.Forms.TabPage runsTabPage;
+    private MainForm.WindowsForms.ViewHost runCollectionViewHost;
 
   }

branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive.JobManager/3.3/Views/RefreshableHiveJobView.cs

@@ -63 +63 @@
       Content.StateLogListChanged += new EventHandler(Content_StateLogListChanged);
       Content.IsProgressingChanged += new EventHandler(Content_IsProgressingChanged);
-      Content.HiveJobsChanged += new EventHandler(Content_HiveJobChanged);
+      Content.HiveTasksChanged += new EventHandler(Content_HiveTasksChanged);
       Content.ExecutionStateChanged += new EventHandler(Content_ExecutionStateChanged);
       Content.ExecutionTimeChanged += new EventHandler(Content_ExecutionTimeChanged);
       Content.IsAllowedPrivilegedChanged += new EventHandler(Content_IsAllowedPrivilegedChanged);
+      Content.Loaded += new EventHandler(Content_Loaded);
     }
 
@@ -77 +78 @@
       Content.StateLogListChanged -= new EventHandler(Content_StateLogListChanged);
       Content.IsProgressingChanged -= new EventHandler(Content_IsProgressingChanged);
-      Content.HiveJobsChanged -= new EventHandler(Content_HiveJobChanged);
+      Content.HiveTasksChanged -= new EventHandler(Content_HiveTasksChanged);
       Content.ExecutionStateChanged -= new EventHandler(Content_ExecutionStateChanged);
       Content.ExecutionTimeChanged -= new EventHandler(Content_ExecutionTimeChanged);
+      Content.Loaded -= new EventHandler(Content_Loaded);
       base.DeregisterContentEvents();
     }
@@ -92 +94 @@
 
     private void RegisterHiveJobEvents() {
-      Content.HiveTasks.ItemsAdded += new CollectionItemsChangedEventHandler<HiveTask>(HiveJobs_ItemsAdded_Removed_Reset);
-      Content.HiveTasks.ItemsRemoved += new CollectionItemsChangedEventHandler<HiveTask>(HiveJobs_ItemsAdded_Removed_Reset);
-      Content.HiveTasks.CollectionReset += new CollectionItemsChangedEventHandler<HiveTask>(HiveJobs_ItemsAdded_Removed_Reset);
+      Content.HiveTasks.ItemsAdded += new CollectionItemsChangedEventHandler<HiveTask>(HiveTasks_ItemsAdded);
+      Content.HiveTasks.ItemsRemoved += new CollectionItemsChangedEventHandler<HiveTask>(HiveTasks_ItemsRemoved);
+      Content.HiveTasks.CollectionReset += new CollectionItemsChangedEventHandler<HiveTask>(HiveTasks_CollectionReset);
     }
     private void DeregisterHiveJobEvents() {
-      Content.HiveTasks.ItemsAdded -= new CollectionItemsChangedEventHandler<HiveTask>(HiveJobs_ItemsAdded_Removed_Reset);
-      Content.HiveTasks.ItemsRemoved -= new CollectionItemsChangedEventHandler<HiveTask>(HiveJobs_ItemsAdded_Removed_Reset);
-      Content.HiveTasks.CollectionReset -= new CollectionItemsChangedEventHandler<HiveTask>(HiveJobs_ItemsAdded_Removed_Reset);
+      Content.HiveTasks.ItemsAdded -= new CollectionItemsChangedEventHandler<HiveTask>(HiveTasks_ItemsAdded);
+      Content.HiveTasks.ItemsRemoved -= new CollectionItemsChangedEventHandler<HiveTask>(HiveTasks_ItemsRemoved);
+      Content.HiveTasks.CollectionReset -= new CollectionItemsChangedEventHandler<HiveTask>(HiveTasks_CollectionReset);
     }
 
@@ -112 +114 @@
         refreshAutomaticallyCheckBox.Checked = false;
         logView.Content = null;
+        runCollectionViewHost.Content = null;
       } else {
         nameTextBox.Text = Content.Job.Name;
@@ -119 +122 @@
         refreshAutomaticallyCheckBox.Checked = Content.RefreshAutomatically;
         logView.Content = Content.Log;
+        runCollectionViewHost.Content = GetAllRunsFromJob(Content);
       }
       hiveExperimentPermissionListView.Content = null; // has to be filled by refresh button
       Content_JobStatisticsChanged(this, EventArgs.Empty);
       Content_HiveExperimentChanged(this, EventArgs.Empty);
-      Content_HiveJobChanged(this, EventArgs.Empty);
+      Content_HiveTasksChanged(this, EventArgs.Empty);
       Content_IsProgressingChanged(this, EventArgs.Empty);
       Content_StateLogListChanged(this, EventArgs.Empty);
@@ -163 +167 @@
 
     #region Content Events
-    private void HiveJobs_ItemsAdded_Removed_Reset(object sender, CollectionItemsChangedEventArgs<HiveTask> e) {
-      if (InvokeRequired)
-        Invoke(new CollectionItemsChangedEventHandler<HiveTask>(HiveJobs_ItemsAdded_Removed_Reset), sender, e);
-      else {
-        SetEnabledStateOfControls();
-      }
-    }
+    private void HiveTasks_ItemsAdded(object sender, CollectionItemsChangedEventArgs<HiveTask> e) {
+      if (InvokeRequired)
+        Invoke(new CollectionItemsChangedEventHandler<HiveTask>(HiveTasks_ItemsAdded), sender, e);
+      else {
+        foreach (HiveTask t in e.Items) {
+          t.TaskStateChanged += new EventHandler(HiveTask_TaskStateChanged);
+        }
+        SetEnabledStateOfControls();
+      }
+    }
+
+    private void HiveTasks_ItemsRemoved(object sender, CollectionItemsChangedEventArgs<HiveTask> e) {
+      if (InvokeRequired)
+        Invoke(new CollectionItemsChangedEventHandler<HiveTask>(HiveTasks_ItemsRemoved), sender, e);
+      else {
+        foreach (HiveTask t in e.Items) {
+          t.TaskStateChanged -= new EventHandler(HiveTask_TaskStateChanged);
+        }
+        SetEnabledStateOfControls();
+      }
+    }
+
+    private void HiveTasks_CollectionReset(object sender, CollectionItemsChangedEventArgs<HiveTask> e) {
+      if (InvokeRequired)
+        Invoke(new CollectionItemsChangedEventHandler<HiveTask>(HiveTasks_CollectionReset), sender, e);
+      else {
+        foreach (HiveTask t in e.Items) {
+          t.TaskStateChanged -= new EventHandler(HiveTask_TaskStateChanged);
+        }
+        SetEnabledStateOfControls();
+      }
+    }
+
+    void HiveTask_TaskStateChanged(object sender, EventArgs e) {
+      runCollectionViewHost.Content = GetAllRunsFromJob(Content);
+    }
+
     private void Content_ExecutionStateChanged(object sender, EventArgs e) {
       if (InvokeRequired)
@@ -224 +258 @@
       }
     }
-    private void Content_HiveJobChanged(object sender, EventArgs e) {
-      if (InvokeRequired)
-        Invoke(new EventHandler(Content_HiveJobChanged), sender, e);
+    private void Content_HiveTasksChanged(object sender, EventArgs e) {
+      if (InvokeRequired)
+        Invoke(new EventHandler(Content_HiveTasksChanged), sender, e);
       else {
         if (Content != null && Content.HiveTasks != null) {
@@ -236 +270 @@
         SetEnabledStateOfControls();
       }
+    }
+
+    void Content_Loaded(object sender, EventArgs e) {
+      runCollectionViewHost.Content = GetAllRunsFromJob(Content);
     }
 
@@ -419 +457 @@
       }
     }
+
+    private RunCollection GetAllRunsFromJob(RefreshableJob job) {
+      if (job != null) {
+        RunCollection runs = new RunCollection();
+
+        foreach (HiveTask subTask in job.HiveTasks) {
+          if (subTask is OptimizerHiveTask) {
+            OptimizerHiveTask ohTask = subTask as OptimizerHiveTask;
+            runs.AddRange(ohTask.ItemTask.Item.Runs);
+          }
+        }
+        return runs;
+      } else {
+        return null;
+      }
+    }
   }
 }