Changeset 4049

Timestamp:

07/19/10 17:31:28 (14 years ago)

Author:

mkommend

Message:

adapted bubble chart to handle TimeSpanValues correctly (ticket #1047)

Location:

trunk/sources/HeuristicLab.Optimization.Views/3.3

Files:

• RunCollectionBubbleChartView.Designer.cs (modified) (2 diffs)
• RunCollectionBubbleChartView.cs (modified) (8 diffs)

trunk/sources/HeuristicLab.Optimization.Views/3.3/RunCollectionBubbleChartView.Designer.cs

@@ -199 +199 @@
       this.chart.MouseMove += new System.Windows.Forms.MouseEventHandler(this.chart_MouseMove);
       this.chart.MouseDown += new System.Windows.Forms.MouseEventHandler(this.chart_MouseDown);
+      this.chart.AxisViewChanged += new System.EventHandler<System.Windows.Forms.DataVisualization.Charting.ViewEventArgs>(chart_AxisViewChanged);
       // 
       // zoomButton
@@ -293 +294 @@
       this.ResumeLayout(false);
       this.PerformLayout();
-
     }
-
     #endregion
 

trunk/sources/HeuristicLab.Optimization.Views/3.3/RunCollectionBubbleChartView.cs

@@ -137 +137 @@
       } else
         AddDataPoint(run);
-        UpdateCursorInterval();
+      UpdateCursorInterval();
 
 
@@ -275 +275 @@
         DoubleValue doubleValue = value as DoubleValue;
         IntValue intValue = value as IntValue;
+        TimeSpanValue timeSpanValue = value as TimeSpanValue;
         double? ret = null;
         if (doubleValue != null) {
@@ -281 +282 @@
         } else if (intValue != null)
           ret = intValue.Value;
-        else
+        else if (timeSpanValue != null) {
+          ret = timeSpanValue.Value.TotalSeconds;
+        } else
           ret = GetCategoricalValue(columnIndex, value.ToString());
 
@@ -339 +342 @@
       double xRange = xValues.Max() - xValues.Min();
       double yRange = yValues.Max() - yValues.Min();
-      if(xRange.IsAlmost(0.0)) xRange = 1.0;
-      if(yRange.IsAlmost(0.0)) yRange = 1.0;
+      if (xRange.IsAlmost(0.0)) xRange = 1.0;
+      if (yRange.IsAlmost(0.0)) yRange = 1.0;
       double xDigits = (int)Math.Log10(xRange) - 3;
       double yDigits = (int)Math.Log10(yRange) - 3;
@@ -347 +350 @@
       this.chart.ChartAreas[0].CursorX.Interval = xZoomInterval;
       this.chart.ChartAreas[0].CursorY.Interval = yZoomInterval;
+
+      //code to handle TimeSpanValues correct
+      int axisDimensionCount = Enum.GetNames(typeof(AxisDimension)).Count();
+      int columnIndex = xAxisComboBox.SelectedIndex - axisDimensionCount;
+      if (columnIndex >= 0 && Content.GetValue(0, columnIndex) is TimeSpanValue)
+        this.chart.ChartAreas[0].CursorX.Interval = 1;
+      columnIndex = yAxisComboBox.SelectedIndex - axisDimensionCount;
+      if (columnIndex >= 0 && Content.GetValue(0, columnIndex) is TimeSpanValue)
+        this.chart.ChartAreas[0].CursorY.Interval = 1;
     }
 
@@ -447 +459 @@
       string sizeString = sizeValue == null ? string.Empty : sizeValue.Value.ToString();
 
+      //code to handle TimeSpanValues correct
+      int axisDimensionCount = Enum.GetNames(typeof(AxisDimension)).Count();
+      int columnIndex = xAxisComboBox.SelectedIndex - axisDimensionCount;
+      if (xValue.HasValue && columnIndex > 0 && Content.GetValue(0, columnIndex) is TimeSpanValue) {
+        TimeSpan time = TimeSpan.FromSeconds(xValue.Value);
+        xString = string.Format("{0:00}:{1:00}:{2:00.00}", (int)time.TotalHours, time.Minutes, time.TotalSeconds);
+      }
+      columnIndex = yAxisComboBox.SelectedIndex - axisDimensionCount;
+      if (yValue.HasValue && columnIndex > 0 && Content.GetValue(0, columnIndex) is TimeSpanValue) {
+        TimeSpan time = TimeSpan.FromSeconds(yValue.Value);
+        yString = string.Format("{0:00}:{1:00}:{2:00.00}", (int)time.TotalHours, time.Minutes, time.TotalSeconds);
+      }
+
       tooltip += xAxisComboBox.SelectedItem + " : " + xString + Environment.NewLine;
       tooltip += yAxisComboBox.SelectedItem + " : " + yString + Environment.NewLine;
@@ -483 +508 @@
       SetCustomAxisLabels(yAxis, yAxisComboBox.SelectedIndex - axisDimensionCount);
     }
+
+    private void chart_AxisViewChanged(object sender, System.Windows.Forms.DataVisualization.Charting.ViewEventArgs e) {
+      this.UpdateAxisLabels();
+    }
+
     private void SetCustomAxisLabels(Axis axis, int dimension) {
       axis.CustomLabels.Clear();
@@ -498 +528 @@
         axis.LabelStyle.Angle = 0;
         axis.LabelStyle.TruncatedLabels = true;
+      } else if (dimension > 0 && Content.GetValue(0, dimension) is TimeSpanValue) {
+        this.chart.ChartAreas[0].RecalculateAxesScale();
+        for (double i = axis.Minimum; i <= axis.Maximum; i += axis.LabelStyle.Interval) {
+          TimeSpan time = TimeSpan.FromSeconds(i);
+          string x = string.Format("{0:00}:{1:00}:{2:00.00}", (int)time.TotalHours, time.Minutes, time.TotalSeconds);
+          axis.CustomLabels.Add(i - 0.5, i + 0.5, x);
+        }
       }
     }