diff --git a/plugins/photoadjust/src/org/openstreetmap/josm/plugins/photoadjust/PhotoAdjustWorker.java b/plugins/photoadjust/src/org/openstreetmap/josm/plugins/photoadjust/PhotoAdjustWorker.java index 931b749b7..9fba87e2e 100644 --- a/plugins/photoadjust/src/org/openstreetmap/josm/plugins/photoadjust/PhotoAdjustWorker.java +++ b/plugins/photoadjust/src/org/openstreetmap/josm/plugins/photoadjust/PhotoAdjustWorker.java @@ -6,6 +6,7 @@ import java.awt.event.MouseEvent; import java.awt.geom.Point2D; import java.util.List; +import org.openstreetmap.josm.data.ImageData; import org.openstreetmap.josm.data.coor.LatLon; import org.openstreetmap.josm.gui.MainApplication; import org.openstreetmap.josm.gui.layer.geoimage.GeoImageLayer; @@ -18,7 +19,7 @@ import org.openstreetmap.josm.gui.layer.geoimage.ImageViewerDialog; public class PhotoAdjustWorker { private ImageEntry dragPhoto; - private GeoImageLayer dragLayer; + private ImageData dragData; // Offset between center of the photo and point where it is // clicked. This must be in pixels to maintain the same offset if // the photo is moved very far. @@ -31,7 +32,7 @@ public class PhotoAdjustWorker { */ public void reset() { dragPhoto = null; - dragLayer = null; + dragData = null; dragOffset = null; } @@ -72,46 +73,48 @@ public class PhotoAdjustWorker { * @param imageLayers List of GeoImageLayers to be considered. */ public void doMousePressed(MouseEvent evt, - List imageLayers) { + List imageLayers) { reset(); if (evt.getButton() == MouseEvent.BUTTON1 - && imageLayers != null && !imageLayers.isEmpty()) { + && imageLayers != null && !imageLayers.isEmpty()) { // 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)) { - // 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); + for (GeoImageLayer layer: imageLayers) { + if (layer.isVisible()) { + final ImageEntry img = layer.getImageData().getSelectedImage(); + if (img != null) { + // 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, layer.getImageData(), evt); + } + } else { // shift pressed + movePhoto(img, layer.getImageData(), evt); + } + dragPhoto = img; + dragData = layer.getImageData(); + break; } - } else { // shift pressed - movePhoto(img, viewerLayer, evt); } - dragPhoto = img; - dragLayer = viewerLayer; } } else { // Start with the top layer. @@ -119,7 +122,7 @@ public class PhotoAdjustWorker { if (layer.isVisible()) { dragPhoto = layer.getPhotoUnderMouse(evt); if (dragPhoto != null) { - dragLayer = layer; + dragData = layer.getImageData(); setDragOffset(dragPhoto, evt); disableCenterView(); break; @@ -149,13 +152,12 @@ public class PhotoAdjustWorker { * @param evt Mouse event from MouseMotionAdapter mouseDragged(). */ public void doMouseDragged(MouseEvent evt) { - if (dragLayer != null && dragLayer.isVisible() - && dragPhoto != null) { + if (dragData != null && dragPhoto != null) { if ((evt.getModifiers() & InputEvent.CTRL_MASK) != 0) { - changeDirection(dragPhoto, dragLayer, evt); + changeDirection(dragPhoto, dragData, evt); } else { disableCenterView(); - movePhoto(dragPhoto, dragLayer, evt); + movePhoto(dragPhoto, dragData, evt); } } } @@ -176,11 +178,11 @@ public class PhotoAdjustWorker { * Move the photo to the mouse position. * * @param photo The photo to move. - * @param layer GeoImageLayer of the photo. + * @param data ImageData of the photo. * @param evt Mouse event from one of the mouse adapters. */ - private void movePhoto(ImageEntry photo, GeoImageLayer layer, - MouseEvent evt) { + private void movePhoto(ImageEntry photo, ImageData data, + MouseEvent evt) { LatLon newPos; if (dragOffset != null) { newPos = MainApplication.getMap().mapView.getLatLon( @@ -189,9 +191,7 @@ public class PhotoAdjustWorker { } else { newPos = MainApplication.getMap().mapView.getLatLon(evt.getX(), evt.getY()); } - photo.setPos(newPos); - photo.flagNewGpsData(); - layer.updateBufferAndRepaint(); + data.updateImagePosition(photo, newPos); // Re-display the photo because the OSD data might change (new // coordinates). Or do that in doMouseReleased(). //ImageViewerDialog.showImage(layer, photo); @@ -201,11 +201,11 @@ public class PhotoAdjustWorker { * 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 data ImageData of the photo. * @param evt Mouse event from one of the mouse adapters. */ - private void changeDirection(ImageEntry photo, GeoImageLayer layer, - MouseEvent evt) { + private void changeDirection(ImageEntry photo, ImageData data, + MouseEvent evt) { final LatLon photoLL = photo.getPos(); if (photoLL == null) { // Direction cannot be set if image doesn't have a position. @@ -219,10 +219,7 @@ public class PhotoAdjustWorker { } else if (direction >= 360.0) { direction -= 360.0; } - photo.setExifImgDir(direction); - photo.flagNewGpsData(); - layer.updateBufferAndRepaint(); - ImageViewerDialog.showImage(layer, photo); + data.updateImageDirection(photo, direction); setDragOffset(photo, evt); } } diff --git a/plugins/photoadjust/src/org/openstreetmap/josm/plugins/photoadjust/PhotoPropertyEditor.java b/plugins/photoadjust/src/org/openstreetmap/josm/plugins/photoadjust/PhotoPropertyEditor.java index 508c41c86..61837be1e 100644 --- a/plugins/photoadjust/src/org/openstreetmap/josm/plugins/photoadjust/PhotoPropertyEditor.java +++ b/plugins/photoadjust/src/org/openstreetmap/josm/plugins/photoadjust/PhotoPropertyEditor.java @@ -6,14 +6,14 @@ import static org.openstreetmap.josm.tools.I18n.tr; import java.awt.Color; import java.awt.GridBagLayout; import java.awt.event.ActionEvent; +import java.util.List; +import java.util.Optional; import javax.swing.AbstractAction; -import javax.swing.Action; import javax.swing.BorderFactory; import javax.swing.ImageIcon; import javax.swing.JButton; import javax.swing.JLabel; -import javax.swing.JOptionPane; import javax.swing.JPanel; import javax.swing.JSeparator; import javax.swing.UIManager; @@ -21,6 +21,8 @@ import javax.swing.event.DocumentEvent; import javax.swing.event.DocumentListener; import org.openstreetmap.josm.actions.JosmAction; +import org.openstreetmap.josm.data.ImageData; +import org.openstreetmap.josm.data.ImageData.ImageDataUpdateListener; import org.openstreetmap.josm.data.coor.LatLon; import org.openstreetmap.josm.data.coor.conversion.CoordinateFormatManager; import org.openstreetmap.josm.data.coor.conversion.LatLonParser; @@ -29,9 +31,13 @@ import org.openstreetmap.josm.gui.ExtendedDialog; import org.openstreetmap.josm.gui.MainApplication; import org.openstreetmap.josm.gui.MainMenu; import org.openstreetmap.josm.gui.dialogs.LatLonDialog; +import org.openstreetmap.josm.gui.layer.Layer; +import org.openstreetmap.josm.gui.layer.LayerManager.LayerAddEvent; +import org.openstreetmap.josm.gui.layer.LayerManager.LayerChangeListener; +import org.openstreetmap.josm.gui.layer.LayerManager.LayerOrderChangeEvent; +import org.openstreetmap.josm.gui.layer.LayerManager.LayerRemoveEvent; import org.openstreetmap.josm.gui.layer.geoimage.GeoImageLayer; import org.openstreetmap.josm.gui.layer.geoimage.ImageEntry; -import org.openstreetmap.josm.gui.layer.geoimage.ImageViewerDialog; import org.openstreetmap.josm.gui.widgets.JosmTextField; import org.openstreetmap.josm.tools.GBC; import org.openstreetmap.josm.tools.ImageProvider; @@ -56,66 +62,52 @@ public class PhotoPropertyEditor { MainMenu.add(MainApplication.getMenu().editMenu, new PropertyEditorAction()); } - /** - * Update the geo image layer and the image viewer. - * - * @param layer GeoImageLayer of the photo. - * @param photo The photo that is updated. - */ - private static void updateLayer(GeoImageLayer layer, ImageEntry photo) { - layer.updateBufferAndRepaint(); - ImageViewerDialog.showImage(layer, photo); - } - /** * Action if the menu entry is selected. */ - private static class PropertyEditorAction extends JosmAction { + private static class PropertyEditorAction extends JosmAction implements LayerChangeListener, ImageDataUpdateListener { public PropertyEditorAction() { super(tr("Edit photo GPS data"), // String name - (String)null, // String iconName - tr("Edit GPS data of selected photo."), // String tooltip - null, // Shortcut shortcut - true, // boolean registerInToolbar - "photoadjust/propertyeditor", // String toolbarId - true // boolean installAdapters - ); + (String)null, // String iconName + tr("Edit GPS data of selected photo."), // String tooltip + null, // Shortcut shortcut + true, // boolean registerInToolbar + "photoadjust/propertyeditor", // String toolbarId + false // boolean installAdapters + ); + this.installAdapters(); + } + + @Override + protected void installAdapters() { + MainApplication.getLayerManager().addLayerChangeListener(this); + initEnabledState(); } @Override public void actionPerformed(ActionEvent evt) { - try { - final ImageEntry photo = ImageViewerDialog.getCurrentImage(); - final GeoImageLayer layer = ImageViewerDialog.getCurrentLayer(); - if (photo == null) { - throw new AssertionError("No image selected."); - } - StringBuilder title = + final ImageData data = getLayerWithSelectedImage().get().getImageData(); + final ImageEntry photo = data.getSelectedImage(); + + StringBuilder title = new StringBuilder(tr("Edit Photo GPS Data")); - if (photo.getFile() != null) { - title.append(" - "); - title.append(photo.getFile().getName()); - } - PropertyEditorDialog dialog = - new PropertyEditorDialog(title.toString(), photo, layer); - if (dialog.getValue() == 1) { - dialog.updateImageTmp(); - // There are cases where isNewGpsData is not set but there - // is still new data, e.g. if the EXIF data was re-read - // from the image file. - photo.applyTmp(); - } else { - photo.discardTmp(); - } - updateLayer(layer, photo); - } catch (AssertionError err) { - JOptionPane.showMessageDialog(MainApplication.getMainFrame(), - tr("Please select an image first."), - tr("No image selected"), - JOptionPane.INFORMATION_MESSAGE); - return; + if (photo.getFile() != null) { + title.append(" - "); + title.append(photo.getFile().getName()); + } + PropertyEditorDialog dialog = + new PropertyEditorDialog(title.toString(), photo, data); + if (dialog.getValue() == 1) { + dialog.updateImageTmp(); + // There are cases where isNewGpsData is not set but there + // is still new data, e.g. if the EXIF data was re-read + // from the image file. + photo.applyTmp(); + } else { + photo.discardTmp(); } - } + data.notifyImageUpdate(); + } /** * Check if there is a selected image. @@ -124,19 +116,51 @@ public class PhotoPropertyEditor { * image shown, {@code false} otherwise. */ private static boolean enabled() { - try { - //return ImageViewerDialog.getInstance().hasImage(); - ImageViewerDialog.getInstance().hasImage(); - return true; - } catch (AssertionError err) { - return false; - } + return getLayerWithSelectedImage().isPresent(); + } + + private static Optional getLayerWithSelectedImage() { + List list = MainApplication.getLayerManager().getLayersOfType(GeoImageLayer.class); + return list.stream().filter(l -> l.getImageData().getSelectedImage() != null).findFirst(); } @Override protected void updateEnabledState() { setEnabled(enabled()); } + + @Override + public void layerAdded(LayerAddEvent e) { + Layer layer = e.getAddedLayer(); + if (layer instanceof GeoImageLayer) { + ((GeoImageLayer) layer).getImageData().addImageDataUpdateListener(this); + } + } + + @Override + public void layerRemoving(LayerRemoveEvent e) { + Layer layer = e.getRemovedLayer(); + + if (layer instanceof GeoImageLayer) { + ((GeoImageLayer) layer).getImageData().removeImageDataUpdateListener(this); + } + this.updateEnabledState(); + } + + @Override + public void layerOrderChanged(LayerOrderChangeEvent e) { + // ignored + } + + @Override + public void imageDataUpdated(ImageData data) { + // ignored + } + + @Override + public void selectedImageChanged(ImageData data) { + this.updateEnabledState(); + } } /** @@ -149,16 +173,16 @@ public class PhotoPropertyEditor { private final JosmTextField direction = new JosmTextField(); // Image that is to be updated. private final ImageEntry image; - private final GeoImageLayer layer; + private final ImageData data; // Image as it was when the dialog was opened. private final GpxImageEntry imgOrig; private static final Color BG_COLOR_ERROR = new Color(255, 224, 224); public PropertyEditorDialog(String title, final ImageEntry image, - final GeoImageLayer layer) { + final ImageData data) { super(MainApplication.getMainFrame(), title, tr("Ok"), tr("Cancel")); this.image = image; - this.layer = layer; + this.data = data; imgOrig = image.clone(); setButtonIcons("ok", "cancel"); final JPanel content = new JPanel(new GridBagLayout()); @@ -199,7 +223,7 @@ public class PhotoPropertyEditor { DoubleInputVerifier altVerif = new DoubleInputVerifier(altitude) { @Override public void updateValue(Double value) { image.getTmp().setElevation(value); - updateLayer(layer, image); + data.notifyImageUpdate(); } }; altitude.getDocument().addDocumentListener(altVerif); @@ -213,7 +237,7 @@ public class PhotoPropertyEditor { DoubleInputVerifier speedVerif = new DoubleInputVerifier(speed) { @Override public void updateValue(Double value) { image.getTmp().setSpeed(value); - updateLayer(layer, image); + data.notifyImageUpdate(); } }; speedVerif.setMinMax(0.0, null); @@ -229,7 +253,7 @@ public class PhotoPropertyEditor { DoubleInputVerifier dirVerif = new DoubleInputVerifier(direction) { @Override public void updateValue(Double value) { image.getTmp().setExifImgDir(value); - updateLayer(layer, image); + data.notifyImageUpdate(); } }; dirVerif.setMinMax(-360.0, 360.0); @@ -572,7 +596,7 @@ public class PhotoPropertyEditor { @Override public void updateLatLon(LatLon latLon) { image.getTmp().setPos(latLon); - updateLayer(layer, image); + data.notifyImageUpdate(); } @Override diff --git a/plugins/photoadjust/src/org/openstreetmap/josm/plugins/photoadjust/UntaggedGeoImageLayerAction.java b/plugins/photoadjust/src/org/openstreetmap/josm/plugins/photoadjust/UntaggedGeoImageLayerAction.java index 69c056680..d8cbd40b4 100644 --- a/plugins/photoadjust/src/org/openstreetmap/josm/plugins/photoadjust/UntaggedGeoImageLayerAction.java +++ b/plugins/photoadjust/src/org/openstreetmap/josm/plugins/photoadjust/UntaggedGeoImageLayerAction.java @@ -53,7 +53,7 @@ public class UntaggedGeoImageLayerAction // Move this image to the new layer and delete it // from the original layer. untagged.add(img); - layer.removePhotoByIdx(idx); + layer.getImageData().removeImage(img); } } MainApplication.getLayerManager()