Changeset 6200 for branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive.Views/3.4/ExperimentManager

Timestamp:

05/16/11 00:18:48 (13 years ago)

Author:

cneumuel

Message:

#1233

• stability improvements for HiveEngine

Location:

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

Files:

• HiveJobView.cs (modified) (2 diffs)
• RefreshableHiveExperimentView.cs (modified) (6 diffs)

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

@@ -46 +46 @@
     protected override void RegisterContentEvents() {
       base.RegisterContentEvents();
-      Content.JobItemChanged += new EventHandler(Content_JobItemChanged);
+      Content.ItemJobChanged += new EventHandler(Content_JobItemChanged);
       Content.JobChanged += new EventHandler(Content_JobChanged);
       Content.JobStateChanged += new EventHandler(Content_JobStateChanged);
@@ -52 +52 @@
 
     protected override void DeregisterContentEvents() {
-      Content.JobItemChanged -= new EventHandler(Content_JobItemChanged);
+      Content.ItemJobChanged -= new EventHandler(Content_JobItemChanged);
       Content.JobChanged -= new EventHandler(Content_JobChanged);
       Content.JobStateChanged -= new EventHandler(Content_JobStateChanged);

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

@@ -21 +21 @@
 
 using System;
-using System.ComponentModel;
 using System.Linq;
 using System.Threading;
@@ -58 +57 @@
       base.RegisterContentEvents();
       Content.RefreshAutomaticallyChanged += new EventHandler(Content_RefreshAutomaticallyChanged);
-      Content.PropertyChanged += new System.ComponentModel.PropertyChangedEventHandler(Content_PropertyChanged);
       Content.HiveExperimentChanged += new EventHandler(Content_HiveExperimentChanged);
       Content.IsControllableChanged += new EventHandler(Content_IsControllableChanged);
-    }
+      Content.JobStatisticsChanged += new EventHandler(Content_JobStatisticsChanged);
+    }
+
     protected override void DeregisterContentEvents() {
       Content.RefreshAutomaticallyChanged -= new EventHandler(Content_RefreshAutomaticallyChanged);
-      Content.PropertyChanged -= new System.ComponentModel.PropertyChangedEventHandler(Content_PropertyChanged);
       Content.HiveExperimentChanged -= new EventHandler(Content_HiveExperimentChanged);
       Content.IsControllableChanged -= new EventHandler(Content_IsControllableChanged);
+      Content.JobStatisticsChanged -= new EventHandler(Content_JobStatisticsChanged);
       base.DeregisterContentEvents();
     }
@@ -104 +104 @@
         //includeJobsCheckBox.Checked = false;
         refreshAutomaticallyCheckBox.Checked = false;
-        jobsTextBox.Text = "0";
-        calculatingTextBox.Text = "0";
-        finishedTextBox.Text = "0";
         logView.Content = null;
       } else {
@@ -115 +112 @@
         //includeJobsCheckBox.Checked = Content.IncludeJobs;
         refreshAutomaticallyCheckBox.Checked = Content.RefreshAutomatically;
-        jobsTextBox.Text = Content.HiveExperiment.JobCount.ToString();
-        calculatingTextBox.Text = Content.HiveExperiment.CalculatingCount.ToString();
-        finishedTextBox.Text = Content.HiveExperiment.FinishedCount.ToString();
         logView.Content = Content.Log;
       }
+      Content_JobStatisticsChanged(this, EventArgs.Empty);
       Content_HiveExperimentChanged(this, EventArgs.Empty);
       Content_HiveJobChanged(this, EventArgs.Empty);
@@ -233 +228 @@
     }
 
-    private void Content_PropertyChanged(object sender, PropertyChangedEventArgs e) {
-      if (InvokeRequired)
-        Invoke(new PropertyChangedEventHandler(Content_PropertyChanged), sender, e);
-      else {
-        jobsTextBox.Text = Content.HiveExperiment.JobCount.ToString();
-        calculatingTextBox.Text = Content.HiveExperiment.CalculatingCount.ToString();
-        finishedTextBox.Text = Content.HiveExperiment.FinishedCount.ToString();
-      }
-    }
-
     private void Content_HiveExperimentChanged(object sender, EventArgs e) {
       if (Content.HiveExperiment != null) {
@@ -252 +237 @@
       SetEnabledStateOfControls();
     }
+    private void Content_JobStatisticsChanged(object sender, EventArgs e) {
+      if (InvokeRequired)
+        Invoke(new EventHandler(Content_JobStatisticsChanged), sender, e);
+      else {
+        if (Content != null) {
+          jobsTextBox.Text = Content.HiveExperiment.JobCount.ToString();
+          calculatingTextBox.Text = Content.HiveExperiment.CalculatingCount.ToString();
+          finishedTextBox.Text = Content.HiveExperiment.FinishedCount.ToString();
+        } else {
+          jobsTextBox.Text = "0";
+          calculatingTextBox.Text = "0";
+          finishedTextBox.Text = "0";
+        }
+      }
+    }
     #endregion
 
     #region Control events
     private void startButton_Click(object sender, EventArgs e) {
-      ExperimentManagerClient.StartExperiment(new Action<Exception>((Exception ex) => ErrorHandling.ShowErrorDialog(this, "Start failed.", ex)), Content);
+      ExperimentManagerClient.StartExperiment((Exception ex) => ErrorHandling.ShowErrorDialog(this, "Start failed.", ex), Content);
     }
     private void pauseButton_Click(object sender, EventArgs e) {