Changeset 811 in josm for trunk/src

Timestamp:

2008-08-20T19:22:55+02:00 (16 years ago)

Author:

david

Message:

paste/duplicate at mouse position: patch on behalf of Petr Dlouhý, petr.dlouhyat at email dot cz

Location:

trunk/src/org/openstreetmap/josm

Files:

• actions/PasteAction.java (modified) (3 diffs)
• gui/MapView.java (modified) (3 diffs)

trunk/src/org/openstreetmap/josm/actions/PasteAction.java

@@ -12 +12 @@
 import java.util.LinkedList;
 import java.util.List;
+
+import java.awt.event.MouseMotionListener;
+import javax.swing.JOptionPane;
 
 import org.openstreetmap.josm.Main;
@@ -38 +41 @@
 
                 /* Find the middle of the pasteBuffer area */ 
-                EastNorth centre = Main.map.mapView.getCenter();
                 double maxEast = -1E100, minEast = 1E100, maxNorth = -1E100, minNorth = 1E100;
                 for (Node n : pasteBuffer.nodes) {
@@ -48 +50 @@
                         if (north < minNorth) { minNorth = north; } 
                 }
-                double offsetEast = centre.east() - (maxEast + minEast)/2.0;
-                double offsetNorth = centre.north() - (maxNorth + minNorth)/2.0; 
+
+                EastNorth mPosition;
+                if((e.getModifiers() & ActionEvent.CTRL_MASK) ==0){
+                        mPosition = Main.map.mapView.getCenter();
+                } else {
+                        mPosition = Main.map.mapView.getEastNorth(Main.map.mapView.lastMEvent.getX(), Main.map.mapView.lastMEvent.getY());
+                };
+
+                double offsetEast  = mPosition.east() - (maxEast + minEast)/2.0;
+                double offsetNorth = mPosition.north() - (maxNorth + minNorth)/2.0;
                 
                 HashMap<OsmPrimitive,OsmPrimitive> map = new HashMap<OsmPrimitive,OsmPrimitive>(); 

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

@@ -10 +10 @@
 import java.awt.Point;
 import java.awt.Transparency;
+import java.awt.event.MouseEvent;
+import java.awt.event.MouseMotionListener;
 import java.awt.event.ComponentAdapter;
 import java.awt.event.ComponentEvent;
@@ -84 +86 @@
         private Layer activeLayer;
         
+        /**
+         * The last event performed by mouse.
+         */
+        public MouseEvent lastMEvent;
+
         private LinkedList<MapViewPaintable> temporaryLayers = new LinkedList<MapViewPaintable>();
         
@@ -127 +134 @@
                         public void selectionChanged(Collection<? extends OsmPrimitive> newSelection) {
                                 repaint();
+                        }
+                });
+
+                //store the last mouse action
+                this.addMouseMotionListener(new MouseMotionListener() {
+                        public void mouseDragged(MouseEvent e) {
+                                mouseMoved(e);
+                        }
+                        public void mouseMoved(MouseEvent e) {
+                                lastMEvent = e;
                         }
                 });