Changeset 2359 for trunk

Timestamp:

09/15/09 16:02:26 (15 years ago)

Author:

mkommend

Message:

changed behavior of bubblechart in ZoomToViewSize method (ticket #723)

File:

• trunk/sources/HeuristicLab.CEDMA.Charting/3.3/BubbleChart.cs (modified) (7 diffs)

trunk/sources/HeuristicLab.CEDMA.Charting/3.3/BubbleChart.cs

@@ -137 +137 @@
         } else if (matrix.MultiDimensionalCategoricalVariables.Contains(xDimension)) {
           var path = xDimension.Split(new char[] { ':' }, StringSplitOptions.RemoveEmptyEntries).Select(x => x.Trim());
-          IEnumerable<MatrixRow<string, object>> subRows = (IEnumerable<MatrixRow<string,object>>)r.Get(path.ElementAt(0));
+          IEnumerable<MatrixRow<string, object>> subRows = (IEnumerable<MatrixRow<string, object>>)r.Get(path.ElementAt(0));
           foreach (MatrixRow<string, object> subRow in subRows) {
             if (subRow.Get(path.ElementAt(1)) != null) {
@@ -147 +147 @@
           var path = xDimension.Split(new char[] { ':' }, StringSplitOptions.RemoveEmptyEntries).Select(x => x.Trim());
           IEnumerable<MatrixRow<string, object>> subRows = (IEnumerable<MatrixRow<string, object>>)r.Get(path.ElementAt(0));
-          foreach (MatrixRow<string,object> subRow in subRows) {
+          foreach (MatrixRow<string, object> subRow in subRows) {
             if (subRow.Get(path.ElementAt(1)) != null) {
               xs.Add(Convert.ToDouble(subRow.Get(path.ElementAt(1))) + r.XJitter * xJitterFactor);
@@ -162 +162 @@
         } else if (matrix.MultiDimensionalCategoricalVariables.Contains(yDimension)) {
           var path = yDimension.Split(new char[] { ':' }, StringSplitOptions.RemoveEmptyEntries).Select(x => x.Trim());
-          IEnumerable<MatrixRow<string,object>> subRows = (IEnumerable<MatrixRow<string,object>>)r.Get(path.ElementAt(0));
-          foreach (MatrixRow<string,object> subRow in subRows) {
+          IEnumerable<MatrixRow<string, object>> subRows = (IEnumerable<MatrixRow<string, object>>)r.Get(path.ElementAt(0));
+          foreach (MatrixRow<string, object> subRow in subRows) {
             if (subRow.Get(path.ElementAt(1)) != null) {
               ys.Add(matrix.IndexOfCategoricalValue(yDimension, subRow.Get(path.ElementAt(1))) + r.YJitter * yJitterFactor);
@@ -172 +172 @@
           var path = yDimension.Split(new char[] { ':' }, StringSplitOptions.RemoveEmptyEntries).Select(x => x.Trim());
           IEnumerable<MatrixRow<string, object>> subRows = (IEnumerable<MatrixRow<string, object>>)r.Get(path.ElementAt(0));
-          foreach (MatrixRow<string,object> subRow in subRows) {
+          foreach (MatrixRow<string, object> subRow in subRows) {
             if (subRow.Get(path.ElementAt(1)) != null) {
               ys.Add(Convert.ToDouble(subRow.Get(path.ElementAt(1))) + r.YJitter * yJitterFactor);
@@ -195 +195 @@
           if (double.IsInfinity(x) || x == double.MaxValue || x == double.MinValue) x = double.NaN;
           if (double.IsInfinity(y) || y == double.MaxValue || y == double.MinValue) y = double.NaN;
-          if (!double.IsNaN(x) && !double.IsNaN(y) && IsReasonablePoint(new PointD(x, y))) {
+          //if (!double.IsNaN(x) && !double.IsNaN(y) && IsReasonablePoint(new PointD(x, y))) {
+            if (!double.IsNaN(x) && !double.IsNaN(y)) {
             string actualXValue = actualXValues[Math.Min(i, actualXValues.Count() - 1)].ToString();
             string actualYValue = actualYValues[Math.Min(i, actualYValues.Count() - 1)].ToString();
@@ -216 +217 @@
     }
 
-    private bool IsReasonablePoint(PointD pointD) {
-      return pointD.X > LowerLeft.X && pointD.X < UpperRight.X && pointD.Y > LowerLeft.Y && pointD.Y < UpperRight.Y;
-    }
+    //Mk 15.09.09 15:00 commented because it is not necessary any more and causes troubles with repainting
+    //private bool IsReasonablePoint(PointD pointD) {
+    //  return pointD.X > LowerLeft.X && pointD.X < UpperRight.X && pointD.Y > LowerLeft.Y && pointD.Y < UpperRight.Y;
+    //}
 
     private int CalculateSize(double size, double minSize, double maxSize) {
@@ -235 +237 @@
 
     private void ZoomToViewSize() {
-      if (minX < maxX && minY < maxY) {
-        // enlarge view by 5% on each side
-        double width = maxX - minX;
-        double height = maxY - minY;
-        minX = minX - width * 0.05;
-        maxX = maxX + width * 0.05;
-        minY = minY - height * 0.05;
-        maxY = maxY + height * 0.05;
-        ZoomIn(minX, minY, maxX, maxY);
-      }
+      // enlarge view by 5% on each side
+      //if (minX < maxX && minY < maxY) {
+      //  double width = maxX - minX;
+      //  minX = minX - width * 0.05;
+      //  maxX = maxX + width * 0.05;
+      //}
+
+      //if(minY < maxY)
+      //{
+      //  double height = maxY - minY;
+      //  minY = minY - height * 0.05;
+      //  maxY = maxY + height * 0.05;
+      //}
+      if (double.IsInfinity(minX) || double.IsNaN(minX) ||
+        double.IsInfinity(maxX) || double.IsNaN(maxX) ||
+        double.IsInfinity(minY) || double.IsNaN(minY) ||
+        double.IsInfinity(maxY) || double.IsNaN(maxY))
+        return;
+
+      double height = maxY - minY;
+      double width = maxX - minX;
+      if (height < 10)
+        height = 10;
+      if (width < 10)
+        width = 10;
+
+      minY = minY - height * 0.05;
+      maxY = maxY + height * 0.05;
+      minX = minX - width * 0.05;
+      maxX = maxX + width * 0.05;
+      ZoomIn(minX, minY, maxX, maxY);
     }