Changeset 13045 for branches/HeuristicLab.Visualization/HeuristicLab.Visualization/3.3/Primitives/LinearPrimitiveBase.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/LinearPrimitiveBase.cs (modified) (5 diffs)

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

@@ -20 +20 @@
 #endregion
 
+using System;
 using System.Drawing;
 using System.Drawing.Drawing2D;
@@ -26 +27 @@
 namespace HeuristicLab.Visualization {
   public abstract class LinearPrimitiveBase : PrimitiveBase {
-    protected IGroup selectionRectangles;
+    protected IGroup SelectionRectangles;
 
     private PointD myStart;
@@ -45 +46 @@
     protected LinearPrimitiveBase(IChart chart, PointD start, PointD end)
       : base(chart) {
-      selectionRectangles = new Group(chart);
+      SelectionRectangles = new Group(chart);
       myStart = start;
       myEnd = end;
     }
-    protected LinearPrimitiveBase(IChart chart, double x1, double y1, double x2, double y2)
-      : this(chart, new PointD(x1, y1), new PointD(x2, y2)) {
-    }
     protected LinearPrimitiveBase(IChart chart, PointD start, PointD end, Pen pen, Brush brush)
       : base(chart, pen, brush) {
-      selectionRectangles = new Group(chart);
+      SelectionRectangles = new Group(chart);
       myStart = start;
       myEnd = end;
-    }
-    protected LinearPrimitiveBase(IChart chart, double x1, double y1, double x2, double y2, Pen pen, Brush brush)
-      : this(chart, new PointD(x1, y1), new PointD(x2, y2), pen, brush) {
     }
 
@@ -65 +60 @@
       myStart = start;
       myEnd = end;
-      OnUpdate();
+      OnRedrawRequired();
     }
-    public void SetPosition(double x1, double y1, double x2, double y2) {
-      SetPosition(new PointD(x1, y1), new PointD(x2, y2));
-    }
+
     public override void Move(Offset delta) {
       SetPosition(Start + delta, End + delta);
     }
 
-    public override bool ContainsPoint(PointD point) {
-      if (Selected) {
-        if (selectionRectangles.GetPrimitive(point) != null) return true;
-      }
-      return false;
+    public override void Move(PointD point, Offset delta) {
+      if (Selected && SelectionRectangles.ContainsPoint(point)) {
+        var rect = (SelectionRectangle)SelectionRectangles.GetPrimitive(point);
+        if (rect.Point == Start) {
+          SetPosition(Start + delta, End);
+        } else if (rect.Point == End) {
+          SetPosition(Start, End + delta);
+        }
+      } else SetPosition(Start + delta, End + delta);
     }
 
-    public override void MouseDrag(PointD point, Offset offset, MouseButtons button) {
-      if (button == MouseButtons.Left) {
-        if (Selected) {
-          if (selectionRectangles.ContainsPoint(point)) {
-            SelectionRectangle rect = (SelectionRectangle)selectionRectangles.GetPrimitive(point);
-            if (rect.Point == Start) {
-              SetPosition(Start + offset, End);
-            } else if (rect.Point == End) {
-              SetPosition(Start, End + offset);
-            }
-          } else {
-            base.MouseDrag(point, offset, button);
-          }
+    public override void SnapToGrid(IGrid grid) {
+      var bl = grid.GetBottomLeftGridPoint(Start);
+      var ur = grid.GetUpperRightGridPoint(Start);
+      var sx = Math.Abs(bl.X - Start.X) <= Math.Abs(ur.X - Start.X) ? bl.X : ur.X;
+      var sy = Math.Abs(bl.Y - Start.Y) <= Math.Abs(ur.Y - Start.Y) ? bl.Y : ur.Y;
+
+      var end = new PointD(End.X + (sx - Start.X), End.Y + (sy - Start.Y));
+
+      bl = grid.GetBottomLeftGridPoint(end);
+      ur = grid.GetUpperRightGridPoint(end);
+      var ex = Math.Abs(bl.X - end.X) <= Math.Abs(ur.X - end.X) ? bl.X : ur.X;
+      var ey = Math.Abs(bl.Y - end.Y) <= Math.Abs(ur.Y - end.Y) ? bl.Y : ur.Y;
+
+      SetPosition(new PointD(sx, sy), new PointD(ex, ey));
+    }
+
+    public override void SnapToGrid(PointD point, IGrid grid) {
+      if (Selected && SelectionRectangles.ContainsPoint(point)) {
+        var rect = (SelectionRectangle)SelectionRectangles.GetPrimitive(point);
+        if (rect.Point == Start) {
+          var bl = grid.GetBottomLeftGridPoint(Start);
+          var ur = grid.GetUpperRightGridPoint(Start);
+          var sx = Math.Abs(bl.X - Start.X) <= Math.Abs(ur.X - Start.X) ? bl.X : ur.X;
+          var sy = Math.Abs(bl.Y - Start.Y) <= Math.Abs(ur.Y - Start.Y) ? bl.Y : ur.Y;
+          SetPosition(new PointD(sx, sy), End);
+        } else if (rect.Point == End) {
+          var bl = grid.GetBottomLeftGridPoint(End);
+          var ur = grid.GetUpperRightGridPoint(End);
+          var ex = Math.Abs(bl.X - End.X) <= Math.Abs(ur.X - End.X) ? bl.X : ur.X;
+          var ey = Math.Abs(bl.Y - End.Y) <= Math.Abs(ur.Y - End.Y) ? bl.Y : ur.Y;
+          SetPosition(Start, new PointD(ex, ey));
         }
-      }
+      } else SnapToGrid(grid);
+    }
+
+    public override bool ContainsPoint(PointD point) {
+      if (Selected && SelectionRectangles.GetPrimitive(point) != null) return true;
+      return false;
     }
 
     public override Cursor GetCursor(PointD point) {
       if (Selected) {
-        Cursor cursor = selectionRectangles.GetCursor(point);
+        var cursor = SelectionRectangles.GetCursor(point);
         if (cursor != null) return cursor;
       }
@@ -107 +127 @@
 
     public override void PostDraw(Graphics graphics) {
-      selectionRectangles.Clear();
+      SelectionRectangles.Clear();
       if (Selected) {
-        Pen pen = new Pen(Color.LightGray, 3);
-        pen.DashStyle = DashStyle.Dash;
+        var pen = new Pen(Color.LightGray, 3) { DashStyle = DashStyle.Dash };
         graphics.DrawLine(pen,
                           Chart.TransformWorldToPixel(Start),
                           Chart.TransformWorldToPixel(End));
-        selectionRectangles.Add(new SelectionRectangle(Chart, Start, Cursors.SizeAll));
-        selectionRectangles.Add(new SelectionRectangle(Chart, End, Cursors.SizeAll));
+        SelectionRectangles.Add(new SelectionRectangle(Chart, Start, Cursors.SizeAll));
+        SelectionRectangles.Add(new SelectionRectangle(Chart, End, Cursors.SizeAll));
 
-        selectionRectangles.Draw(graphics);
+        SelectionRectangles.Draw(graphics);
       }
     }