Changeset 984 for trunk/sources/HeuristicLab.Visualization

Timestamp:

12/12/08 18:48:01 (16 years ago)

Author:

bspisic

Message:

#424
Implemented zooming

Location:

trunk/sources/HeuristicLab.Visualization

Files:

• LineChart.cs (modified) (3 diffs)
• RectangleShape.cs (modified) (3 diffs)
• WorldShape.cs (modified) (2 diffs)

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

@@ -192 +192 @@
 
     private MouseEventListener panListener;
+    private MouseEventListener zoomListener;
 
     private void CreateMouseEventListeners() {
@@ -197 +198 @@
       panListener.OnMouseMove += Pan_OnMouseMove;
       panListener.OnMouseUp += Pan_OnMouseUp;
-    }
-
+
+      zoomListener = new MouseEventListener();
+      zoomListener.OnMouseMove += Zoom_OnMouseMove;
+      zoomListener.OnMouseUp += Zoom_OnMouseUp;
+    }
 
     private RectangleD startClippingArea;
 
     private void canvasUI1_MouseDown(object sender, MouseEventArgs e) {
-      panListener.StartPoint = e.Location;
-      canvasUI1.MouseEventListener = panListener;
-
-      startClippingArea = root.ClippingArea;
+      if (ModifierKeys == Keys.Control) {
+        zoomListener.StartPoint = e.Location;
+        canvasUI1.MouseEventListener = zoomListener;
+
+        r = Rectangle.Empty;
+        rectangleShape = new RectangleShape(e.X, e.Y, e.X, e.Y, 1000, Color.Blue);
+
+        root.AddShape(rectangleShape);
+      } else {
+        panListener.StartPoint = e.Location;
+        canvasUI1.MouseEventListener = panListener;
+
+        startClippingArea = root.ClippingArea;
+      }
     }
 
     private void Pan_OnMouseUp(Point startPoint, Point actualPoint) {
-       canvasUI1.MouseEventListener = null;
+      canvasUI1.MouseEventListener = null;
     }
 
@@ -231 +245 @@
       panListener.StartPoint = startPoint;
 
-      this.zoomFullView = false; //user wants to pan => no full view
-
+      zoomFullView = false; //user wants to pan => no full view
+
+      canvasUI1.Invalidate();
+    }
+
+    private void Zoom_OnMouseUp(Point startPoint, Point actualPoint) {
+      canvasUI1.MouseEventListener = null;
+
+      RectangleD newClippingArea = Transform.ToWorld(r, canvasUI1.ClientRectangle, root.ClippingArea);
+      root.ClippingArea = newClippingArea;
+      root.RemoveShape(rectangleShape);
+
+      zoomFullView = false; //user wants to pan => no full view
+
+      canvasUI1.Invalidate();
+    }
+
+    private Rectangle r;
+    private RectangleShape rectangleShape;
+
+    private void Zoom_OnMouseMove(Point startPoint, Point actualPoint) {
+      r = new Rectangle();
+
+      if (startPoint.X < actualPoint.X) {
+        r.X = startPoint.X;
+        r.Width = actualPoint.X - startPoint.X;
+      } else {
+        r.X = actualPoint.X;
+        r.Width = startPoint.X - actualPoint.X;
+      }
+
+      if (startPoint.Y < actualPoint.Y) {
+        r.Y = startPoint.Y;
+        r.Height = actualPoint.Y - startPoint.Y;
+      } else {
+        r.Y = actualPoint.Y;
+        r.Height = startPoint.Y - actualPoint.Y;
+      }
+
+      rectangleShape.Rectangle = Transform.ToWorld(r, canvasUI1.ClientRectangle, root.ClippingArea);
       canvasUI1.Invalidate();
     }

trunk/sources/HeuristicLab.Visualization/RectangleShape.cs ¶

@@ -3 +3 @@
 namespace HeuristicLab.Visualization {
   public class RectangleShape : IShape {
-    private RectangleD rect;
+    private RectangleD rectangle;
     private double z;
     private Color color;
+    private int opacity = 100;
 
     public RectangleShape(double x1, double y1, double x2, double y2, double z, Color color) {
-      this.rect = new RectangleD(x1, y1, x2, y2);
+      rectangle = new RectangleD(x1, y1, x2, y2);
       this.z = z;
       this.color = color;
@@ -14 +15 @@
 
     public RectangleD BoundingBox {
-      get { return rect; }
+      get { return rectangle; }
     }
 
     public void Draw(Graphics graphics, Rectangle viewport, RectangleD clippingArea) {
+      Color brushColor = Color.FromArgb(50, color);
+
       using (Pen pen = new Pen(color, 1))
-      using (Brush brush = new SolidBrush(color)) {
-        Rectangle screenRect = Transform.ToScreen(rect, viewport, clippingArea);
+      using (Brush brush = new SolidBrush(brushColor)) {
+        Rectangle screenRect = Transform.ToScreen(rectangle, viewport, clippingArea);
 
         graphics.DrawRectangle(pen, screenRect);
@@ -31 +34 @@
       set { z = value; }
     }
+
+    public RectangleD Rectangle {
+      get { return rectangle; }
+      set { rectangle = value; }
+    }
   }
 }

trunk/sources/HeuristicLab.Visualization/WorldShape.cs ¶

@@ -21 +21 @@
 
       graphics.SetClip(innerViewport);
-      
+
       foreach (IShape shape in shapes) {
         shape.Draw(graphics, innerViewport, this.clippingArea);
       }
-      
+
       graphics.Restore(gstate);
     }
@@ -48 +48 @@
       shapes.Add(shape);
     }
+
+    public bool RemoveShape(IShape shape) {
+      return shapes.Remove(shape);
+    }
   }
 }