Changeset 6791 for branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive.ExperimentManager/3.3/Views/RefreshableHiveExperimentView.cs

Timestamp:

09/16/11 20:19:53 (13 years ago)

Author:

ascheibe

Message:

#1233 implemented Experiment Manager review comments

File:

• branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive.ExperimentManager/3.3/Views/RefreshableHiveExperimentView.cs (modified) (5 diffs)

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

@@ -40 +40 @@
   [View("Hive Experiment View")]
   [Content(typeof(RefreshableJob), true)]
-  public sealed partial class RefreshableHiveExperimentView : ItemView {
+  public partial class RefreshableHiveExperimentView : HeuristicLab.Core.Views.ItemView {
     private ProgressView progressView;
 
@@ -87 +87 @@
       Content.Job.PropertyChanged += new PropertyChangedEventHandler(HiveExperiment_PropertyChanged);
     }
-    
+
     private void DeregisterHiveExperimentEvents() {
       Content.Job.PropertyChanged -= new PropertyChangedEventHandler(HiveExperiment_PropertyChanged);
@@ -253 +253 @@
       else {
         if (Content != null) {
-          jobsTextBox.Text = Content.Job.JobCount.ToString();
+          jobsTextBox.Text = (Content.Job.JobCount - Content.Job.CalculatingCount - Content.Job.FinishedCount).ToString();
           calculatingTextBox.Text = Content.Job.CalculatingCount.ToString();
           finishedTextBox.Text = Content.Job.FinishedCount.ToString();
@@ -291 +291 @@
 
     private void HiveExperiment_PropertyChanged(object sender, PropertyChangedEventArgs e) {
-      if(this.Content != null && e.PropertyName == "Id") this.hiveExperimentPermissionListView.HiveExperimentId = this.Content.Job.Id;
+      if (this.Content != null && e.PropertyName == "Id") this.hiveExperimentPermissionListView.HiveExperimentId = this.Content.Job.Id;
     }
     #endregion
@@ -413 +413 @@
 
     private void tabControl_SelectedIndexChanged(object sender, EventArgs e) {
-      if (tabControl.SelectedTab == sharingTabPage) {
+      if (tabControl.SelectedTab == permissionTabPage) {
         if (!Content.IsSharable) {
           MessageBox.Show("Unable to load tab. You have insufficient access privileges.");
-          tabControl.SelectedTab = jobsTabPage;
+          tabControl.SelectedTab = tasksTabPage;
         }
       }