Changeset 311 in josm for src/org/openstreetmap/josm

Timestamp:

2007-08-22T22:55:36+02:00 (18 years ago)

Author:

framm

Message:

• added rotate mode that rotates selected nodes around centre point

Location:

src/org/openstreetmap/josm

Files:

• actions/mapmode/MoveAction.java (modified) (8 diffs)
• command/RotateCommand.java (added)
• gui/MapFrame.java (modified) (2 diffs)

src/org/openstreetmap/josm/actions/mapmode/MoveAction.java

@@ -14 +14 @@
 
 import org.openstreetmap.josm.Main;
+import org.openstreetmap.josm.actions.GroupAction;
+import org.openstreetmap.josm.actions.mapmode.AddNodeAction.Mode;
 import org.openstreetmap.josm.command.Command;
 import org.openstreetmap.josm.command.MoveCommand;
+import org.openstreetmap.josm.command.RotateCommand;
 import org.openstreetmap.josm.data.coor.EastNorth;
 import org.openstreetmap.josm.data.osm.Node;
@@ -35 +38 @@
  */
 public class MoveAction extends MapMode implements SelectionEnded {
+        
+        enum Mode {move, rotate}
+        private final Mode mode;
+
+        public static class MoveGroup extends GroupAction {
+                public MoveGroup(MapFrame mf) {
+                        super(KeyEvent.VK_M,0);
+                        putValue("help", "Action/Move");
+                        actions.add(new MoveAction(mf, tr("Move"), Mode.move, tr("Move around objects that are under the mouse or selected.")));
+                        actions.add(new MoveAction(mf, tr("Rotate"), Mode.rotate, tr("Rotate selected nodes around centre")));
+                        setCurrent(0);
+                }
+        }
+        
         /**
          * The old cursor before the user pressed the mouse button.
@@ -50 +67 @@
          * @param mapFrame The MapFrame, this action belongs to.
          */
-        public MoveAction(MapFrame mapFrame) {
-                super(tr("Move"), 
-                                "move",
-                                tr("Move around objects that are under the mouse or selected."), 
-                                KeyEvent.VK_M,
-                                mapFrame,
-                                ImageProvider.getCursor("normal", "move"));
+        public MoveAction(MapFrame mapFrame, String name, Mode mode, String desc) {
+                super(name, "move/"+mode, desc, mapFrame, getCursor());
+                this.mode = mode;
+                putValue("help", "Action/Move/"+Character.toUpperCase(mode.toString().charAt(0))+mode.toString().substring(1));
                 selectionManager = new SelectionManager(this, false, mapFrame.mapView);
         }
 
+        private static Cursor getCursor() {
+                try {
+                return ImageProvider.getCursor("crosshair", null);
+        } catch (Exception e) {
+        }
+            return Cursor.getPredefinedCursor(Cursor.CROSSHAIR_CURSOR);
+    }
+        
         @Override public void enterMode() {
                 super.enterMode();
@@ -72 +94 @@
         }
 
-
         /**
          * If the left mouse button is pressed, move all currently selected
@@ -87 +108 @@
                 if (mousePos == null)
                         mousePos = e.getPoint();
-
+                
                 EastNorth mouseEN = Main.map.mapView.getEastNorth(e.getX(), e.getY());
                 EastNorth mouseStartEN = Main.map.mapView.getEastNorth(mousePos.x, mousePos.y);
@@ -97 +118 @@
                 Collection<OsmPrimitive> selection = Main.ds.getSelected();
                 Collection<Node> affectedNodes = AllNodesVisitor.getAllNodes(selection);
+                
+                // when rotating, having only one node makes no sense - quit silently
+                if (affectedNodes.size() < 2 && mode == Mode.move) 
+                        return;
+                
 
                 // check if any coordinate would be outside the world
@@ -105 +131 @@
                         }
                 }
-
                 Command c = !Main.main.undoRedo.commands.isEmpty() ? Main.main.undoRedo.commands.getLast() : null;
-                if (c instanceof MoveCommand && affectedNodes.equals(((MoveCommand)c).objects))
-                        ((MoveCommand)c).moveAgain(dx,dy);
-                else
-                        Main.main.undoRedo.add(new MoveCommand(selection, dx, dy));
+
+                if (mode == Mode.move) {
+                        if (c instanceof MoveCommand && affectedNodes.equals(((MoveCommand)c).objects))
+                                ((MoveCommand)c).moveAgain(dx,dy);
+                        else
+                                Main.main.undoRedo.add(new MoveCommand(selection, dx, dy));
+                } else if (mode == Mode.rotate) {
+                        if (c instanceof RotateCommand && affectedNodes.equals(((RotateCommand)c).objects))
+                                ((RotateCommand)c).rotateAgain(mouseStartEN, mouseEN);
+                        else
+                                Main.main.undoRedo.add(new RotateCommand(selection, mouseStartEN, mouseEN));
+                }
 
                 Main.map.mapView.repaint();
@@ -135 +168 @@
                                 Main.ds.setSelected(osm);
                         oldCursor = Main.map.mapView.getCursor();
-                        Main.map.mapView.setCursor(Cursor.getPredefinedCursor(Cursor.MOVE_CURSOR));
+                        
+                        if (mode == Mode.move) {
+                                Main.map.mapView.setCursor(Cursor.getPredefinedCursor(Cursor.MOVE_CURSOR));
+                        } else {
+                                Main.map.mapView.setCursor(ImageProvider.getCursor("rotate", null));
+                        }
                 } else {
                         selectionMode = true;

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

@@ -22 +22 @@
 import org.openstreetmap.josm.actions.mapmode.ZoomAction;
 import org.openstreetmap.josm.actions.mapmode.AddNodeAction.AddNodeGroup;
+import org.openstreetmap.josm.actions.mapmode.MoveAction.MoveGroup;
 import org.openstreetmap.josm.gui.dialogs.CommandStackDialog;
 import org.openstreetmap.josm.gui.dialogs.ConflictDialog;
@@ -82 +83 @@
                 final Action selectionAction = new SelectionAction.Group(this);
                 toolBarActions.add(new IconToggleButton(selectionAction));
-                toolBarActions.add(new IconToggleButton(new MoveAction(this)));
+                toolBarActions.add(new IconToggleButton(new MoveGroup(this)));
                 toolBarActions.add(new IconToggleButton(new AddNodeGroup(this)));
                 toolBarActions.add(new IconToggleButton(new AddSegmentAction(this)));