Changeset 31266 in osm for applications/editors/josm/plugins

Timestamp:

2015-06-15T13:07:24+02:00 (9 years ago)

Author:

nokutu

Message:

Button to center view on selected image, and if you click with center button in the picture zooms changes to 1:1 and then alternates between 1:1 and best fit

Location:

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

Files:

• MapillaryData.java (modified) (2 diffs)
• MapillaryDataListener.java (modified) (1 diff)
• MapillaryLayer.java (modified) (3 diffs)
• MapillaryPlugin.java (modified) (5 diffs)
• actions/MapillaryDownloadAction.java (modified) (3 diffs)
• actions/MapillaryExportAction.java (modified) (1 diff)
• actions/MapillaryImportAction.java (modified) (1 diff)
• actions/MapillarySignalAction.java (modified) (1 diff)
• actions/MapillaryZoomAction.java (added)
• gui/MapillaryImageDisplay.java (modified) (2 diffs)
• gui/MapillaryToggleDialog.java (modified) (1 diff)

applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/MapillaryData.java

@@ -178 +178 @@
          */
         public void setSelectedImage(MapillaryAbstractImage image, boolean zoom) {
+                MapillaryAbstractImage oldImage = selectedImage;
                 selectedImage = image;
                 multiSelectedImages.clear();
@@ -208 +209 @@
                         Main.map.mapView.repaint();
                 }
-                fireSelectedImageChanged();
-        }
-
-        private void fireSelectedImageChanged() {
+                fireSelectedImageChanged(oldImage, selectedImage);
+        }
+
+        private void fireSelectedImageChanged(MapillaryAbstractImage oldImage, MapillaryAbstractImage newImage) {
                 if (listeners.isEmpty())
                         return;
                 for (MapillaryDataListener lis : listeners)
-                        lis.selectedImageChanged();
+                        lis.selectedImageChanged(oldImage, newImage);
         }
 

applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/MapillaryDataListener.java

@@ -6 +6 @@
          * manually clicking on the icon.
          */
-        public void selectedImageChanged();
+        public void selectedImageChanged(MapillaryAbstractImage oldImage, MapillaryAbstractImage newImage);
 
 }

applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/MapillaryLayer.java

@@ -109 +109 @@
                 MapillaryPlugin.setMenuEnabled(MapillaryPlugin.EXPORT_MENU, true);
                 MapillaryPlugin.setMenuEnabled(MapillaryPlugin.SIGNAL_MENU, true);
-                download();
                 Main.map.mapView.setActiveLayer(this);
                 Main.map.repaint();
@@ -127 +126 @@
          * Downloads all images of the area covered by the OSM data.
          */
-        protected void download() {
+        public void download() {
                 for (Bounds bounds : Main.map.mapView.getEditLayer().data
                                 .getDataSourceBounds()) {
@@ -156 +155 @@
                                 .setImage(null);
                 MapillaryLayer.INSTANCE = null;
+                MapillaryData.INSTANCE = null;
                 MapillaryPlugin.setMenuEnabled(MapillaryPlugin.EXPORT_MENU, false);
                 MapillaryPlugin.setMenuEnabled(MapillaryPlugin.SIGNAL_MENU, false);
-                MapillaryData.INSTANCE = null;
+                MapillaryPlugin.setMenuEnabled(MapillaryPlugin.ZOOM_MENU, false);
                 Main.map.mapView.removeMouseListener(mouseAdapter);
                 Main.map.mapView.removeMouseMotionListener(mouseAdapter);

applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/MapillaryPlugin.java

@@ -51 +51 @@
         private final MapillaryImportAction importAction;
         private final MapillarySignalAction signalAction;
+        private final MapillaryZoomAction zoomAction;
 
         public static JMenuItem DOWNLOAD_MENU;
@@ -56 +57 @@
         public static JMenuItem IMPORT_MENU;
         public static JMenuItem SIGNAL_MENU;
+        public static JMenuItem ZOOM_MENU;
 
         public MapillaryPlugin(PluginInformation info) {
@@ -63 +65 @@
                 importAction = new MapillaryImportAction();
                 signalAction = new MapillarySignalAction();
+                zoomAction = new MapillaryZoomAction();
 
                 DOWNLOAD_MENU = MainMenu.add(Main.main.menu.imageryMenu,
@@ -72 +75 @@
                 SIGNAL_MENU = MainMenu.add(Main.main.menu.dataMenu, signalAction,
                                 false);
+                ZOOM_MENU = MainMenu.add(Main.main.menu.viewMenu, zoomAction,
+                                false);
 
                 EXPORT_MENU.setEnabled(false);
@@ -77 +82 @@
                 IMPORT_MENU.setEnabled(false);
                 SIGNAL_MENU.setEnabled(false);
+                ZOOM_MENU.setEnabled(false);
 
                 MapView.addEditLayerChangeListener(this);

applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/actions/MapillaryDownloadAction.java

@@ -31 +31 @@
                                                 KeyEvent.VK_M, Shortcut.ALT_CTRL_SHIFT), false,
                                 "mapillaryDownload", false);
+                this.setEnabled(false);
         }
 
@@ -36 +37 @@
         public void actionPerformed(ActionEvent arg0) {
                 this.layer = null;
-                if (Main.map == null || Main.map.mapView == null
-                                || Main.map.mapView.getEditLayer() == null)
-                        return;
                 for (Layer layer : Main.map.mapView.getAllLayers())
                         if (layer instanceof MapillaryLayer)
                                 this.layer = (MapillaryLayer) layer;
 
-                if (this.layer == null)
+                if (this.layer == null) {
                         layer = new MapillaryLayer();
-                else {
+                        layer.download();
+                } else {
                         if (Main.map.mapView.getActiveLayer() != layer)
                                 Main.map.mapView.setActiveLayer(layer);
@@ -53 +52 @@
                 }
         }
-
 }

applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/actions/MapillaryExportAction.java

@@ -39 +39 @@
                                                 "Export Mapillary", tr("Export Mapillary pictures"),
                                                 KeyEvent.VK_M, Shortcut.NONE), false, "mapillaryExport", false);
+                this.setEnabled(false);
         }
 

applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/actions/MapillaryImportAction.java

@@ -40 +40 @@
                                                 KeyEvent.VK_M, Shortcut.NONE), false,
                                 "mapillaryImport", false);
+                this.setEnabled(false);
         }
 

applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/actions/MapillarySignalAction.java

@@ -23 +23 @@
                 super(tr("Switch signal mode"), new ImageProvider("icon24signal.png"),
                                 tr("Switch signal mode"), Shortcut.registerShortcut(
-                                                "Mapillary signal", tr("Switch signal mode on/off"),
+                                                "Mapillary signal", tr("Switch Mapillary plugin's signal mode on/off"),
                                                 KeyEvent.VK_M, Shortcut.NONE), false,
                                 "mapillarySignal", false);
+                this.setEnabled(false);
         }
 

applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/gui/MapillaryImageDisplay.java

@@ -32 +32 @@
 
         private static final int DRAG_BUTTON = 3;
+        private static final int OPTION_BUTTON = 2;
         private static final int ZOOM_BUTTON = 1;
 
@@ -138 +139 @@
                         if (image == null)
                                 return;
-                        if (e.getButton() != DRAG_BUTTON)
+                        if (e.getButton() == OPTION_BUTTON) {
+                                if (!MapillaryImageDisplay.this.visibleRect
+                                                .equals(new Rectangle(0, 0, image.getWidth(null), image
+                                                                .getHeight(null))))
+                                        // Zooms to 1:1
+                                        MapillaryImageDisplay.this.visibleRect = new Rectangle(0,
+                                                        0, image.getWidth(null), image.getHeight(null));
+                                else
+                                        // Zooms to best fit.
+                                        MapillaryImageDisplay.this.visibleRect = new Rectangle(
+                                                        0,
+                                                        (image.getHeight(null) - (image.getWidth(null) * getHeight())
+                                                                        / getWidth()) / 2, image.getWidth(null),
+                                                        (image.getWidth(null) * getHeight()) / getWidth());
+                                MapillaryImageDisplay.this.repaint();
+                                return;
+                        } else if (e.getButton() != DRAG_BUTTON)
                                 return;
                         // Calculate the translation to set the clicked point the center of

applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/gui/MapillaryToggleDialog.java

@@ -382 +382 @@
 
         @Override
-        public void selectedImageChanged() {
+        public void selectedImageChanged(MapillaryAbstractImage oldImage, MapillaryAbstractImage newImage) {
                 setImage(MapillaryData.getInstance().getSelectedImage());
                 updateImage();