Changeset 15333 in josm for trunk/src/org/openstreetmap

Timestamp:

2019-09-02T22:35:07+02:00 (5 years ago)

Author:

Don-vip

Message:

see #11905 - Option to move multiple images at once (core part, patch by francois2, modified)

Location:

trunk/src/org/openstreetmap/josm

Files:

• actions/mapmode/SelectAction.java (modified) (1 diff)
• data/ImageData.java (modified) (11 diffs)
• gui/layer/geoimage/GeoImageLayer.java (modified) (5 diffs)
• gui/layer/geoimage/ImageDisplay.java (modified) (3 diffs)
• gui/layer/geoimage/ImageViewerDialog.java (modified) (7 diffs)

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

@@ -540 +540 @@
             if (dp < initialMoveThreshold)
                 return; // ignore small drags
-            initialMoveThresholdExceeded = true; //no more ingnoring uintil nex mouse press
+            initialMoveThresholdExceeded = true; //no more ignoring until next mouse press
         }
         if (e.getPoint().equals(lastMousePos))

trunk/src/org/openstreetmap/josm/data/ImageData.java

@@ -1 +1 @@
 // License: GPL. For details, see LICENSE file.
 package org.openstreetmap.josm.data;
+
+import static org.openstreetmap.josm.tools.I18n.tr;
 
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
+import java.util.stream.Collectors;
 
 import org.openstreetmap.josm.data.coor.LatLon;
@@ -34 +37 @@
     private final List<ImageEntry> data;
 
-    private int selectedImageIndex = -1;
+    private final List<Integer> selectedImagesIndex = new ArrayList<>();
 
     private final ListenerList<ImageDataUpdateListener> listeners = ListenerList.create();
@@ -56 +59 @@
             this.data = new ArrayList<>();
         }
+        selectedImagesIndex.add(-1);
     }
 
@@ -107 +111 @@
 
     /**
-     * Return the current selected image
-     * @return the selected image as {@link ImageEntry} or null
+     * Return the first currently selected image
+     * @return the first selected image as {@link ImageEntry} or null
+     * @see #getSelectedImages
      */
     public ImageEntry getSelectedImage() {
+        int selectedImageIndex = selectedImagesIndex.isEmpty() ? -1 : selectedImagesIndex.get(0);
         if (selectedImageIndex > -1) {
             return data.get(selectedImageIndex);
         }
         return null;
+    }
+
+    /**
+     * Return the current selected images
+     * @return the selected images as list {@link ImageEntry}
+     * @since 15333
+     */
+    public List<ImageEntry> getSelectedImages() {
+        return selectedImagesIndex.stream().filter(i -> i > -1).map(data::get).collect(Collectors.toList());
     }
 
@@ -138 +153 @@
      */
     public boolean hasNextImage() {
-        return selectedImageIndex != data.size() - 1;
+        return (selectedImagesIndex.size() == 1 && selectedImagesIndex.get(0) != data.size() - 1);
     }
 
@@ -146 +161 @@
     public void selectNextImage() {
         if (hasNextImage()) {
-            setSelectedImageIndex(selectedImageIndex + 1);
+            setSelectedImageIndex(selectedImagesIndex.get(0) + 1);
         }
     }
@@ -155 +170 @@
      */
     public boolean hasPreviousImage() {
-        return selectedImageIndex - 1 > -1;
+        return (selectedImagesIndex.size() == 1 && selectedImagesIndex.get(0) - 1 > -1);
     }
 
@@ -165 +180 @@
             return;
         }
-        setSelectedImageIndex(Integer.max(0, selectedImageIndex - 1));
+        setSelectedImageIndex(Integer.max(0, selectedImagesIndex.get(0) - 1));
     }
 
@@ -177 +192 @@
 
     /**
-     * Clear the selected image
+     * Add image to the list of selected images
+     * @param image {@link ImageEntry} the image to add
+     * @since 15333
+     */
+    public void addImageToSelection(ImageEntry image) {
+        int index = data.indexOf(image);
+        if (selectedImagesIndex.get(0) == -1) {
+            setSelectedImage(image);
+        } else if (!selectedImagesIndex.contains(index)) {
+            selectedImagesIndex.add(index);
+            listeners.fireEvent(l -> l.selectedImageChanged(this));
+        }
+    }
+
+    /**
+     * Remove the image from the list of selected images
+     * @param image {@link ImageEntry} the image to remove
+     * @since 15333
+     */
+    public void removeImageToSelection(ImageEntry image) {
+        int index = data.indexOf(image);
+        selectedImagesIndex.remove(selectedImagesIndex.indexOf(index));
+        if (selectedImagesIndex.isEmpty()) {
+            selectedImagesIndex.add(-1);
+        }
+        listeners.fireEvent(l -> l.selectedImageChanged(this));
+    }
+
+    /**
+     * Clear the selected image(s)
      */
     public void clearSelectedImage() {
@@ -188 +232 @@
 
     private void setSelectedImageIndex(int index, boolean forceTrigger) {
-        if (index == selectedImageIndex && !forceTrigger) {
+        if (selectedImagesIndex.size() > 1) {
+            selectedImagesIndex.clear();
+            selectedImagesIndex.add(-1);
+        }
+        if (index == selectedImagesIndex.get(0) && !forceTrigger) {
             return;
         }
-        selectedImageIndex = index;
+        selectedImagesIndex.set(0, index);
         listeners.fireEvent(l -> l.selectedImageChanged(this));
     }
@@ -199 +247 @@
      */
     public void removeSelectedImage() {
-        data.remove(getSelectedImage());
-        if (selectedImageIndex == data.size()) {
+        List<ImageEntry> selected = getSelectedImages();
+        if (selected.size() > 1) {
+            throw new IllegalStateException(tr("Multiple images have been selected"));
+        }
+        if (selected.isEmpty()) {
+            return;
+        }
+        data.remove(getSelectedImages().get(0));
+        if (selectedImagesIndex.get(0) == data.size()) {
             setSelectedImageIndex(data.size() - 1);
         } else {
-            setSelectedImageIndex(selectedImageIndex, true);
-        }
+            setSelectedImageIndex(selectedImagesIndex.get(0), true);
+        }
+    }
+
+    /**
+     * Determines if the image is selected
+     * @param image the {@link ImageEntry} image
+     * @return {@code true} is the image is selected, {@code false} otherwise
+     * @since 15333
+     */
+    public boolean isImageSelected(ImageEntry image) {
+        int index = data.indexOf(image);
+        return selectedImagesIndex.contains(index);
     }
 

trunk/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java

@@ -99 +99 @@
     /** Mouse position where the last image was selected. */
     private Point lastSelPos;
+    /** The mouse point */
+    private Point startPoint;
 
     /**
@@ -153 +155 @@
         this.useThumbs = useThumbs;
         this.data.addImageDataUpdateListener(this);
+    }
+
+    private final class ImageMouseListener extends MouseAdapter {
+        private boolean isMapModeOk() {
+            MapMode mapMode = MainApplication.getMap().mapMode;
+            return mapMode == null || isSupportedMapMode(mapMode);
+        }
+
+        @Override
+        public void mousePressed(MouseEvent e) {
+            if (e.getButton() != MouseEvent.BUTTON1)
+                return;
+            if (isVisible() && isMapModeOk()) {
+                cycleModeArmed = true;
+                invalidate();
+                startPoint = e.getPoint();
+            }
+        }
+
+        @Override
+        public void mouseReleased(MouseEvent ev) {
+            if (ev.getButton() != MouseEvent.BUTTON1)
+                return;
+            if (!isVisible() || !isMapModeOk())
+                return;
+            if (!cycleModeArmed) {
+                return;
+            }
+
+            Rectangle hitBoxClick = new Rectangle((int) startPoint.getX() - 10, (int) startPoint.getY() - 10, 15, 15);
+            if (!hitBoxClick.contains(ev.getPoint())) {
+                return;
+            }
+
+            Point mousePos = ev.getPoint();
+            boolean cycle = cycleModeArmed && lastSelPos != null && lastSelPos.equals(mousePos);
+            final boolean isShift = (ev.getModifiersEx() & MouseEvent.SHIFT_DOWN_MASK) == MouseEvent.SHIFT_DOWN_MASK;
+            final boolean isCtrl = (ev.getModifiersEx() & MouseEvent.CTRL_DOWN_MASK) == MouseEvent.CTRL_DOWN_MASK;
+            int idx = getPhotoIdxUnderMouse(ev, cycle);
+            if (idx >= 0) {
+                lastSelPos = mousePos;
+                cycleModeArmed = false;
+                ImageEntry img = data.getImages().get(idx);
+                if (isShift) {
+                    if (isCtrl && !data.getSelectedImages().isEmpty()) {
+                        int idx2 = data.getImages().indexOf(data.getSelectedImages().get(data.getSelectedImages().size() - 1));
+                        int startIndex = Math.min(idx, idx2);
+                        int endIndex = Math.max(idx, idx2);
+                        for (int i = startIndex; i <= endIndex; i++) {
+                            data.addImageToSelection(data.getImages().get(i));
+                        }
+                    } else {
+                        if (data.isImageSelected(img)) {
+                            data.removeImageToSelection(img);
+                        } else {
+                            data.addImageToSelection(img);
+                        }
+                    }
+                } else {
+                    data.setSelectedImage(img);
+                }
+            }
+        }
     }
 
@@ -497 +562 @@
                     paintImage(e, mv, clip, tempG);
                 }
-                if (data.getSelectedImage() != null) {
+                for (ImageEntry img: this.data.getSelectedImages()) {
                     // Make sure the selected image is on top in case multiple images overlap.
-                    paintImage(data.getSelectedImage(), mv, clip, tempG);
+                    paintImage(img, mv, clip, tempG);
                 }
                 updateOffscreenBuffer = false;
@@ -516 +581 @@
         }
 
-        ImageEntry e = data.getSelectedImage();
-        if (e != null && e.getPos() != null) {
-            Point p = mv.getPoint(e.getPos());
-
-            int imgWidth;
-            int imgHeight;
-            if (useThumbs && e.hasThumbnail()) {
-                Dimension d = scaledDimension(e.getThumbnail());
-                if (d != null) {
-                    imgWidth = d.width;
-                    imgHeight = d.height;
+        for (ImageEntry e: data.getSelectedImages()) {
+            if (e != null && e.getPos() != null) {
+                Point p = mv.getPoint(e.getPos());
+
+                int imgWidth;
+                int imgHeight;
+                if (useThumbs && e.hasThumbnail()) {
+                    Dimension d = scaledDimension(e.getThumbnail());
+                    if (d != null) {
+                        imgWidth = d.width;
+                        imgHeight = d.height;
+                    } else {
+                        imgWidth = -1;
+                        imgHeight = -1;
+                    }
                 } else {
-                    imgWidth = -1;
-                    imgHeight = -1;
-                }
-            } else {
-                imgWidth = selectedIcon.getIconWidth();
-                imgHeight = selectedIcon.getIconHeight();
-            }
-
-            if (e.getExifImgDir() != null) {
-                // Multiplier must be larger than sqrt(2)/2=0.71.
-                double arrowlength = Math.max(25, Math.max(imgWidth, imgHeight) * 0.85);
-                double arrowwidth = arrowlength / 1.4;
-
-                double dir = e.getExifImgDir();
-                // Rotate 90 degrees CCW
-                double headdir = (dir < 90) ? dir + 270 : dir - 90;
-                double leftdir = (headdir < 90) ? headdir + 270 : headdir - 90;
-                double rightdir = (headdir > 270) ? headdir - 270 : headdir + 90;
-
-                double ptx = p.x + Math.cos(Utils.toRadians(headdir)) * arrowlength;
-                double pty = p.y + Math.sin(Utils.toRadians(headdir)) * arrowlength;
-
-                double ltx = p.x + Math.cos(Utils.toRadians(leftdir)) * arrowwidth/2;
-                double lty = p.y + Math.sin(Utils.toRadians(leftdir)) * arrowwidth/2;
-
-                double rtx = p.x + Math.cos(Utils.toRadians(rightdir)) * arrowwidth/2;
-                double rty = p.y + Math.sin(Utils.toRadians(rightdir)) * arrowwidth/2;
-
-                g.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_ON);
-                g.setColor(new Color(255, 255, 255, 192));
-                int[] xar = {(int) ltx, (int) ptx, (int) rtx, (int) ltx};
-                int[] yar = {(int) lty, (int) pty, (int) rty, (int) lty};
-                g.fillPolygon(xar, yar, 4);
-                g.setColor(Color.black);
-                g.setStroke(new BasicStroke(1.2f));
-                g.drawPolyline(xar, yar, 3);
-            }
-
-            if (useThumbs && e.hasThumbnail()) {
-                g.setColor(new Color(128, 0, 0, 122));
-                g.fillRect(p.x - imgWidth / 2, p.y - imgHeight / 2, imgWidth, imgHeight);
-            } else {
-                selectedIcon.paintIcon(mv, g,
-                        p.x - imgWidth / 2,
-                        p.y - imgHeight / 2);
+                    imgWidth = selectedIcon.getIconWidth();
+                    imgHeight = selectedIcon.getIconHeight();
+                }
+
+                if (e.getExifImgDir() != null) {
+                    // Multiplier must be larger than sqrt(2)/2=0.71.
+                    double arrowlength = Math.max(25, Math.max(imgWidth, imgHeight) * 0.85);
+                    double arrowwidth = arrowlength / 1.4;
+
+                    double dir = e.getExifImgDir();
+                    // Rotate 90 degrees CCW
+                    double headdir = (dir < 90) ? dir + 270 : dir - 90;
+                    double leftdir = (headdir < 90) ? headdir + 270 : headdir - 90;
+                    double rightdir = (headdir > 270) ? headdir - 270 : headdir + 90;
+
+                    double ptx = p.x + Math.cos(Utils.toRadians(headdir)) * arrowlength;
+                    double pty = p.y + Math.sin(Utils.toRadians(headdir)) * arrowlength;
+
+                    double ltx = p.x + Math.cos(Utils.toRadians(leftdir)) * arrowwidth/2;
+                    double lty = p.y + Math.sin(Utils.toRadians(leftdir)) * arrowwidth/2;
+
+                    double rtx = p.x + Math.cos(Utils.toRadians(rightdir)) * arrowwidth/2;
+                    double rty = p.y + Math.sin(Utils.toRadians(rightdir)) * arrowwidth/2;
+
+                    g.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_ON);
+                    g.setColor(new Color(255, 255, 255, 192));
+                    int[] xar = {(int) ltx, (int) ptx, (int) rtx, (int) ltx};
+                    int[] yar = {(int) lty, (int) pty, (int) rty, (int) lty};
+                    g.fillPolygon(xar, yar, 4);
+                    g.setColor(Color.black);
+                    g.setStroke(new BasicStroke(1.2f));
+                    g.drawPolyline(xar, yar, 3);
+                }
+
+                if (useThumbs && e.hasThumbnail()) {
+                    g.setColor(new Color(128, 0, 0, 122));
+                    g.fillRect(p.x - imgWidth / 2, p.y - imgHeight / 2, imgWidth, imgHeight);
+                } else {
+                    selectedIcon.paintIcon(mv, g,
+                            p.x - imgWidth / 2,
+                            p.y - imgHeight / 2);
+                }
             }
         }
@@ -743 +809 @@
     @Override
     public void hookUpMapView() {
-        mouseAdapter = new MouseAdapter() {
-            private boolean isMapModeOk() {
-                MapMode mapMode = MainApplication.getMap().mapMode;
-                return mapMode == null || isSupportedMapMode(mapMode);
-            }
-
-            @Override
-            public void mousePressed(MouseEvent e) {
-                if (e.getButton() != MouseEvent.BUTTON1)
-                    return;
-                if (isVisible() && isMapModeOk()) {
-                    cycleModeArmed = true;
-                    invalidate();
-                }
-            }
-
-            @Override
-            public void mouseReleased(MouseEvent ev) {
-                if (ev.getButton() != MouseEvent.BUTTON1)
-                    return;
-                if (!isVisible() || !isMapModeOk())
-                    return;
-
-                Point mousePos = ev.getPoint();
-                boolean cycle = cycleModeArmed && lastSelPos != null && lastSelPos.equals(mousePos);
-                int idx = getPhotoIdxUnderMouse(ev, cycle);
-                if (idx >= 0) {
-                    lastSelPos = mousePos;
-                    cycleModeArmed = false;
-                    data.setSelectedImage(data.getImages().get(idx));
-                }
-            }
-        };
+        mouseAdapter = new ImageMouseListener();
 
         mouseMotionAdapter = new MouseMotionAdapter() {

trunk/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java

@@ -67 +67 @@
     private final ImgDisplayMouseListener imgMouseListener = new ImgDisplayMouseListener();
 
+    private String emptyText;
     private String osdText;
 
@@ -699 +700 @@
 
     /**
+     * Set the message displayed when there is no image to display.
+     * By default it display a simple No image
+     * @param emptyText the string to display
+     * @since 15333
+     */
+    public void setEmptyText(String emptyText) {
+        this.emptyText = emptyText;
+    }
+
+    /**
      * Sets the On-Screen-Display text.
      * @param text text to display on top of the image
@@ -730 +741 @@
         if (entry == null) {
             g.setColor(Color.black);
-            String noImageStr = tr("No image");
+            if (emptyText == null) {
+                emptyText = tr("No image");
+            }
+            String noImageStr = emptyText;
             Rectangle2D noImageSize = g.getFontMetrics(g.getFont()).getStringBounds(noImageStr, g);
             g.drawString(noImageStr,

trunk/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java

@@ -14 +14 @@
 import java.text.DateFormat;
 import java.text.SimpleDateFormat;
+import java.util.Collections;
+import java.util.List;
 import java.util.Optional;
 
@@ -377 +379 @@
      * @param data geo image data
      * @param entry image entry
-     */
+     * @deprecated Use {@link #displayImage}
+     */
+    @Deprecated
     public static void showImage(ImageData data, ImageEntry entry) {
         getInstance().displayImage(data, entry);
@@ -417 +421 @@
 
     /**
-     * Displays image for the given layer.
+     * Displays a single image for the given layer.
      * @param data the image data
      * @param entry image entry
+     * @see #displayImages
      */
     public void displayImage(ImageData data, ImageEntry entry) {
+        displayImages(data, Collections.singletonList(entry));
+    }
+
+    /**
+     * Displays images for the given layer.
+     * @param data the image data
+     * @param entries image entries
+     * @since 15333
+     */
+    public void displayImages(ImageData data, List<ImageEntry> entries) {
         boolean imageChanged;
+        ImageEntry entry = entries != null && entries.size() == 1 ? entries.get(0) : null;
 
         synchronized (this) {
@@ -491 +507 @@
             btnDeleteFromDisk.setEnabled(false);
             btnCopyPath.setEnabled(false);
+            if (entries != null && entries.size() > 1) {
+                imgDisplay.setEmptyText(tr("Multiple images selected"));
+                btnFirst.setEnabled(!isFirstImageSelected(data));
+                btnLast.setEnabled(!isLastImageSelected(data));
+            }
+            imgDisplay.setImage(null);
+            imgDisplay.setOsdText("");
             return;
         }
@@ -504 +527 @@
     }
 
+    private static boolean isLastImageSelected(ImageData data) {
+        return data.isImageSelected(data.getImages().get(data.getImages().size() - 1));
+    }
+
+    private static boolean isFirstImageSelected(ImageData data) {
+        return data.isImageSelected(data.getImages().get(0));
+    }
+
     /**
      * When an image is closed, really close it and do not pop
@@ -562 +593 @@
             ImageData removedData = ((GeoImageLayer) e.getRemovedLayer()).getImageData();
             if (removedData == currentData) {
-                displayImage(null, null);
+                displayImages(null, null);
             }
             removedData.removeImageDataUpdateListener(this);
@@ -592 +623 @@
     @Override
     public void selectedImageChanged(ImageData data) {
-        showImage(data, data.getSelectedImage());
+        displayImages(data, data.getSelectedImages());
     }
 
     @Override
     public void imageDataUpdated(ImageData data) {
-        showImage(data, data.getSelectedImage());
+        displayImages(data, data.getSelectedImages());
     }
 }