Changeset 1351 for trunk/sources/HeuristicLab.Visualization

Timestamp:

03/16/09 20:51:48 (16 years ago)

Author:

mstoeger

Message:

Fixed Zoom & Pan. Improved Mouse-Wheel-Zoom. (#424)

Location:

trunk/sources/HeuristicLab.Visualization

Files:

• LineChart.cs (modified) (7 diffs)
• RectangleShape.cs (modified) (2 diffs)

trunk/sources/HeuristicLab.Visualization/LineChart.cs

@@ -21 +21 @@
     private readonly ViewSettings viewSettings;
 
-//    private readonly Stack<RectangleD> clippingAreaHistory = new Stack<RectangleD>();
     private readonly WorldShape userInteractionShape = new WorldShape();
     private readonly RectangleShape rectangleShape = new RectangleShape(0, 0, 0, 0, Color.FromArgb(50, 0, 0, 255));
@@ -162 +161 @@
     }
 
-    private void UpdateYAxisInfo(YAxisDescriptor yAxisDescriptor) {
-//      if (yAxisInfos.ContainsKey(yAxisDescriptor)) {
-//        yAxisInfos.Remove(yAxisDescriptor);
-//      }
-    }
-
     /// <summary>
     /// sets the legend position
@@ -234 +227 @@
 
     public void OnDataRowChanged(IDataRow row) {
-      UpdateYAxisInfo(row.YAxis);
-
       RowEntry rowEntry = rowToRowEntry[row];
 
@@ -447 +438 @@
 
     private void Pan(Point startPoint, Point endPoint) {
+      RectangleD clippingArea = Translate.ClippingArea(startPoint, endPoint, xAxis.ClippingArea, xAxis.Viewport);
+
+      SetClipX(clippingArea.X1, clippingArea.X2);
+
       foreach (RowEntry rowEntry in rowEntries) {
-        RectangleD clippingArea = CalcPanClippingArea(startPoint, endPoint, rowEntry.LinesShape);
-
-        SetClipX(clippingArea.X1, clippingArea.X1);
+        clippingArea = Translate.ClippingArea(startPoint, endPoint, rowEntry.LinesShape.ClippingArea, rowEntry.LinesShape.Viewport);
         SetClipY(rowEntry, clippingArea.Y1, clippingArea.Y2);
       }
@@ -458 +451 @@
 
     private void PanEnd(Point startPoint, Point endPoint) {
+      Pan(startPoint, endPoint);
+    }
+
+    private void SetClippingArea(Rectangle rectangle) {
+      RectangleD clippingArea = Transform.ToWorld(rectangle, xAxis.Viewport, xAxis.ClippingArea);
+
+      SetClipX(clippingArea.X1, clippingArea.X2);
+
       foreach (RowEntry rowEntry in rowEntries) {
-        RectangleD clippingArea = CalcPanClippingArea(startPoint, endPoint, rowEntry.LinesShape);
-
-        SetClipX(clippingArea.X1, clippingArea.X1);
-        SetClipY(rowEntry, clippingArea.Y1, clippingArea.Y2);
-      }
-
-      canvasUI.Invalidate();
-    }
-
-    private static RectangleD CalcPanClippingArea(Point startPoint, Point endPoint, LinesShape linesShape) {
-      return Translate.ClippingArea(startPoint, endPoint, linesShape.ClippingArea, linesShape.Viewport);
-    }
-
-    private void SetClippingArea(Rectangle rectangle) {
-      foreach (RowEntry rowEntry in rowEntries) {
-        RectangleD clippingArea = Transform.ToWorld(rectangle, rowEntry.LinesShape.Viewport, rowEntry.LinesShape.ClippingArea);
-
-        SetClipX(clippingArea.X1, clippingArea.X1);
+        clippingArea = Transform.ToWorld(rectangle, rowEntry.LinesShape.Viewport, rowEntry.LinesShape.ClippingArea);
+
         SetClipY(rowEntry, clippingArea.Y1, clippingArea.Y2);
       }
@@ -490 +475 @@
 
     private void canvasUI1_KeyDown(object sender, KeyEventArgs e) {
-//      if (e.KeyCode == Keys.Back && clippingAreaHistory.Count > 1) {
-//        clippingAreaHistory.Pop();
-//
-//        RectangleD clippingArea = clippingAreaHistory.Peek();
-//
-//        SetLineClippingArea(clippingArea, false);
-//      }
     }
 
@@ -540 +518 @@
     private void canvasUI1_MouseWheel(object sender, MouseEventArgs e) {
       if (ModifierKeys == Keys.Control) {
-        double zoomFactor = (e.Delta > 0) ? 0.9 : 1.1;
+        double zoomFactor = (e.Delta > 0) ? 0.7 : 1.3;
+
+        PointD world;
+
+        world = Transform.ToWorld(e.Location, xAxis.Viewport, xAxis.ClippingArea);
+
+        double x1 = world.X - (world.X - xAxis.ClippingArea.X1)*zoomFactor;
+        double x2 = world.X + (xAxis.ClippingArea.X2 - world.X)*zoomFactor;
+
+        SetClipX(x1, x2);
 
         foreach (RowEntry rowEntry in rowEntries) {
-          RectangleD clippingArea = ZoomListener.ZoomClippingArea(rowEntry.LinesShape.ClippingArea, zoomFactor);
-          
-          SetClipX(clippingArea.X1, clippingArea.X1);
-          SetClipY(rowEntry, clippingArea.Y1, clippingArea.Y2);
-        }
+          world = Transform.ToWorld(e.Location, rowEntry.LinesShape.Viewport, rowEntry.LinesShape.ClippingArea);
+
+          double y1 = world.Y - (world.Y - rowEntry.LinesShape.ClippingArea.Y1) * zoomFactor;
+          double y2 = world.Y + (rowEntry.LinesShape.ClippingArea.Y2 - world.Y)*zoomFactor;
+
+          SetClipY(rowEntry, y1, y2);
+        }
+
+        canvasUI.Invalidate();
       }
     }

trunk/sources/HeuristicLab.Visualization/RectangleShape.cs

@@ -7 +7 @@
 
     private Color color;
-    private int opacity = 255;
 
     private Pen pen;
@@ -54 +53 @@
     private Brush GetBrush() {
       if (brush == null)
-        brush = new SolidBrush(Color.FromArgb(opacity, color));
+        brush = new SolidBrush(color);
       return brush;
-    }
-
-    public int Opacity {
-      get { return opacity; }
-      set {
-        opacity = value;
-        DisposeDrawingTools();
-      }
     }