Changeset 6011 for branches/histogram/HeuristicLab.Analysis.Views/3.3/DataTableView.cs

Timestamp:

04/15/11 14:54:43 (13 years ago)

Author:

abeham

Message:

#1465

• updated branch with changes from trunk
• fixed some bugs
• introduced secondary x-axis option

Location:

branches/histogram

Files:

• . (modified) (1 prop)
• HeuristicLab.Analysis.Views/3.3/DataTableView.cs (modified) (4 diffs)

branches/histogram/HeuristicLab.Analysis.Views/3.3/DataTableView.cs

@@ -142 +142 @@
       }
       series.YAxisType = row.VisualProperties.SecondYAxis ? AxisType.Secondary : AxisType.Primary;
+      series.XAxisType = row.VisualProperties.SecondXAxis ? AxisType.Secondary : AxisType.Primary;
       if (row.VisualProperties.Color != Color.Empty) series.Color = row.VisualProperties.Color;
       series.ToolTip = row.Name + " X = #INDEX, Y = #VAL";
@@ -305 +306 @@
             chart.Series[row.Name].ChartType = SeriesChartType.Column;
             chart.Series[row.Name]["PointWidth"] = "1";
+            CalculateHistogram(chart.Series[row.Name], row);
             break;
           default:
@@ -311 +313 @@
         }
         chart.Series[row.Name].YAxisType = row.VisualProperties.SecondYAxis ? AxisType.Secondary : AxisType.Primary;
+        chart.Series[row.Name].XAxisType = row.VisualProperties.SecondXAxis ? AxisType.Secondary : AxisType.Primary;
         if (row.VisualProperties.Color != Color.Empty) chart.Series[row.Name].Color = row.VisualProperties.Color;
         chart.ChartAreas[0].RecalculateAxesScale();
@@ -444 +447 @@
 
     private void FillSeriesWithRowValues(Series series, DataRow row) {
-      if (row.VisualProperties.ChartType == DataRowVisualProperties.DataRowChartType.Histogram) {
-        series.Points.Clear();
-        if (!row.Values.Any()) return;
-        int bins = row.VisualProperties.Bins;
-
-        double minValue = row.Values.Min();
-        double maxValue = row.Values.Max();
-        double intervalWidth = (maxValue - minValue) / bins;
-        if (intervalWidth <= 0) return;
-
-        if (!row.VisualProperties.ExactBins) {
-          intervalWidth = HumanRoundRange(intervalWidth);
-          minValue = Math.Floor(minValue / intervalWidth) * intervalWidth;
-          maxValue = Math.Ceiling(maxValue / intervalWidth) * intervalWidth;
-        }
-
-        double current = minValue, intervalCenter = intervalWidth / 2.0;
-        int frequency = 0;
-        foreach (double v in row.Values.Where(x => !IsInvalidValue(x)).OrderBy(x => x)) {
-          while (v > current + intervalWidth) {
-            series.Points.AddXY(current + intervalCenter, frequency);
-            current += intervalWidth;
-            frequency = 0;
-          }
-          frequency++;
-        }
-        series.Points.AddXY(current + intervalCenter, frequency);
-      } else {
-        for (int i = 0; i < row.Values.Count; i++) {
-          var value = row.Values[i];
-          DataPoint point = new DataPoint();
-          point.XValue = row.VisualProperties.StartIndexZero ? i : i + 1;
-          if (IsInvalidValue(value))
-            point.IsEmpty = true;
-          else
-            point.YValues = new double[] { value };
-          series.Points.Add(point);
-        }
-      }
+      switch (row.VisualProperties.ChartType) {
+        case DataRowVisualProperties.DataRowChartType.Histogram:
+          CalculateHistogram(series, row);
+          break;
+        default: {
+            for (int i = 0; i < row.Values.Count; i++) {
+              var value = row.Values[i];
+              DataPoint point = new DataPoint();
+              point.XValue = row.VisualProperties.StartIndexZero ? i : i + 1;
+              if (IsInvalidValue(value))
+                point.IsEmpty = true;
+              else
+                point.YValues = new double[] { value };
+              series.Points.Add(point);
+            }
+          }
+          break;
+      }
+    }
+
+    private void CalculateHistogram(Series series, DataRow row) {
+      series.Points.Clear();
+      if (!row.Values.Any()) return;
+      int bins = row.VisualProperties.Bins;
+
+      double minValue = row.Values.Min();
+      double maxValue = row.Values.Max();
+      double intervalWidth = (maxValue - minValue) / bins;
+      if (intervalWidth <= 0) return;
+
+      if (!row.VisualProperties.ExactBins) {
+        intervalWidth = HumanRoundRange(intervalWidth);
+        minValue = Math.Floor(minValue / intervalWidth) * intervalWidth;
+        maxValue = Math.Ceiling(maxValue / intervalWidth) * intervalWidth;
+      }
+
+      double current = minValue, intervalCenter = intervalWidth / 2.0;
+      int frequency = 0;
+      foreach (double v in row.Values.Where(x => !IsInvalidValue(x)).OrderBy(x => x)) {
+        while (v > current + intervalWidth) {
+          series.Points.AddXY(current + intervalCenter, frequency);
+          current += intervalWidth;
+          frequency = 0;
+        }
+        frequency++;
+      }
+      series.Points.AddXY(current + intervalCenter, frequency);
     }