Changeset 2016

Timestamp:

06/04/09 20:45:39 (16 years ago)

Author:

bspisic

Message:

Refactoring ZoomListener(#664)

Location:

trunk/sources/HeuristicLab.Visualization/3.2

Files:

• LineChart.cs (modified) (2 diffs)
• ZoomListener.cs (modified) (3 diffs)

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

@@ -654 +654 @@
           ZoomListener zoomListener = new ZoomListener(e.Location);
           zoomListener.DrawRectangle += DrawRectangle;
-          zoomListener.SetClippingArea += SetClippingArea;
+          zoomListener.Zoom += Zoom;
 
           rectangleShape.Rectangle = RectangleD.Empty;
@@ -728 +728 @@
     }
 
-    private void SetClippingArea(Rectangle rectangle) {
+    private void Zoom(Rectangle rectangle) {
       RectangleD clippingArea = Transform.ToWorld(rectangle, xAxis.Viewport, xAxis.ClippingArea);
 

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

@@ -8 +8 @@
 
     public event RectangleHandler DrawRectangle;
-    public event RectangleHandler SetClippingArea;
+    public event RectangleHandler Zoom;
 
     public ZoomListener(Point startPoint) {
@@ -23 +23 @@
 
     public void MouseUp(object sender, MouseEventArgs e) {
-     if(SetClippingArea != null) {
-       SetClippingArea(CalcRectangle(e.Location));
+     if(Zoom != null) {
+       Zoom(CalcRectangle(e.Location));
      }
     }
@@ -38 +38 @@
       return new Rectangle(x, y, width, height);
     }
-
-    public static RectangleD ZoomClippingArea(RectangleD clippingArea, double zoomFactor) {
-      double x1, x2, y1, y2, width, height;
-
-      width = clippingArea.Width * zoomFactor;
-      height = clippingArea.Height * zoomFactor;
-
-      x1 = clippingArea.X1 - (width - clippingArea.Width) / 2;
-      y1 = clippingArea.Y1 - (height - clippingArea.Height) / 2;
-      x2 = width + x1;
-      y2 = height + y1;
-
-      return new RectangleD(x1, y1, x2, y2);
-    }
   }
 }