Changeset 1987

Timestamp:

06/01/09 11:56:45 (16 years ago)

Author:

mstoeger

Message:

more "zoom level too high" fixes. the error also occured for empty charts and for empty data rows. #498

Location:

trunk/sources

Files:

• HeuristicLab.Visualization.Test/3.2/LineChartTests.cs (modified) (2 diffs)
• HeuristicLab.Visualization/3.2/LineChart.cs (modified) (1 diff)

trunk/sources/HeuristicLab.Visualization.Test/3.2/LineChartTests.cs

@@ -219 +219 @@
 
     [Test]
+    public void TestDataRowWithoutValuesShouldntCauseZoomLevelTooHighError() {
+      LineChartTestForm f = new LineChartTestForm(model);
+
+      IDataRow row1 = new DataRow();
+
+      model.AddDataRow(row1);
+
+      f.ShowDialog();
+    }
+
+    [Test]
+    public void TestModelWithoutDataRowsShouldntCauseZoomLevelTooHighError() {
+      LineChartTestForm f = new LineChartTestForm(model);
+
+      f.ShowDialog();
+    }
+
+    [Test]
     public void TestAddValueToDataRow() {
       LineChartTestForm f = new LineChartTestForm(model);
@@ -340 +358 @@
 
       f.ShowDialog();
+    }
+
+    [Test]
+    public void TestPersistence() {
+      LineChartTestForm f = new LineChartTestForm(model);
+
+      IDataRow row1 = new DataRow();
+      row1.AddValues(new double[] {0, 10, 5});
+
+      IDataRow row2 = new DataRow();
+      row2.AddValues(new double[] {1, 20, 7});
+
+      model.AddDataRows(row1, row2);
     }
 

trunk/sources/HeuristicLab.Visualization/3.2/LineChart.cs

@@ -398 +398 @@
 
     public void ZoomToFullView() {
-      SetClipX(-0.1, model.MaxDataRowValues - 0.9);
+      double xmin, xmax;
+      GetClippingRange(0, model.MaxDataRowValues-1, out xmin, out xmax);
+      SetClipX(xmin, xmax);
 
       foreach (RowEntry rowEntry in rowEntries) {
         YAxisDescriptor yAxis = rowEntry.DataRow.YAxis;
 
-        double padding = (yAxis.MaxValue - yAxis.MinValue)*0.05;
-
-        double ymin = yAxis.MinValue - padding;
-        double ymax = yAxis.MaxValue + padding;
-
-        if (Math.Abs(ymin-ymax) < double.Epsilon*5) {
-          ymin -= 0.1;
-          ymax += 0.1;
-        }
-
+        double ymin, ymax;
+        GetClippingRange(yAxis.MinValue, yAxis.MaxValue, out ymin, out ymax);
         SetClipY(rowEntry, ymin, ymax);
       }
 
       canvasUI.Invalidate();
+    }
+
+    /// <summary>
+    /// Calculates the required clipping range such that the specified min/max values
+    /// visible including a small padding.
+    /// </summary>
+    /// <param name="minValue"></param>
+    /// <param name="maxValue"></param>
+    /// <param name="clipFrom"></param>
+    /// <param name="clipTo"></param>
+    private static void GetClippingRange(double minValue, double maxValue, out double clipFrom, out double clipTo) {
+      if (minValue == double.MaxValue || maxValue == double.MinValue) {
+        clipFrom = -0.1;
+        clipTo = 1.1;
+      } else {
+        double padding = (maxValue - minValue)*0.05;
+        clipFrom = minValue - padding;
+        clipTo = maxValue + padding;
+
+        if (Math.Abs(clipTo - clipFrom) < double.Epsilon * 5) {
+          clipFrom -= 0.1;
+          clipTo += 0.1;
+        }
+      }
     }