Changeset 7215 for branches/HeuristicLab.Hive.Azure/HeuristicLab.Clients.Hive.Views/3.3/StateLog

Timestamp:

12/20/11 13:54:57 (13 years ago)

Author:

spimming

Message:

#1680:

• merged changes from trunk into branch

' removed pre-build event for multiple app.configs

Location:

branches/HeuristicLab.Hive.Azure

Files:

• . (modified) (2 props)
• HeuristicLab.Clients.Hive.Views/3.3/StateLog/StateLogGanttChartListView.cs (modified) (3 diffs)

branches/HeuristicLab.Hive.Azure

@@ -4 +4 @@
 *.suo
 *.vsp
+Doxygen
 Google.ProtocolBuffers-0.9.1.dll
 HeuristicLab 3.3.5.1.ReSharper.user
 HeuristicLab 3.3.6.0.ReSharper.user
 HeuristicLab.4.5.resharper.user
+HeuristicLab.ExtLibs.6.0.ReSharper.user
 HeuristicLab.resharper.user
 ProtoGen.exe
@@ -16 +18 @@
 bin
 protoc.exe
-HeuristicLab.ExtLibs.6.0.ReSharper.user
-Doxygen

@@ -4 +4 @@
 *.suo
 *.vsp
+Doxygen
 Google.ProtocolBuffers-0.9.1.dll
 HeuristicLab 3.3.5.1.ReSharper.user
 HeuristicLab 3.3.6.0.ReSharper.user
 HeuristicLab.4.5.resharper.user
+HeuristicLab.ExtLibs.6.0.ReSharper.user
 HeuristicLab.resharper.user
 ProtoGen.exe
@@ -16 +18 @@
 bin
 protoc.exe
-HeuristicLab.ExtLibs.6.0.ReSharper.user
-Doxygen

branches/HeuristicLab.Hive.Azure/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;

@@ -4 +4 @@
 *.suo
 *.vsp
+Doxygen
 Google.ProtocolBuffers-0.9.1.dll
 HeuristicLab 3.3.5.1.ReSharper.user
 HeuristicLab 3.3.6.0.ReSharper.user
 HeuristicLab.4.5.resharper.user
+HeuristicLab.ExtLibs.6.0.ReSharper.user
 HeuristicLab.resharper.user
 ProtoGen.exe
@@ -16 +18 @@
 bin
 protoc.exe
-HeuristicLab.ExtLibs.6.0.ReSharper.user
-Doxygen