Changeset 1076 in josm

Timestamp:

2008-11-13T19:41:48+01:00 (16 years ago)

Author:

framm

Message:

• replaced he align-in-rectangle function with a more general method that will make all angles in the selected shape orthogonal. if, in addition to one or more ways, exactly two nodes are also selected, then these two nodes determine the orientation of each resulting segment, otherwise a best match is chosen. Patch by Harald Kucharek.

Location:

trunk

Files:

• images/alignrect.png (deleted)
• images/ortho.png (added)
• src/org/openstreetmap/josm/actions/AlignInRectangleAction.java (deleted)
• src/org/openstreetmap/josm/actions/OrthogonalizeAction.java (added)
• src/org/openstreetmap/josm/data/coor/EastNorth.java (modified) (1 diff)
• src/org/openstreetmap/josm/gui/MainMenu.java (modified) (3 diffs)

trunk/src/org/openstreetmap/josm/data/coor/EastNorth.java

@@ -28 +28 @@
         
         public EastNorth interpolate(EastNorth en2, double proportion) {
-                return new EastNorth(this.x + proportion * (en2.x - this.x),this.y + proportion * (en2.y - this.y));
+                return new EastNorth(this.x + proportion * (en2.x - this.x),
+            this.y + proportion * (en2.y - this.y));
         }
+    
+    /**
+     * Returns the heading, in radians, that you have to use to get from 
+     * this EastNorth to another. Heading is mapped into [0, 2pi)
+     * 
+     * @param other the "destination" position
+     * @return heading 
+     */
+    public double heading(EastNorth other) {
+        double hd = Math.atan2(other.east() - east(), other.north() - north());
+        if(hd < 0) hd = 2 * Math.PI + hd;
+        return hd;       
+    }
+    
+    public EastNorth sub(EastNorth en) {
+        return new EastNorth(en.east() - east(), en.north() - north());
+    }
+  
+    /**
+     * Returns an EastNorth representing the this EastNorth rotatedaround
+     * a given EastNorth by a given angle
+     * @param pivot the center of the rotation
+     * @param angle the angle of the rotation
+     * @return EastNorth rotated object 
+     */
+    public EastNorth rotate(EastNorth pivot, double angle) {
+        double cosPhi = Math.cos(angle);
+        double sinPhi = Math.sin(angle);
+        double x = east() - pivot.east();
+        double y = north() - pivot.north();
+        double nx =  cosPhi * x + sinPhi * y + pivot.east();
+        double ny = -sinPhi * x + cosPhi * y + pivot.north();
+        return new EastNorth(nx, ny);
+    }
         
         @Override public String toString() {
                 return "EastNorth[e="+x+", n="+y+"]";
         }
+
+    /**
+     * Compares two EastNorth values
+     *
+     * @return true if "x" and "y" values are within 1E-6 of each other
+     */
+    public boolean equalsEpsilon(EastNorth other, double e) {
+        return (Math.abs(x - other.x) < e && Math.abs(y - other.y) < e);
+    }
 }

trunk/src/org/openstreetmap/josm/gui/MainMenu.java

@@ -19 +19 @@
 import org.openstreetmap.josm.actions.AlignInCircleAction;
 import org.openstreetmap.josm.actions.AlignInLineAction;
-import org.openstreetmap.josm.actions.AlignInRectangleAction;
+import org.openstreetmap.josm.actions.OrthogonalizeAction;
 import org.openstreetmap.josm.actions.AutoScaleAction;
 import org.openstreetmap.josm.actions.CombineWayAction;
@@ -106 +106 @@
         public final JosmAction alignInCircle = new AlignInCircleAction();
         public final JosmAction alignInLine = new AlignInLineAction();
-        public final JosmAction alignInRect = new AlignInRectangleAction();
+    public final JosmAction ortho = new OrthogonalizeAction();
         public final JosmAction createCircle = new CreateCircleAction();
         public final JosmAction mergeNodes = new MergeNodesAction();
@@ -223 +223 @@
                 add(toolsMenu, alignInCircle);
                 add(toolsMenu, alignInLine);
-                add(toolsMenu, alignInRect);
+                add(toolsMenu, ortho);
                 toolsMenu.addSeparator();
                 add(toolsMenu, createCircle);