Changeset 845 in josm

Timestamp:

Aug 22, 2008 9:25:28 PM (5 years ago)

Author:

stoecker

Message:

Prevent editing inactive layer. Fix layer oder and display order. Closes #371

Location:

trunk/src/org/openstreetmap/josm

Files:

• actions/mapmode/DrawAction.java (modified) (5 diffs)
• gui/MapView.java (modified) (3 diffs)
• gui/NavigatableComponent.java (modified) (7 diffs)
• gui/SelectionManager.java (modified) (2 diffs)
• gui/dialogs/LayerListDialog.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java

@@ -124 +124 @@
          */
         public void eventDispatched(AWTEvent event) {
+                if(!Main.map.mapView.isDrawableLayer())
+                        return;
                 InputEvent e = (InputEvent) event;
                 ctrl = (e.getModifiers() & ActionEvent.CTRL_MASK) != 0;
@@ -134 +136 @@
          */
         public void selectionChanged(Collection<? extends OsmPrimitive> newSelection) {
+                if(!Main.map.mapView.isDrawableLayer())
+                        return;
                 computeHelperLine();
         }
@@ -146 +150 @@
 
                 if (e.getButton() != MouseEvent.BUTTON1)
+                        return;
+                if(!Main.map.mapView.isDrawableLayer())
                         return;
 
@@ -331 +337 @@
         
         @Override public void mouseMoved(MouseEvent e) {
+                if(!Main.map.mapView.isDrawableLayer())
+                        return;
 
                 // we copy ctrl/alt/shift from the event just in case our global
@@ -441 +449 @@
          */
         @Override public void mouseExited(MouseEvent e) {
+                if(!Main.map.mapView.isDrawableLayer())
+                        return;
                 mousePos = e.getPoint();
                 Main.map.mapView.repaint();

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

@@ -172 +172 @@
                 for (Layer.LayerChangeListener l : Layer.listeners)
                         l.layerAdded(layer);
-                // autoselect the new layer
-                Layer old = activeLayer;
-                setActiveLayer(layer);
-                for (Layer.LayerChangeListener l : Layer.listeners)
-                        l.activeLayerChange(old, layer);
+                if (layer instanceof OsmDataLayer) {
+                        // autoselect the new layer
+                        Layer old = activeLayer;
+                        setActiveLayer(layer);
+                        for (Layer.LayerChangeListener l : Layer.listeners)
+                                l.activeLayerChange(old, layer);
+                }
                 repaint();
+        }
+
+        @Override
+        protected DataSet getData()
+        {
+                if(activeLayer != null && activeLayer instanceof OsmDataLayer)
+                        return ((OsmDataLayer)activeLayer).data;
+                return new DataSet();
+        }
+
+        public Boolean isDrawableLayer()
+        {
+                return activeLayer != null && activeLayer instanceof OsmDataLayer;
         }
 
@@ -251 +266 @@
                 for (int i = layers.size()-1; i >= 0; --i) {
                         Layer l = layers.get(i);
-                        if (l.visible && l != getActiveLayer())
+                        if (l.visible/* && l != getActiveLayer()*/)
                                 l.paint(tempG, this);
                 }
-                
-                if (getActiveLayer() != null && getActiveLayer().visible)
-                        getActiveLayer().paint(tempG, this);
+
+                /*if (getActiveLayer() != null && getActiveLayer().visible)
+                        getActiveLayer().paint(tempG, this);*/
 
                 for (MapViewPaintable mvp : temporaryLayers) {
@@ -353 +368 @@
                         editLayer = (OsmDataLayer)layer;
                         Main.ds = editLayer.data;
-                        DataSet.fireSelectionChanged(Main.ds.getSelected());
-                }
+                }
+                else
+                        Main.ds.setSelected();
+                DataSet.fireSelectionChanged(Main.ds.getSelected());
                 Layer old = activeLayer;
                 activeLayer = layer;

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

@@ -18 +18 @@
 import org.openstreetmap.josm.data.coor.EastNorth;
 import org.openstreetmap.josm.data.coor.LatLon;
+import org.openstreetmap.josm.data.osm.DataSet;
 import org.openstreetmap.josm.data.osm.Node;
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
@@ -49 +50 @@
         public NavigatableComponent() {
                 setLayout(null);
-    }
+        }
+
+        protected DataSet getData()
+        {
+                return Main.ds;
+        }
 
         /**
@@ -137 +143 @@
                 double minDistanceSq = Double.MAX_VALUE;
                 Node minPrimitive = null;
-                for (Node n : Main.ds.nodes) {
+                for (Node n : getData().nodes) {
                         if (n.deleted || n.incomplete)
                                 continue;
@@ -163 +169 @@
         public final List<WaySegment> getNearestWaySegments(Point p) {
                 TreeMap<Double, List<WaySegment>> nearest = new TreeMap<Double, List<WaySegment>>();
-                for (Way w : Main.ds.ways) {
+                for (Way w : getData().ways) {
                         if (w.deleted || w.incomplete) continue;
                         Node lastN = null;
@@ -273 +279 @@
         public Collection<OsmPrimitive> getAllNearest(Point p) {
                 Collection<OsmPrimitive> nearest = new HashSet<OsmPrimitive>();
-                        for (Way w : Main.ds.ways) {
+                        for (Way w : getData().ways) {
                         if (w.deleted || w.incomplete) continue;
                         Node lastN = null;
@@ -295 +301 @@
                                 }
                         }
-                for (Node n : Main.ds.nodes) {
+                for (Node n : getData().nodes) {
                         if (!n.deleted && !n.incomplete
                                         && getPoint(n.eastNorth).distanceSq(p) < snapDistance) {
@@ -314 +320 @@
         public Collection<Node> getNearestNodes(Point p) {
                 Collection<Node> nearest = new HashSet<Node>();
-                for (Node n : Main.ds.nodes) {
+                for (Node n : getData().nodes) {
                         if (!n.deleted && !n.incomplete
                                         && getPoint(n.eastNorth).distanceSq(p) < snapDistance) {

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

@@ -285 +285 @@
                 } else {
                         // nodes
-                        for (Node n : Main.ds.nodes) {
+                        for (Node n : nc.getData().nodes) {
                                 if (!n.deleted && !n.incomplete && r.contains(nc.getPoint(n.eastNorth)))
                                         selection.add(n);
@@ -291 +291 @@
                         
                         // ways
-                        for (Way w : Main.ds.ways) {
+                        for (Way w : nc.getData().ways) {
                                 if (w.deleted || w.nodes.isEmpty() || w.incomplete)
                                                 continue;

trunk/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java

@@ -288 +288 @@
          */
         public void layerAdded(Layer newLayer) {
-                model.add(0, newLayer);
+                model.add(model.size(), newLayer);
                 updateButtonEnabled();
         }