Changeset 13045 for branches/HeuristicLab.Visualization/HeuristicLab.Visualization/3.3/Primitives/AxisPrimitiveBase.cs

Timestamp:

10/21/15 14:18:31 (9 years ago)

Author:

jkarder

Message:

#1265: merged changes from abeham

File:

• branches/HeuristicLab.Visualization/HeuristicLab.Visualization/3.3/Primitives/AxisPrimitiveBase.cs (modified) (6 diffs)

branches/HeuristicLab.Visualization/HeuristicLab.Visualization/3.3/Primitives/AxisPrimitiveBase.cs

@@ -20 +20 @@
 #endregion
 
-using System;
-using System.Collections.Generic;
-using System.Text;
 using System.Drawing;
 
@@ -41 +38 @@
         if (value != myShowGrid) {
           myShowGrid = value;
-          OnUpdate();
+          OnRedrawRequired();
         }
       }
@@ -51 +48 @@
         if (value != myHorizontalLabel) {
           myHorizontalLabel = value;
-          OnUpdate();
+          OnRedrawRequired();
         }
       }
@@ -61 +58 @@
         if (value != myVerticalLabel) {
           myVerticalLabel = value;
-          OnUpdate();
+          OnRedrawRequired();
         }
       }
@@ -67 +64 @@
 
     protected AxisPrimitiveBase(IChart chart, PointD point, AxisType axisType)
-      : base(chart) {
-      Brush = Brushes.Black;
-      myPoint = point;
-      myAxisType = axisType;
-      myShowGrid = true;
-    }
-    protected AxisPrimitiveBase(IChart chart, double x, double y, AxisType axisType)
-      : this(chart, new PointD(x, y), axisType) {
-    }
+      : this(chart, point, axisType, Pens.Black, Brushes.Black) { }
     protected AxisPrimitiveBase(IChart chart, PointD point, AxisType axisType, Pen pen, Brush brush)
       : base(chart, pen, brush) {
@@ -82 +71 @@
       myShowGrid = true;
     }
-    protected AxisPrimitiveBase(IChart chart, double x, double y, AxisType axisType, Pen pen, Brush brush)
-      : this(chart, new PointD(x, y), axisType, pen, brush) {
-    }
 
     public virtual void SetPosition(PointD point) {
       myPoint = point;
-      OnUpdate();
+      OnRedrawRequired();
     }
-    public void SetPosition(double x, double y) {
-      SetPosition(new PointD(x, y));
-    }
+
     public override void Move(Offset delta) {
       SetPosition(Point + delta);
     }
 
+    public override void Move(PointD point, Offset delta) {
+      Move(delta);
+    }
+
+    public override void SnapToGrid(IGrid grid) {
+      Move(grid.GetBottomLeftGridPoint(myPoint) - myPoint);
+    }
+
+    public override void SnapToGrid(PointD point, IGrid grid) {
+      SnapToGrid(grid);
+    }
+
     public override bool ContainsPoint(PointD point) {
-      SizeD size = Chart.TransformPixelToWorld(new Size(5, 5));
+      var size = Chart.TransformPixelToWorld(new Size(5, 5));
       bool result = false;
       if ((AxisType & AxisType.Horizontal) == AxisType.Horizontal)