Changeset 15333 in josm for trunk/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java

Timestamp:

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

Author:

Don-vip

Message:

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

File:

• trunk/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java (modified) (7 diffs)

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());
     }
 }