Changeset 30883 in osm

Timestamp:

2014-12-27T22:56:29+01:00 (10 years ago)

Author:

holgermappt

Message:

Added functionality to change the image direction with control+click.

Location:

applications/editors/josm/plugins/photoadjust/src/org/openstreetmap/josm/plugins/photoadjust

Files:

• PhotoAdjustMapMode.java (modified) (1 diff)
• PhotoAdjustWorker.java (modified) (5 diffs)

applications/editors/josm/plugins/photoadjust/src/org/openstreetmap/josm/plugins/photoadjust/PhotoAdjustMapMode.java

@@ -70 +70 @@
     public String getModeHelpText() {
         if (hasLayersToAdjust()) {
-            return tr("Click+drag photo or shift+click to position photo.");
+            return tr("Click+drag photo, shift+click to position photo, control+click to set direction.");
         }
         else {

applications/editors/josm/plugins/photoadjust/src/org/openstreetmap/josm/plugins/photoadjust/PhotoAdjustWorker.java

@@ -34 +34 @@
 
     /**
-     * Mouse click handler.  Shift+click positions the photo from the
-     * ImageViewerDialog.  Click without shift checks if there is a
-     * photo under the mouse.
+     * Mouse click handler.  Control+click changes the image direction if
+     * there is a photo selected on the map.  Shift+click positions the photo
+     * from the ImageViewerDialog.  Click without shift or control checks if
+     * there is a photo under the mouse.
      *
      * @param evt Mouse event from MouseAdapter mousePressed().
-     * @param imageLayers GeoImageLayer to be considered.
+     * @param imageLayers List of GeoImageLayers to be considered.
      */
     public void doMousePressed(MouseEvent evt,
@@ -47 +48 @@
         if (evt.getButton() == MouseEvent.BUTTON1
             && imageLayers != null && imageLayers.size() > 0) {
-            // Check if modifier key was pressed and change to
-            // image viewer photo if it was.
-            if ((evt.getModifiers() & InputEvent.SHIFT_MASK) != 0) {
-                GeoImageLayer viewerLayer = ImageViewerDialog.getCurrentLayer();
-                ImageEntry img = ImageViewerDialog.getCurrentImage();
+            // Check if modifier key is pressed and change to
+            // image viewer photo if it is.
+            final boolean isShift = (evt.getModifiers() & InputEvent.SHIFT_MASK) != 0;
+            final boolean isCtrl = (evt.getModifiers() & InputEvent.CTRL_MASK) != 0;
+            if (isShift || isCtrl) {
+                final GeoImageLayer viewerLayer = ImageViewerDialog.getCurrentLayer();
+                final ImageEntry img = ImageViewerDialog.getCurrentImage();
                 if ( img != null && viewerLayer != null
                      && viewerLayer.isVisible()
                      && imageLayers.contains(viewerLayer)) {
-                    img.setPos(Main.map.mapView.getLatLon(evt.getX(), evt.getY()));
-                    img.flagNewGpsData();
-                    viewerLayer.updateBufferAndRepaint();
-                    // Need to re-display the photo because the
-                    // OSD data might change (new coordinates).
-                    ImageViewerDialog.showImage(viewerLayer, img);
+                    // Change direction if control is pressed, position
+                    // otherwise.  Shift+control changes direction, similar to
+                    // rotate in select mode.
+                    //
+                    // Combinations:
+                    // S ... shift pressed
+                    // C ... control pressed
+                    // pos ... photo has a position set == is displayed on the map
+                    // nopos ... photo has no position set
+                    //
+                    // S + pos: position at mouse
+                    // S + nopos: position at mouse
+                    // C + pos: change orientation
+                    // C + nopos: ignored
+                    // S + C + pos: change orientation
+                    // S + C + nopos: ignore
+                    if (isCtrl) {
+                        if (img.getPos() != null) {
+                            changeDirection(img, viewerLayer, evt);
+                        }
+                    }
+                    else { // shift pressed
+                        movePhoto(img, viewerLayer, evt);
+                    }
                     dragPhoto = img;
                     dragLayer = viewerLayer;
@@ -72 +93 @@
                         if (dragPhoto != null) {
                             dragLayer = layer;
-                            Point2D centerPoint = Main.map.mapView.getPoint2D(dragPhoto.getPos());
-                            dragOffset = new Point2D.Double(centerPoint.getX() - evt.getX(),
-                                                            centerPoint.getY() - evt.getY());
+                            setDragOffset(dragPhoto, evt);
                             break;
                         }
@@ -84 +103 @@
 
     /**
-     * Mouse drag handler.  Moves photo.
+     * Mouse drag handler.  Changes direction or moves photo.
      *
      * @param evt Mouse event from MouseMotionAdapter mouseDragged().
@@ -91 +110 @@
         if ( dragLayer != null && dragLayer.isVisible()
              && dragPhoto != null) {
-            LatLon newPos;
-            if (dragOffset != null) {
-                newPos = Main.map.mapView.getLatLon(dragOffset.getX() + evt.getX(),
-                                                    dragOffset.getY() + evt.getY());
+            if ((evt.getModifiers() & InputEvent.CTRL_MASK) != 0) {
+                changeDirection(dragPhoto, dragLayer, evt);
             }
             else {
-                newPos = Main.map.mapView.getLatLon(evt.getX(), evt.getY());
+                movePhoto(dragPhoto, dragLayer, evt);
             }
-            dragPhoto.setPos(newPos);
-            dragPhoto.flagNewGpsData();
-            dragLayer.updateBufferAndRepaint();
         }
     }
+
+    /**
+     * Set the offset between a photo and the current mouse position.
+     *
+     * @param photo The photo to move.
+     * @param evt Mouse event from one of the mouse adapters.
+     */
+    private void setDragOffset(ImageEntry photo, MouseEvent evt) {
+        final Point2D centerPoint = Main.map.mapView.getPoint2D(photo.getPos());
+        dragOffset = new Point2D.Double(centerPoint.getX() - evt.getX(),
+                                        centerPoint.getY() - evt.getY());
+    }
+
+    /**
+     * Move the photo to the mouse position.
+     *
+     * @param photo The photo to move.
+     * @param layer GeoImageLayer of the photo.
+     * @param evt Mouse event from one of the mouse adapters.
+     */
+    private void movePhoto(ImageEntry photo, GeoImageLayer layer,
+                           MouseEvent evt) {
+        LatLon newPos;
+        if (dragOffset != null) {
+            newPos = Main.map.mapView.getLatLon(dragOffset.getX() + evt.getX(),
+                                                dragOffset.getY() + evt.getY());
+        }
+        else {
+            newPos = Main.map.mapView.getLatLon(evt.getX(), evt.getY());
+        }
+        photo.setPos(newPos);
+        photo.flagNewGpsData();
+        layer.updateBufferAndRepaint();
+        // Need to re-display the photo because the OSD data might change (new
+        // coordinates).
+        ImageViewerDialog.showImage(viewerLayer, img);
+    }
+
+    /**
+     * Set the image direction, i.e. let it point to where the mouse is.
+     *
+     * @param photo The photo to move.
+     * @param layer GeoImageLayer of the photo.
+     * @param evt Mouse event from one of the mouse adapters.
+     */
+    private void changeDirection(ImageEntry photo, GeoImageLayer layer,
+                                MouseEvent evt) {
+        final LatLon photoLL = photo.getPos();
+        final LatLon mouseLL = Main.map.mapView.getLatLon(evt.getX(), evt.getY());
+        // The projection doesn't matter here.
+        double direction = 360.0 - photoLL.heading(mouseLL) * 360.0 / 2.0 / Math.PI;
+        if (direction < 0.0) {
+            direction += 360.0;
+        } else if (direction >= 360.0) {
+            direction -= 360.0;
+        }
+        photo.setExifImgDir(direction);
+        photo.flagNewGpsData();
+        layer.updateBufferAndRepaint();
+        ImageViewerDialog.showImage(layer, photo);
+        setDragOffset(photo, evt);
+    }
 }