Changeset 7191 for trunk/sources

Timestamp:

12/15/11 16:01:58 (13 years ago)

Author:

ascheibe

Message:

#1709

• tooltip now shows the name and the id of a task
• the date is now shown on the x-axis for runs spanning multiple days

Location:

trunk/sources

Files:

• HeuristicLab.Clients.Hive.Views/3.3/GanttChart/GanttChart.Designer.cs (modified) (1 diff)
• HeuristicLab.Clients.Hive.Views/3.3/HiveTasks/HiveTaskView.designer.cs (modified) (2 diffs)
• HeuristicLab.Clients.Hive.Views/3.3/StateLog/StateLogGanttChartListView.cs (modified) (3 diffs)
• HeuristicLab.Clients.Hive/3.3/HiveJobs/HiveTask.cs (modified) (1 diff)
• HeuristicLab.Clients.Hive/3.3/ServiceClients/StateLog.cs (modified) (1 diff)

trunk/sources/HeuristicLab.Clients.Hive.Views/3.3/GanttChart/GanttChart.Designer.cs

@@ -69 +69 @@
     #endregion
 
-    private Visualization.ChartControlsExtensions.EnhancedChart chart;
+    public Visualization.ChartControlsExtensions.EnhancedChart chart;
+
+
   }
 }

trunk/sources/HeuristicLab.Clients.Hive.Views/3.3/HiveTasks/HiveTaskView.designer.cs

@@ -83 +83 @@
       this.stateLogTabPage.Size = new System.Drawing.Size(563, 375);
       this.stateLogTabPage.TabIndex = 5;
-      this.stateLogTabPage.Text = "State";
+      this.stateLogTabPage.Text = "Execution History";
       this.stateLogTabPage.UseVisualStyleBackColor = true;
       // 
@@ -301 +301 @@
       this.computeInParallelLabel.Location = new System.Drawing.Point(6, 67);
       this.computeInParallelLabel.Name = "computeInParallelLabel";
-      this.computeInParallelLabel.Size = new System.Drawing.Size(122, 13);
+      this.computeInParallelLabel.Size = new System.Drawing.Size(107, 13);
       this.computeInParallelLabel.TabIndex = 36;
-      this.computeInParallelLabel.Text = "Compute task in parallel:";
+      this.computeInParallelLabel.Text = "Distribute child tasks:";
       // 
       // computeInParallelCheckBox

trunk/sources/HeuristicLab.Clients.Hive.Views/3.3/StateLog/StateLogGanttChartListView.cs

@@ -56 +56 @@
       base.OnContentChanged();
       if (Content == null) {
-        // Add code when content has been changed and is null
         ganttChart.Reset();
       } else {
-        // Add code when content has been changed and is not null
         ganttChart.Reset();
         SetupCategories(ganttChart);
         if (Content.Count > 0) {
           DateTime maxValue = Content.Max(x => x.Count > 0 ? x.Max(y => y.DateTime) : DateTime.MinValue);
+          DateTime minValue = Content.Min(x => x.Count > 0 ? x.Min(y => y.DateTime) : DateTime.MinValue);
           DateTime upperLimit;
           if (Content.All(x => x.Count > 0 ? (x.Last().State == TaskState.Finished || x.Last().State == TaskState.Failed || x.Last().State == TaskState.Aborted) : true)) {
@@ -69 +68 @@
           } else {
             upperLimit = DateTime.Now;
+          }
+
+          if ((upperLimit - minValue) > TimeSpan.FromDays(1)) {
+            this.ganttChart.chart.Series[0].YValueType = System.Windows.Forms.DataVisualization.Charting.ChartValueType.Date;
+          } else {
+            this.ganttChart.chart.Series[0].YValueType = System.Windows.Forms.DataVisualization.Charting.ChartValueType.Time;
           }
 
@@ -98 +103 @@
       DateTime until = to != null ? to.DateTime : upperLimit;
       TimeSpan duration = until - from.DateTime;
-      string tooltip = string.Format("State: {0} " + Environment.NewLine + " Duration: {1} " + Environment.NewLine + " {2} - {3}", from.State, duration, from.DateTime, until);
+      string tooltip = string.Format("Task: {0} " + Environment.NewLine + "Task Id: {1}" + Environment.NewLine + "State: {2} " + Environment.NewLine + "Duration: {3} " + Environment.NewLine + "{4} - {5}", from.TaskName, from.TaskId, from.State, duration, from.DateTime, until);
       if (!string.IsNullOrEmpty(from.Exception))
         tooltip += Environment.NewLine + from.Exception;

trunk/sources/HeuristicLab.Clients.Hive/3.3/HiveJobs/HiveTask.cs

@@ -143 +143 @@
 
     public StateLogList StateLog {
-      get { return new StateLogList(this.task.StateLog); }
+      get {
+        var list = new StateLogList(this.task.StateLog);
+        list.ForEach(s => { s.TaskName = itemTask.Name; });
+        return list;
+      }
     }
 

trunk/sources/HeuristicLab.Clients.Hive/3.3/ServiceClients/StateLog.cs

@@ -38 +38 @@
     }
 
+    public string TaskName { get; set; }
+
     public override IDeepCloneable Clone(Cloner cloner) {
       return new StateLog(this, cloner);