Changeset 608 in josm for trunk/src/org/openstreetmap/josm/gui/MapView.java

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)

File:

• trunk/src/org/openstreetmap/josm/gui/MapView.java (modified) (7 diffs)

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

@@ -1 @@
-// License: GPL. Copyright 2007 by Immanuel Scholz and others
+// License: GPL. See LICENSE file for details.
+
 package org.openstreetmap.josm.gui;
 
@@ -23 +24 @@
 import org.openstreetmap.josm.actions.MoveAction;
 import org.openstreetmap.josm.data.Bounds;
+import org.openstreetmap.josm.data.Preferences;
 import org.openstreetmap.josm.data.SelectionChangedListener;
 import org.openstreetmap.josm.data.coor.EastNorth;
@@ -29 +31 @@
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
 import org.openstreetmap.josm.data.osm.visitor.BoundingXYVisitor;
-import org.openstreetmap.josm.data.osm.visitor.SimplePaintVisitor;
 import org.openstreetmap.josm.data.projection.Projection;
 import org.openstreetmap.josm.gui.layer.Layer;
+import org.openstreetmap.josm.gui.layer.MapViewPaintable;
 import org.openstreetmap.josm.gui.layer.OsmDataLayer;
 import org.openstreetmap.josm.gui.layer.OsmDataLayer.ModifiedChangedListener;
@@ -79 +81 @@
         private Layer activeLayer;
         
+        private LinkedList<MapViewPaintable> temporaryLayers = new LinkedList<MapViewPaintable>();
+        
         /**
          * The listener of the active layer changes.
@@ -195 +199 @@
                 if (center == null)
                         return; // no data loaded yet.
-                g.setColor(SimplePaintVisitor.getPreferencesColor("background", Color.BLACK));
+                g.setColor(Preferences.getPreferencesColor("background", Color.BLACK));
                 g.fillRect(0, 0, getWidth(), getHeight());
 
@@ -203 +207 @@
                                 l.paint(g, this);
                 }
+                
                 if (getActiveLayer() != null && getActiveLayer().visible)
                         getActiveLayer().paint(g, this);
 
+                for (MapViewPaintable mvp : temporaryLayers) {
+                        mvp.paint(g, this);
+                }
+                
                 // draw world borders
                 g.setColor(Color.WHITE);
@@ -330 +339 @@
                         firePropertyChange("scale", oldScale, scale);
         }
+        
+        public boolean addTemporaryLayer(MapViewPaintable mvp) {
+                if (temporaryLayers.contains(mvp)) return false;
+                return temporaryLayers.add(mvp);
+        }
+        
+        public boolean removeTemporaryLayer(MapViewPaintable mvp) {
+                return temporaryLayers.remove(mvp);
+        }
 }