Changeset 1045 for trunk/sources/HeuristicLab.Visualization/LineChart.cs

Timestamp:

12/21/08 18:42:03 (16 years ago)

Author:

bspisic

Message:

#424
Did some code refactoring (created concrete MouseEventListeners)

File:

• trunk/sources/HeuristicLab.Visualization/LineChart.cs (modified) (10 diffs)

trunk/sources/HeuristicLab.Visualization/LineChart.cs

@@ -49 +49 @@
     /// <param name="model">Referenz to the model, for data</param>
     public LineChart(IChartDataRowsModel model) : this() {
-      if (model == null)
+      if (model == null) {
         throw new NullReferenceException("Model cannot be null.");
+      }
 
       //TODO: correct Rectangle to fit
@@ -71 +72 @@
 
       UpdateLayout();
-
-      CreateMouseEventListeners();
 
       this.model = model;
@@ -117 +116 @@
       model.ModelChanged += OnModelChanged;
 
-      foreach (IDataRow row in model.Rows)
+      foreach (IDataRow row in model.Rows) {
         OnDataRowAdded(row);
+      }
     }
 
@@ -132 +132 @@
       row.ValueChanged += OnRowValueChanged;
       row.ValuesChanged += OnRowValuesChanged;
-      if (row.Count > maxDataRowCount)
+      if (row.Count > maxDataRowCount) {
         maxDataRowCount = row.Count;
+      }
 
       InitLineShapes(row);
@@ -139 +140 @@
 
     private void ZoomToFullView() {
-      if (!zoomFullView)
+      if (!zoomFullView) {
         return;
+      }
       RectangleD newClippingArea = new RectangleD(-0.1,
                                                   minDataValue - ((maxDataValue - minDataValue)*0.05),
@@ -164 +166 @@
       List<LineShape> lineShapes = new List<LineShape>();
       if (row.Count > 0) {
-        maxDataValue = Math.Max(row[0], this.maxDataValue);
+        maxDataValue = Math.Max(row[0], maxDataValue);
         minDataValue = Math.Min(row[0], minDataValue);
       }
@@ -197 +199 @@
       minDataValue = Math.Min(value, minDataValue);
 
-      if (index > lineShapes.Count + 1)
+      if (index > lineShapes.Count + 1) {
         throw new NotImplementedException();
+      }
 
       // new value was added
       if (index > 0 && index == lineShapes.Count + 1) {
-        if (maxDataRowCount < row.Count)
+        if (maxDataRowCount < row.Count) {
           maxDataRowCount = row.Count;
+        }
         LineShape lineShape = new LineShape(index - 1, row[index - 1], index, row[index], 0, row.Color, row.Thickness, row.Style);
         lineShapes.Add(lineShape);
@@ -211 +215 @@
 
       // not the first value
-      if (index > 0)
+      if (index > 0) {
         lineShapes[index - 1].Y2 = value;
+      }
 
       // not the last value
-      if (index > 0 && index < row.Count - 1)
+      if (index > 0 && index < row.Count - 1) {
         lineShapes[index].Y1 = value;
+      }
       ZoomToFullView();
 
@@ -224 +230 @@
     // TODO use action parameter
     private void OnRowValuesChanged(IDataRow row, double[] values, int index, Action action) {
-      foreach (double value in values)
+      foreach (double value in values) {
         OnRowValueChanged(row, value, index++, action);
+      }
     }
 
@@ -241 +248 @@
 
     public void EndUpdate() {
-      if (beginUpdateCount == 0)
+      if (beginUpdateCount == 0) {
         throw new InvalidOperationException("Too many EndUpdates.");
+      }
 
       beginUpdateCount--;
 
-      if (beginUpdateCount == 0)
+      if (beginUpdateCount == 0) {
         canvas.Invalidate();
+      }
     }
 
     #endregion
 
-    private MouseEventListener panListener;
-    private MouseEventListener zoomListener;
-
-    private void CreateMouseEventListeners() {
-      panListener = new MouseEventListener();
-      panListener.OnMouseMove += Pan_OnMouseMove;
-      panListener.OnMouseUp += Pan_OnMouseUp;
-
-      zoomListener = new MouseEventListener();
-      zoomListener.OnMouseMove += Zoom_OnMouseMove;
-      zoomListener.OnMouseUp += Zoom_OnMouseUp;
-    }
-
-    private RectangleD startClippingArea;
+    private RectangleShape rectangleShape;
 
     private void canvasUI1_MouseDown(object sender, MouseEventArgs e) {
       if (ModifierKeys == Keys.Control) {
-        zoomListener.StartPoint = e.Location;
-        canvas.MouseEventListener = zoomListener;
-
-        r = Rectangle.Empty;
-        rectangleShape = new RectangleShape(e.X, e.Y, e.X, e.Y, Color.Blue);
-        rectangleShape.Opacity = 50;
-
-        linesShape.AddShape(rectangleShape);
+        CreateZoomListener(e);
       } else {
-        panListener.StartPoint = e.Location;
-        canvas.MouseEventListener = panListener;
-
-        startClippingArea = linesShape.ClippingArea;
-      }
-    }
-
-    private void Pan_OnMouseUp(Point startPoint, Point actualPoint) {
+        CreatePanListener(e);
+      }
+    }
+
+    private void CreateZoomListener(MouseEventArgs e) {
+      ZoomListener zoomListener = new ZoomListener(e.Location);
+      zoomListener.DrawRectangle += DrawRectangle;
+      zoomListener.OnMouseUp += OnZoom_MouseUp;
+
+      canvas.MouseEventListener = zoomListener;
+
+      rectangleShape = new RectangleShape(e.X, e.Y, e.X, e.Y, Color.Blue);
+      rectangleShape.Opacity = 50;
+
+      linesShape.AddShape(rectangleShape);
+    }
+
+    private void OnZoom_MouseUp(object sender, MouseEventArgs e) {
       canvas.MouseEventListener = null;
-    }
-
-    private void Pan_OnMouseMove(Point startPoint, Point actualPoint) {
-      Rectangle viewPort = canvas.ClientRectangle;
-
-      PointD worldStartPoint = Transform.ToWorld(startPoint, viewPort, startClippingArea);
-      PointD worldActualPoint = Transform.ToWorld(actualPoint, viewPort, startClippingArea);
-
-      double xDiff = worldActualPoint.X - worldStartPoint.X;
-      double yDiff = worldActualPoint.Y - worldStartPoint.Y;
-
-      RectangleD newClippingArea = new RectangleD();
-      newClippingArea.X1 = startClippingArea.X1 - xDiff;
-      newClippingArea.X2 = startClippingArea.X2 - xDiff;
-      newClippingArea.Y1 = startClippingArea.Y1 - yDiff;
-      newClippingArea.Y2 = startClippingArea.Y2 - yDiff;
-
+
+      SetLineClippingArea(rectangleShape.Rectangle);
+      linesShape.RemoveShape(rectangleShape);
+
+      zoomFullView = false; //user wants to zoom => no full view
+
+      canvas.Invalidate();
+    }
+
+    private void DrawRectangle(Rectangle rectangle) {
+      rectangleShape.Rectangle = Transform.ToWorld(rectangle, canvas.ClientRectangle, linesShape.ClippingArea);
+      canvas.Invalidate();
+    }
+
+    private void CreatePanListener(MouseEventArgs e) {
+      PanListener panListener = new PanListener(canvas.ClientRectangle, linesShape.ClippingArea, e.Location);
+
+      panListener.SetNewClippingArea += SetNewClippingArea;
+      panListener.OnMouseUp += delegate { canvas.MouseEventListener = null; };
+
+      canvas.MouseEventListener = panListener;
+    }
+
+    private void SetNewClippingArea(RectangleD newClippingArea) {
       SetLineClippingArea(newClippingArea);
-      panListener.StartPoint = startPoint;
-
-      zoomFullView = false; //user wants to pan => no full view
-
-      canvas.Invalidate();
-    }
-
-    private void Zoom_OnMouseUp(Point startPoint, Point actualPoint) {
-      canvas.MouseEventListener = null;
-
-      RectangleD newClippingArea = Transform.ToWorld(r, canvas.ClientRectangle, linesShape.ClippingArea);
-      SetLineClippingArea(newClippingArea);
-      linesShape.RemoveShape(rectangleShape);
-
-      zoomFullView = false; //user wants to pan => no full view
-
-      canvas.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, canvas.ClientRectangle, linesShape.ClippingArea);
-      
+
+      zoomFullView = false;
       canvas.Invalidate();
     }