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

Timestamp:

03/02/11 18:26:45 (14 years ago)

Author:

cneumuel

Message:

#1233

• extended jobview to show statelog as list with details or as ganttview
• also a ganttview of all statelogs of all childjobs was implemented

Location:

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

Files:

• GanttChart.Designer.cs (added)
• GanttChart.cs (added)
• GanttChart.resx (added)
• HiveJobView.cs (modified) (3 diffs)
• HiveJobView.designer.cs (modified) (8 diffs)
• HiveJobView.resx (modified) (1 diff)
• StateLogGanttChartListView.cs (added)
• StateLogGanttChartListView.designer.cs (added)
• StateLogGanttChartListView.resx (added)
• StateLogGanttChartView.cs (added)
• StateLogGanttChartView.designer.cs (added)
• StateLogGanttChartView.resx (added)
• StateLogItemList.cs (added)
• StateLogListView.cs (added)
• StateLogListView.designer.cs (added)
• StateLogView.cs (added)
• StateLogView.designer.cs (added)
• StateLogView.resx (added)

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

@@ -21 +21 @@
 
 using System;
+using System.Linq;
 using System.Windows.Forms;
+using HeuristicLab.Core;
 using HeuristicLab.Core.Views;
 using HeuristicLab.MainForm;
@@ -132 +134 @@
           this.dateFinishedTextBox.Text = Content.Job.DateFinished.ToString();
           this.exceptionTextBox.Text = Content.Job.CurrentStateLog.Exception;
+          if (Content.OptimizerJob.ComputeInParallel) {
+            this.stateLogViewHost.Content = new ItemList<StateLogItemList>(
+                this.Content.ChildHiveJobs.Select(child => new StateLogItemList(child.Job.StateLog.Select(x => new StateLogItem(x)))
+              ));
+          } else {
+            this.stateLogViewHost.Content = new StateLogItemList(Content.Job.StateLog.Select(x => new StateLogItem(x)));
+          }
         } else {
           this.stateTextBox.Text = string.Empty;
@@ -138 +147 @@
           this.dateFinishedTextBox.Text = string.Empty;
           this.exceptionTextBox.Text = string.Empty;
+          this.stateLogViewHost.Content = null;
         }
       }

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

@@ -53 +53 @@
       this.jobIdTextBox = new System.Windows.Forms.TextBox();
       this.childJobsTabPage = new System.Windows.Forms.TabPage();
-      this.childHiveJobView = new HiveJobListView();
       this.runsTabPage = new System.Windows.Forms.TabPage();
+      this.runCollectionViewHost = new HeuristicLab.MainForm.WindowsForms.ViewHost();
+      this.stateLogTabPage = new System.Windows.Forms.TabPage();
       this.logTabPage = new System.Windows.Forms.TabPage();
       this.logView = new HeuristicLab.Core.Views.LogView();
-      this.runCollectionViewHost = new HeuristicLab.MainForm.WindowsForms.ViewHost();
+      this.stateLogViewHost = new HeuristicLab.MainForm.WindowsForms.ViewHost();
+      this.childHiveJobView = new HeuristicLab.Clients.Hive.Views.HiveJobListView();
       this.jobStatusGroupBox.SuspendLayout();
       this.tabControl.SuspendLayout();
@@ -65 +67 @@
       this.childJobsTabPage.SuspendLayout();
       this.runsTabPage.SuspendLayout();
+      this.stateLogTabPage.SuspendLayout();
       this.logTabPage.SuspendLayout();
       this.SuspendLayout();
@@ -205 +208 @@
       this.tabControl.Controls.Add(this.childJobsTabPage);
       this.tabControl.Controls.Add(this.runsTabPage);
+      this.tabControl.Controls.Add(this.stateLogTabPage);
       this.tabControl.Controls.Add(this.logTabPage);
       this.tabControl.Location = new System.Drawing.Point(3, 3);
@@ -371 +375 @@
       this.childJobsTabPage.UseVisualStyleBackColor = true;
       // 
-      // childHiveJobView
-      // 
-      this.childHiveJobView.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.childHiveJobView.Caption = "JobItemList View";
-      this.childHiveJobView.Content = null;
-      this.childHiveJobView.Location = new System.Drawing.Point(3, 3);
-      this.childHiveJobView.Name = "childHiveJobView";
-      this.childHiveJobView.ReadOnly = false;
-      this.childHiveJobView.Size = new System.Drawing.Size(613, 486);
-      this.childHiveJobView.TabIndex = 0;
-      // 
       // runsTabPage
       // 
@@ -393 +384 @@
       this.runsTabPage.Text = "Runs";
       this.runsTabPage.UseVisualStyleBackColor = true;
+      // 
+      // 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(613, 486);
+      this.runCollectionViewHost.TabIndex = 0;
+      this.runCollectionViewHost.ViewsLabelVisible = true;
+      this.runCollectionViewHost.ViewType = null;
+      // 
+      // stateLogTabPage
+      // 
+      this.stateLogTabPage.Controls.Add(this.stateLogViewHost);
+      this.stateLogTabPage.Location = new System.Drawing.Point(4, 22);
+      this.stateLogTabPage.Name = "stateLogTabPage";
+      this.stateLogTabPage.Size = new System.Drawing.Size(619, 492);
+      this.stateLogTabPage.TabIndex = 5;
+      this.stateLogTabPage.Text = "StateLog";
+      this.stateLogTabPage.UseVisualStyleBackColor = true;
       // 
       // logTabPage
@@ -418 +435 @@
       this.logView.TabIndex = 0;
       // 
-      // runCollectionViewHost
-      // 
-      this.runCollectionViewHost.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
+      // stateLogViewHost
+      // 
+      this.stateLogViewHost.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(613, 486);
-      this.runCollectionViewHost.TabIndex = 0;
-      this.runCollectionViewHost.ViewType = null;
+      this.stateLogViewHost.Caption = "View";
+      this.stateLogViewHost.Content = null;
+      this.stateLogViewHost.Enabled = false;
+      this.stateLogViewHost.Location = new System.Drawing.Point(0, 0);
+      this.stateLogViewHost.Name = "stateLogViewHost";
+      this.stateLogViewHost.ReadOnly = false;
+      this.stateLogViewHost.Size = new System.Drawing.Size(619, 492);
+      this.stateLogViewHost.TabIndex = 0;
+      this.stateLogViewHost.ViewsLabelVisible = true;
+      this.stateLogViewHost.ViewType = null;
+      // 
+      // childHiveJobView
+      // 
+      this.childHiveJobView.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.childHiveJobView.Caption = "JobItemList View";
+      this.childHiveJobView.Content = null;
+      this.childHiveJobView.Location = new System.Drawing.Point(3, 3);
+      this.childHiveJobView.Name = "childHiveJobView";
+      this.childHiveJobView.ReadOnly = false;
+      this.childHiveJobView.Size = new System.Drawing.Size(613, 486);
+      this.childHiveJobView.TabIndex = 0;
       // 
       // HiveJobView
@@ -450 +481 @@
       this.childJobsTabPage.ResumeLayout(false);
       this.runsTabPage.ResumeLayout(false);
+      this.stateLogTabPage.ResumeLayout(false);
       this.logTabPage.ResumeLayout(false);
       this.ResumeLayout(false);
@@ -491 +523 @@
     private System.Windows.Forms.TabPage runsTabPage;
     private MainForm.WindowsForms.ViewHost runCollectionViewHost;
+    private System.Windows.Forms.TabPage stateLogTabPage;
+    private MainForm.WindowsForms.ViewHost stateLogViewHost;
   }
 }

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

@@ -113 +113 @@
   </resheader>
   <resheader name="reader">
-    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
   <resheader name="writer">
-    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
 </root>