Changeset 608 in josm for trunk/src/org/openstreetmap/josm/gui/layer

Timestamp:

2008-04-17T03:03:28+02:00 (16 years ago)

Author:

framm

Message:

• new extrude mode allows creation of rectangular shapes
• new AlignInRectangle function
• additional information in status bar about length, heading, and angle of segment being drawn
• helper line from last node to mouse cursor (disable with edit.helper-line=false)

Location:

trunk/src/org/openstreetmap/josm/gui/layer

Files:

• GpxLayer.java (modified) (2 diffs)
• Layer.java (modified) (2 diffs)
• MapViewPaintable.java (added)
• OsmDataLayer.java (modified) (3 diffs)
• markerlayer/PlayHeadMarker.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/gui/layer/GpxLayer.java

@@ -1 @@
-//License: GPL. Copyright 2007 by Immanuel Scholz, Raphael Mack and others
+// License: GPL. See LICENSE file for details.
 
 package org.openstreetmap.josm.gui.layer;
@@ -321 +321 @@
                                                 
                                             // draw line, if no maxLineLength is set or the line is shorter.
-                                            if (maxLineLength == -1 || trkPnt.latlon.distance(oldWp.latlon) <= maxLineLength){
+                                            if (maxLineLength == -1 || trkPnt.latlon.greatCircleDistance(oldWp.latlon) <= maxLineLength){
                                                 g.drawLine(old.x, old.y, screen.x, screen.y);
 

trunk/src/org/openstreetmap/josm/gui/layer/Layer.java

@@ -1 @@
-// License: GPL. Copyright 2007 by Immanuel Scholz and others
+// License: GPL. See LICENSE file for details.
+
 package org.openstreetmap.josm.gui.layer;
 
@@ -29 +30 @@
  * @author imi
  */
-abstract public class Layer implements Destroyable {
+abstract public class Layer implements Destroyable, MapViewPaintable {
 
         /**

trunk/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java

@@ -1 @@
-// License: GPL. Copyright 2007 by Immanuel Scholz and others
+// License: GPL. See LICENSE file for details.
+
 package org.openstreetmap.josm.gui.layer;
 
@@ -33 +34 @@
 import org.openstreetmap.josm.actions.SaveAsAction;
 import org.openstreetmap.josm.command.Command;
+import org.openstreetmap.josm.data.Preferences;
 import org.openstreetmap.josm.data.coor.EastNorth;
 import org.openstreetmap.josm.data.osm.DataSet;
@@ -153 +155 @@
                                         Point p1 = mv.getPoint(en1);
                                         Point p2 = mv.getPoint(en2);
-                                        Color color = inactive ? SimplePaintVisitor.getPreferencesColor("inactive", Color.DARK_GRAY) :
-                                                        SimplePaintVisitor.getPreferencesColor("downloaded Area", Color.YELLOW);
+                                        Color color = inactive ? Preferences.getPreferencesColor("inactive", Color.DARK_GRAY) :
+                                                        Preferences.getPreferencesColor("downloaded Area", Color.YELLOW);
                                         g.setColor(color);
                                         g.drawRect(Math.min(p1.x,p2.x), Math.min(p1.y, p2.y), Math.abs(p2.x-p1.x), Math.abs(p2.y-p1.y));

trunk/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java

@@ +1 @@
+// License: GPL. See LICENSE file for details.
+
 package org.openstreetmap.josm.gui.layer.markerlayer;
 
@@ -226 +228 @@
                         for (Marker m : AudioMarker.recentlyPlayedMarker().parentLayer.data) {
                                 if (m instanceof AudioMarker) {
-                                        double distanceSquared = m.eastNorth.distance(en);
+                                        double distanceSquared = m.eastNorth.distanceSq(en);
                                         if (distanceSquared < closestAudioMarkerDistanceSquared) {
                                                 ca = (AudioMarker) m;