Changeset 6006 for branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive.Views/3.4/ExperimentManager/HiveExperimentView.cs

Timestamp:

04/12/11 13:43:05 (13 years ago)

Author:

cneumuel

Message:

#1233

• changed relationship between Job and HiveExperiment. There is no more HiveExperiment.RootJobId, instead there is Job.HiveExperimentId.
• One HiveExperiment can now have multiple Experiments.
• TreeView supports multiple root nodes
• HiveEngine creates a HiveExperiment for each set of jobs, so jobs cannot be without an parent experiment anymore (no more loose jobs)
• updated ExperimentManager binaries

Location:

branches/HeuristicLab.Hive-3.4/sources

Files:

• . (modified) (1 prop)
• HeuristicLab.Clients.Hive.Views/3.4/ExperimentManager/HiveExperimentView.cs (modified) (14 diffs)

branches/HeuristicLab.Hive-3.4/sources

@@ -4 +4 @@
 PrecompiledWeb
 CreateEventLogSources
+WindowsFormsTestProject

@@ -4 +4 @@
 PrecompiledWeb
 CreateEventLogSources
+WindowsFormsTestProject

branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive.Views/3.4/ExperimentManager/HiveExperimentView.cs

@@ -22 +22 @@
 using System;
 using System.ComponentModel;
+using System.Linq;
 using System.Threading;
 using System.Windows.Forms;
+using HeuristicLab.Collections;
 using HeuristicLab.Common;
 using HeuristicLab.Core;
@@ -34 +36 @@
   /// The base class for visual representations of items.
   /// </summary>
-  [View("Experiment View")]
+  [View("Hive Experiment View")]
   [Content(typeof(HiveExperiment), true)]
   public sealed partial class HiveExperimentView : ItemView {
@@ -52 +54 @@
 
     protected override void DeregisterContentEvents() {
-      //Content.ExceptionOccurred -= new EventHandler<EventArgs<Exception>>(Content_ExceptionOccurred);
       Content.ExecutionStateChanged -= new EventHandler(Content_ExecutionStateChanged);
       Content.ExecutionTimeChanged -= new EventHandler(Content_ExecutionTimeChanged);
-      //Content.Prepared -= new EventHandler(Content_Prepared);
-      //Content.Started -= new EventHandler(Content_Started);
-      //Content.Paused -= new EventHandler(Content_Paused);
-      //Content.Stopped -= new EventHandler(Content_Stopped);
       Content.RefreshAutomaticallyChanged -= new EventHandler(Content_RefreshAutomaticallyChanged);
-      Content.HiveJobChanged -= new EventHandler(Content_HiveJobChanged);
+      Content.HiveJobsChanged -= new EventHandler(Content_HiveJobChanged);
       Content.IsProgressingChanged -= new EventHandler(Content_IsProgressingChanged);
       Content.PropertyChanged -= new System.ComponentModel.PropertyChangedEventHandler(Content_PropertyChanged);
@@ -68 +65 @@
     protected override void RegisterContentEvents() {
       base.RegisterContentEvents();
-      //Content.ExceptionOccurred += new EventHandler<EventArgs<Exception>>(Content_ExceptionOccurred);
       Content.ExecutionStateChanged += new EventHandler(Content_ExecutionStateChanged);
       Content.ExecutionTimeChanged += new EventHandler(Content_ExecutionTimeChanged);
-      //Content.Prepared += new EventHandler(Content_Prepared);
-      //Content.Started += new EventHandler(Content_Started);
-      //Content.Paused += new EventHandler(Content_Paused);
-      //Content.Stopped += new EventHandler(Content_Stopped);
       Content.RefreshAutomaticallyChanged += new EventHandler(Content_RefreshAutomaticallyChanged);
-      Content.HiveJobChanged += new EventHandler(Content_HiveJobChanged);
+      Content.HiveJobsChanged += new EventHandler(Content_HiveJobChanged);
       Content.IsProgressingChanged += new EventHandler(Content_IsProgressingChanged);
       Content.PropertyChanged += new System.ComponentModel.PropertyChangedEventHandler(Content_PropertyChanged);
@@ -119 +111 @@
 
       if (Content != null) {
-        bool alreadyUploaded = Content.RootJobId != null && Content.Id != Guid.Empty;
-        bool jobsLoaded = Content.HiveJob != null && Content.HiveJob.Job.Id != Guid.Empty;
+        bool alreadyUploaded = Content.Id != Guid.Empty;
+        bool jobsLoaded = Content.HiveJobs != null && Content.HiveJobs.All(x => x.Job.Id != Guid.Empty);
 
         this.nameTextBox.ReadOnly = Content.ExecutionState != ExecutionState.Prepared || alreadyUploaded;
@@ -127 +119 @@
         this.useLocalPluginsCheckBox.Enabled = !(Content.ExecutionState != ExecutionState.Prepared || alreadyUploaded);
         this.refreshAutomaticallyCheckBox.Enabled = alreadyUploaded && jobsLoaded && Content.ExecutionState == ExecutionState.Started;
-        this.viewExperimentButton.Enabled = Content.GetExperiment() != null;
+        this.viewExperimentButton.Enabled = Content.GetExperiment(0) != null;
         this.openExperimentButton.Enabled = !alreadyUploaded && Content.ExecutionState == ExecutionState.Prepared;
         this.newExperimentButton.Enabled = !alreadyUploaded && Content.ExecutionState == ExecutionState.Prepared;
@@ -146 +138 @@
 
     #region Content Events
+    private void HiveJobs_ItemsAdded_Removed_Reset(object sender, CollectionItemsChangedEventArgs<HiveJob> e) {
+      if (InvokeRequired)
+        Invoke(new CollectionItemsChangedEventHandler<HiveJob>(HiveJobs_ItemsAdded_Removed_Reset), sender, e);
+      else {
+        SetEnabledStateOfControls();
+      }
+    }
     private void Content_ExecutionStateChanged(object sender, EventArgs e) {
       if (InvokeRequired)
@@ -192 +191 @@
         executionTimeTextBox.Text = Content.ExecutionTime.ToString();
     }
-    private void Content_ExceptionOccurred(object sender, EventArgs<Exception> e) {
-      if (InvokeRequired)
-        Invoke(new EventHandler<EventArgs<Exception>>(Content_ExceptionOccurred), sender, e);
-      else
-        ErrorHandling.ShowErrorDialog(this, e.Value);
-    }
     private void Content_RefreshAutomaticallyChanged(object sender, EventArgs e) {
       if (InvokeRequired)
@@ -210 +203 @@
         Invoke(new EventHandler(Content_HiveJobChanged), sender, e);
       else {
-        if (Content != null) {
-          jobsTreeView.Content = Content.HiveJob;
-          experimentNamedItemView.Content = Content.GetExperiment();
+        if (Content != null && Content.HiveJobs != null) {
+          jobsTreeView.Content = Content.HiveJobs;
+          experimentNamedItemView.Content = Content.GetExperiment(0);
+          RegisterHiveJobEvents();
         } else {
           jobsTreeView.Content = null;
@@ -220 +214 @@
       }
     }
+
+    private void RegisterHiveJobEvents() {
+      Content.HiveJobs.ItemsAdded += new Collections.CollectionItemsChangedEventHandler<HiveJob>(HiveJobs_ItemsAdded_Removed_Reset);
+      Content.HiveJobs.ItemsRemoved += new Collections.CollectionItemsChangedEventHandler<HiveJob>(HiveJobs_ItemsAdded_Removed_Reset);
+      Content.HiveJobs.CollectionReset += new Collections.CollectionItemsChangedEventHandler<HiveJob>(HiveJobs_ItemsAdded_Removed_Reset);
+    }
+    private void DeregisterHiveJobEvents() {
+      Content.HiveJobs.ItemsAdded -= new Collections.CollectionItemsChangedEventHandler<HiveJob>(HiveJobs_ItemsAdded_Removed_Reset);
+      Content.HiveJobs.ItemsRemoved -= new Collections.CollectionItemsChangedEventHandler<HiveJob>(HiveJobs_ItemsAdded_Removed_Reset);
+      Content.HiveJobs.CollectionReset -= new Collections.CollectionItemsChangedEventHandler<HiveJob>(HiveJobs_ItemsAdded_Removed_Reset);
+    }
+
     private void Content_PropertyChanged(object sender, PropertyChangedEventArgs e) {
       if (InvokeRequired)
@@ -241 +247 @@
       ExperimentManagerClient.StopExperiment(Content);
     }
-    private void resetButton_Click(object sender, EventArgs e) {  }
+    private void resetButton_Click(object sender, EventArgs e) { }
 
     private void nameTextBox_Validated(object sender, EventArgs e) {
@@ -271 +277 @@
 
     private void showExperimentButton_Click(object sender, EventArgs e) {
-      MainFormManager.MainForm.ShowContent(Content.GetExperiment());
+      MainFormManager.MainForm.ShowContent(Content.GetExperiment(0));
     }
 
     private void viewExperimentButton_Click(object sender, EventArgs e) {
-      MainFormManager.MainForm.ShowContent(Content.GetExperiment());
+      MainFormManager.MainForm.ShowContent(Content.GetExperiment(0));
     }
 
@@ -310 +316 @@
         startButton.Enabled = pauseButton.Enabled = stopButton.Enabled = resetButton.Enabled = false;
       } else {
-        startButton.Enabled = Content.GetExperiment() != null && Content.ExecutionState == ExecutionState.Prepared;
+        startButton.Enabled = Content.GetExperiment(0) != null && Content.ExecutionState == ExecutionState.Prepared;
         pauseButton.Enabled = Content.ExecutionState == ExecutionState.Started;
         stopButton.Enabled = Content.ExecutionState == ExecutionState.Started;
@@ -346 +352 @@
     }
     #endregion
- 
+
   }
 }

@@ -4 +4 @@
 PrecompiledWeb
 CreateEventLogSources
+WindowsFormsTestProject