Changeset 18263 in josm for trunk/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java

Timestamp:

2021-10-09T20:42:32+02:00 (3 years ago)

Author:

Don-vip

Message:

see #16472 - draw direction arrow of 360 images

File:

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

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

@@ -32 +32 @@
 import org.openstreetmap.josm.data.preferences.IntegerProperty;
 import org.openstreetmap.josm.gui.MainApplication;
+import org.openstreetmap.josm.gui.layer.AbstractMapViewPaintable;
 import org.openstreetmap.josm.gui.layer.geoimage.viewers.projections.IImageViewer;
 import org.openstreetmap.josm.gui.layer.geoimage.viewers.projections.ImageProjectionRegistry;
@@ -37 +38 @@
 import org.openstreetmap.josm.gui.layer.imagery.ImageryFilterSettings.FilterChangeListener;
 import org.openstreetmap.josm.gui.util.GuiHelper;
+import org.openstreetmap.josm.gui.util.imagery.Vector3D;
 import org.openstreetmap.josm.spi.preferences.Config;
 import org.openstreetmap.josm.spi.preferences.PreferenceChangeEvent;
@@ -510 +512 @@
                     }
                 }
-                // We have to update the mousePointInImg for 360 image panning, as otherwise the panning
-                // never stops.
+                // We have to update the mousePointInImg for 360 image panning, as otherwise the panning never stops.
                 // This does not work well with the perspective viewer at this time (2021-08-26).
-                if (entry != null && Projections.EQUIRECTANGULAR == entry.getProjectionType()) {
+                boolean is360panning = entry != null && Projections.EQUIRECTANGULAR == entry.getProjectionType();
+                if (is360panning) {
                     this.mousePointInImg = p;
                 }
                 ImageDisplay.this.repaint();
+                if (is360panning) {
+                    // repaint direction arrow
+                    MainApplication.getLayerManager().getLayersOfType(GeoImageLayer.class).forEach(AbstractMapViewPaintable::invalidate);
+                }
             }
 
@@ -983 +989 @@
 
     /**
+     * Get the rotation in the image viewer for an entry
+     * @param entry The entry to get the rotation for. May be {@code null}.
+     * @return the current rotation in the image viewer, or {@code null}
+     * @since 18263
+     */
+    public Vector3D getRotation(IImageEntry<?> entry) {
+        return entry != null ? getIImageViewer(entry).getRotation() : null;
+    }
+
+    /**
      * Ensure that a rectangle isn't zoomed in too much
      * @param rectangle The rectangle to get (typically the visible area)