Changeset 373 in josm for trunk

Timestamp:

2007-10-13T00:12:31+02:00 (17 years ago)

Author:

framm

Message:

• introduced various modifier keys to existing modes (for add node mode, shift to disable auto-connect and ctrl to disable auto-insert/reuse; for delete mode, shift to delete way segment and alt to delete way+nodes)
• added small help bar at bottom of screen to display available modifiers

Location:

trunk/src/org/openstreetmap/josm

Files:

• actions/mapmode/DeleteAction.java (modified) (5 diffs)
• actions/mapmode/DrawAction.java (modified) (7 diffs)
• actions/mapmode/MapMode.java (modified) (2 diffs)
• actions/mapmode/SelectAction.java (modified) (3 diffs)
• actions/mapmode/ZoomAction.java (modified) (1 diff)
• gui/MapFrame.java (modified) (1 diff)
• gui/MapStatus.java (modified) (9 diffs)

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

@@ -83 +83 @@
                         c = deleteWithReferences(Main.ds.getSelected());
                 } else {
-                        c = delete(Main.ds.getSelected());
+                        c = delete(Main.ds.getSelected(), false);
                 }
                 if (c != null) {
@@ -100 +100 @@
                         return;
                 boolean ctrl = (e.getModifiers() & ActionEvent.CTRL_MASK) != 0;
+                boolean shift = (e.getModifiers() & ActionEvent.SHIFT_MASK) != 0;
+                boolean alt = (e.getModifiers() & ActionEvent.ALT_MASK) != 0;
+                System.out.println("meta="+alt);
                 
                 OsmPrimitive sel = Main.map.mapView.getNearestNode(e.getPoint());
@@ -105 +108 @@
                 if (sel == null) {
                         WaySegment ws = Main.map.mapView.getNearestWaySegment(e.getPoint());
-                        if (ws != null) c = deleteWaySegment(ws);
+                        if (ws != null) {
+                                if (shift) {
+                                        c = deleteWaySegment(ws); 
+                                } else if (ctrl) {
+                                        c = deleteWithReferences(Collections.singleton((OsmPrimitive)ws.way));
+                                } else {
+                                        c = delete(Collections.singleton((OsmPrimitive)ws.way), alt);
+                                }
+                        }
                 } else if (ctrl) {
                         c = deleteWithReferences(Collections.singleton(sel));
                 } else {
-                        c = delete(Collections.singleton(sel));
+                        c = delete(Collections.singleton(sel), alt);
                 }
                 if (c != null) {
@@ -155 +166 @@
          * 
          * @param selection The objects to delete.
+         * @param alsoDeleteNodesInWay true if nodes should be deleted as well
          * @return command A command to perform the deletions, or null of there is
          * nothing to delete.
          */
-        private Command delete(Collection<OsmPrimitive> selection) {
+        private Command delete(Collection<OsmPrimitive> selection, boolean alsoDeleteNodesInWay) {
                 if (selection.isEmpty()) return null;
 
                 Collection<OsmPrimitive> del = new HashSet<OsmPrimitive>(selection);
                 Collection<Way> waysToBeChanged = new HashSet<Way>();
+                
+                // nodes belonging to a way will be deleted if
+                // 1. this has been requested (alt modifier)
+                // 2. the node is not tagged
+                // 3. the node is not used by anybody else (i.e. has only one backref)
+                if (alsoDeleteNodesInWay) {
+                        for (OsmPrimitive osm : del) {
+                                if (osm instanceof Way) {
+                                        for (Node n : ((Way)osm).nodes) {
+                                                if (!n.tagged) {
+                                                        CollectBackReferencesVisitor v = new CollectBackReferencesVisitor(Main.ds, false);
+                                                        n.visit(v);
+                                                        if (v.data.size() == 1) {
+                                                                del.add(n);
+                                                        } else System.out.println("size="+v.data.size());
+                                                }
+                                                else System.out.println("tagged");
+                                        }
+                                }
+                        }
+                }
+                
                 for (OsmPrimitive osm : del) {
                         CollectBackReferencesVisitor v = new CollectBackReferencesVisitor(Main.ds, false);
@@ -217 +251 @@
                 if (n1.size() < 2 && n2.size() < 2) {
                         return new DeleteCommand(Collections.singleton(ws.way));
-                } else {
-                        Way wnew = new Way(ws.way);
-                        wnew.nodes.clear();
-
-                        if (n1.size() < 2) {
-                                wnew.nodes.addAll(n2);
-                                return new ChangeCommand(ws.way, wnew);
-                        } else if (n2.size() < 2) {
-                                wnew.nodes.addAll(n1);
-                                return new ChangeCommand(ws.way, wnew);
-                        } else {
-                                Collection<Command> cmds = new LinkedList<Command>();
-
-                                wnew.nodes.addAll(n1);
-                                cmds.add(new ChangeCommand(ws.way, wnew));
-
-                                Way wnew2 = new Way();
-                                wnew2.nodes.addAll(n2);
-                                cmds.add(new AddCommand(wnew2));
-
-                                return new SequenceCommand(tr("Split way segment"), cmds);
-                        }
-                }
+                }
+                
+                Way wnew = new Way(ws.way);
+                wnew.nodes.clear();
+
+                if (n1.size() < 2) {
+                        wnew.nodes.addAll(n2);
+                        return new ChangeCommand(ws.way, wnew);
+                } else if (n2.size() < 2) {
+                        wnew.nodes.addAll(n1);
+                        return new ChangeCommand(ws.way, wnew);
+                } else {
+                        Collection<Command> cmds = new LinkedList<Command>();
+
+                        wnew.nodes.addAll(n1);
+                        cmds.add(new ChangeCommand(ws.way, wnew));
+
+                        Way wnew2 = new Way();
+                        wnew2.nodes.addAll(n2);
+                        cmds.add(new AddCommand(wnew2));
+
+                        return new SequenceCommand(tr("Split way segment"), cmds);
+                }
+        }
+        
+        @Override public String getModeHelpText() {
+                return "Click to delete. Shift: delete way segment. Alt: delete way+nodes. Ctrl: delete referring objects.";
         }
 }

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

@@ -5 +5 @@
 
 import java.awt.Cursor;
+import java.awt.event.ActionEvent;
 import java.awt.event.KeyEvent;
 import java.awt.event.MouseEvent;
@@ -20 +21 @@
 import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.actions.GroupAction;
+import org.openstreetmap.josm.actions.mapmode.SelectAction.Mode;
 import org.openstreetmap.josm.command.AddCommand;
 import org.openstreetmap.josm.command.ChangeCommand;
@@ -33 +35 @@
 
 /**
- * This mode adds a new node to the dataset. The user clicks on a place to add
- * and there is it. Nothing more, nothing less.
- *
- * FIXME: "nothing more, nothing less" is a bit out-of-date
- *
- * Newly created nodes are selected. Shift modifier does not cancel the old
- * selection as usual.
- *
- * @author imi
  *
  */
@@ -80 +73 @@
                         return;
 
+                boolean ctrl = (e.getModifiers() & ActionEvent.CTRL_MASK) != 0;
+                boolean alt = (e.getModifiers() & ActionEvent.ALT_MASK) != 0;
+                boolean shift = (e.getModifiers() & ActionEvent.SHIFT_MASK) != 0;
+                
                 Collection<OsmPrimitive> selection = Main.ds.getSelected();
                 Collection<Command> cmds = new LinkedList<Command>();
@@ -86 +83 @@
                         replacedWays = new ArrayList<Way>();
                 boolean newNode = false;
-                Node n = Main.map.mapView.getNearestNode(e.getPoint());
+                Node n = null;
+                if (!ctrl) n = Main.map.mapView.getNearestNode(e.getPoint());
                 if (n == null) {
                         n = new Node(Main.map.mapView.getLatLon(e.getX(), e.getY()));
@@ -98 +96 @@
                         cmds.add(new AddCommand(n));
 
-                        // Insert the node into all the nearby way segments
-                        List<WaySegment> wss = Main.map.mapView.getNearestWaySegments(e.getPoint());
-                        Map<Way, List<Integer>> insertPoints = new HashMap<Way, List<Integer>>();
-                        for (WaySegment ws : wss) {
-                                List<Integer> is;
-                                if (insertPoints.containsKey(ws.way)) {
-                                        is = insertPoints.get(ws.way);
-                                } else {
-                                        is = new ArrayList<Integer>();
-                                        insertPoints.put(ws.way, is);
+                        if (!ctrl) {
+                                // Insert the node into all the nearby way segments
+                                List<WaySegment> wss = Main.map.mapView.getNearestWaySegments(e.getPoint());
+                                Map<Way, List<Integer>> insertPoints = new HashMap<Way, List<Integer>>();
+                                for (WaySegment ws : wss) {
+                                        List<Integer> is;
+                                        if (insertPoints.containsKey(ws.way)) {
+                                                is = insertPoints.get(ws.way);
+                                        } else {
+                                                is = new ArrayList<Integer>();
+                                                insertPoints.put(ws.way, is);
+                                        }
+
+                                        is.add(ws.lowerIndex);
                                 }
-
-                                is.add(ws.lowerIndex);
-                        }
-                        for (Map.Entry<Way, List<Integer>> insertPoint : insertPoints.entrySet()) {
-                                Way w = insertPoint.getKey();
-                                List<Integer> is = insertPoint.getValue();
-
-                                Way wnew = new Way(w);
-
-                                pruneSuccsAndReverse(is);
-                                for (int i : is) wnew.nodes.add(i + 1, n);
-
-                                cmds.add(new ChangeCommand(insertPoint.getKey(), wnew));
-                                replacedWays.add(insertPoint.getKey());
-                                reuseWays.add(wnew);
-                        }
-                }
-
+                        
+                                for (Map.Entry<Way, List<Integer>> insertPoint : insertPoints.entrySet()) {
+                                        Way w = insertPoint.getKey();
+                                        List<Integer> is = insertPoint.getValue();
+
+                                        Way wnew = new Way(w);
+
+                                        pruneSuccsAndReverse(is);
+                                        for (int i : is) wnew.nodes.add(i + 1, n);
+
+                                        cmds.add(new ChangeCommand(insertPoint.getKey(), wnew));
+                                        replacedWays.add(insertPoint.getKey());
+                                        reuseWays.add(wnew);
+                                }
+                        }
+                }
                 boolean extendedWay = false;
-                if (selection.size() == 1 && selection.iterator().next() instanceof Node) {
+                if (!shift && selection.size() == 1 && selection.iterator().next() instanceof Node) {
                         Node n0 = (Node) selection.iterator().next();
 
@@ -213 +213 @@
                 Collections.reverse(is);
         }
+        
+        @Override public String getModeHelpText() {
+                return "Click to add a new node. Ctrl to disable node re-use/auto-insert. Shift to disable auto-connect.";
+        }
 }

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

@@ -48 +48 @@
                 oldCursor = Main.map.mapView.getCursor();
                 Main.map.mapView.setCursor(cursor);
-                
+                updateStatusLine();
         }
         public void exitMode() {
@@ -55 +55 @@
         }
 
+        protected void updateStatusLine() {
+                Main.map.statusLine.setHelpText(getModeHelpText());
+        }
+        
+        public String getModeHelpText() {
+                return "";
+        }
         /**
          * Call selectMapMode(this) on the parent mapFrame.

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

@@ -199 +199 @@
                 }
 
+                updateStatusLine();
                 Main.map.mapView.repaint();
 
@@ -212 +213 @@
                 }
                 restoreCursor();
+                updateStatusLine();
                 mode = null;
+                updateStatusLine();
         }
 
@@ -237 +240 @@
                 Main.map.mapView.repaint();
     }
+        
+        @Override public String getModeHelpText() {
+                if (mode == Mode.select) {
+                        return "Release the mouse button to select the objects in the rectangle.";
+                } else if (mode == Mode.move) {
+                        return "Release the mouse button to stop moving.";
+                } else if (mode == Mode.rotate) {
+                        return "Release the mouse button to stop rotating.";
+                } else {
+                        return "Move objects by dragging; Shift to add to selection; Shift-Ctrl to rotate selected; or change selection";
+                }
+        }
 }

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

@@ -70 +70 @@
                 selectionManager.unregister(mv);
         }
+        
+        @Override public String getModeHelpText() {
+                return "Zoom in by dragging.";
+        }
 }

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

@@ -54 +54 @@
          * The status line below the map
          */
-        private MapStatus statusLine;
+        public MapStatus statusLine;
 
         public ConflictDialog conflictDialog;

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

@@ -6 +6 @@
 import java.awt.AWTEvent;
 import java.awt.Cursor;
+import java.awt.Dimension;
 import java.awt.EventQueue;
 import java.awt.Font;
@@ -17 +18 @@
 import java.awt.event.MouseMotionListener;
 import java.lang.reflect.InvocationTargetException;
+import java.text.DecimalFormat;
+import java.text.NumberFormat;
 import java.util.Collection;
 import java.util.ConcurrentModificationException;
@@ -58 +61 @@
          * The position of the mouse cursor.
          */
-        JTextField positionText = new JTextField("-000.00000000000000 -000.00000000000000".length());
+        DecimalFormat latlon = new DecimalFormat("###0.0000000");
+        JTextField positionText = new JTextField(25);
+        
         /**
          * The field holding the name of the object under the mouse.
@@ -64 +69 @@
         JTextField nameText = new JTextField(30);
 
+        /**
+         * The field holding information about what the user can do.
+         */
+        JTextField helpText = new JTextField();
+        
         /**
          * The collector class that waits for notification and then update
@@ -114 +124 @@
                                 // the data.
                                 try {
-                                        Collection<OsmPrimitive> osms = mv.getAllNearest(ms.mousePos);
-
-                                        if (osms == null && osmStatus == null && ms.modifiers == oldModifiers)
-                                                continue;
-                                        if (osms != null && osms.equals(osmStatus) && ms.modifiers == oldModifiers)
-                                                continue;
-
+                                        // Popup Information
+                                        if ((ms.modifiers & MouseEvent.BUTTON2_DOWN_MASK) != 0 ) {
+                                                Collection<OsmPrimitive> osms = mv.getAllNearest(ms.mousePos);
+
+                                                if (osms == null)
+                                                        continue;
+                                                if (osms != null && osms.equals(osmStatus) && ms.modifiers == oldModifiers)
+                                                        continue;
+                                        /*
                                         osmStatus = osms;
                                         oldModifiers = ms.modifiers;
@@ -133 +145 @@
                                         } else
                                                 nameText.setText("");
-
-                                        // Popup Information
-                                        if ((ms.modifiers & MouseEvent.BUTTON2_DOWN_MASK) != 0 && osms != null) {
+                                        */
+                                        
+
                                                 if (popup != null) {
                                                         try {
@@ -235 +247 @@
                                 if ((e.getModifiersEx() & MouseEvent.CTRL_DOWN_MASK) == 0) {
                                         LatLon p = mv.getLatLon(e.getX(),e.getY());
-                                        positionText.setText(p.lat()+" "+p.lon());
+                                        positionText.setText(latlon.format(p.lat())+" "+latlon.format(p.lon()));
                                 }
                         }
@@ -242 +254 @@
                 positionText.setEditable(false);
                 nameText.setEditable(false);
-                setLayout(new BoxLayout(this, BoxLayout.X_AXIS));
+                helpText.setEditable(false);
+                setLayout(new GridBagLayout());
                 setBorder(BorderFactory.createEmptyBorder(5,5,5,5));
-                add(new JLabel(tr("Lat/Lon")+" "));
-                add(positionText);
-                add(new JLabel(" "+tr("Object")+" "));
-                add(nameText);
-
+                add(new JLabel(tr("Lat/Lon")+" "), GBC.std());
+                add(positionText, GBC.std());
+                //add(new JLabel(" "+tr("Object")+" "));
+                //add(nameText);
+                add(helpText, GBC.eol().fill(GBC.HORIZONTAL));
+                positionText.setMinimumSize(new Dimension(positionText.getMinimumSize().height, 200));
+                
                 // The background thread
                 final Collector collector = new Collector(mapFrame);
@@ -270 +285 @@
             return "Statusline";
     }
+        
+        public void setHelpText(String t) {
+                helpText.setText(t);
+        }
 }