Changeset 31385 in osm for applications/editors/josm/plugins/mapillary/src

Timestamp:

2015-07-16T13:56:01+02:00 (10 years ago)

Author:

nokutu

Message:

In select mode, when an image is highlighted, just the thumbnail is downloaded.

Location:

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

Files:

• gui/MapillaryMainDialog.java (modified) (11 diffs)
• mode/SelectMode.java (modified) (5 diffs)

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

@@ -40 +40 @@
 /**
  * Toggle dialog that shows an image and some buttons.
- * 
+ *
  * @author nokutu
  *
@@ -116 +116 @@
 
   /**
-   * Downloads the image of the selected MapillaryImage and sets in the
+   * Downloads the full quality picture of the selected MapillaryImage and sets
+   * in the MapillaryImageDisplay object.
+   */
+  public synchronized void updateImage() {
+    updateImage(true);
+  }
+
+  /**
+   * Downloads the picture of the selected MapillaryImage and sets in the
    * MapillaryImageDisplay object.
-   */
-  public synchronized void updateImage() {
+   *
+   * @param fullQuality
+   *          If the full quality picture must be downloaded or just the
+   *          thumbnail.
+   */
+  public synchronized void updateImage(boolean fullQuality) {
     if (!SwingUtilities.isEventDispatchThread()) {
       SwingUtilities.invokeLater(new Runnable() {
@@ -173 +185 @@
 
         // Downloads the full resolution image.
-        if (imageCache != null)
-          imageCache.cancelOutstandingTasks();
-        imageCache = new MapillaryCache(mapillaryImage.getKey(),
-            MapillaryCache.Type.FULL_IMAGE);
-        imageCache.submit(this, false);
+        if (fullQuality) {
+          if (imageCache != null)
+            imageCache.cancelOutstandingTasks();
+          imageCache = new MapillaryCache(mapillaryImage.getKey(),
+              MapillaryCache.Type.FULL_IMAGE);
+          imageCache.submit(this, false);
+        }
       } else if (image instanceof MapillaryImportedImage) {
         mapillaryImageDisplay.hyperlink.setVisible(false);
@@ -190 +204 @@
       updateTitle();
     }
+
   }
 
@@ -202 +217 @@
   /**
    * Sets a new MapillaryImage to be shown.
-   * 
+   *
    * @param image
    */
@@ -244 +259 @@
   /**
    * Returns the MapillaryImage objects which is being shown.
-   * 
+   *
    * @return
    */
@@ -253 +268 @@
   /**
    * Action class form the next image button.
-   * 
+   *
    * @author Jorge
    *
@@ -271 +286 @@
   /**
    * Action class for the previous image button.
-   * 
+   *
    * @author Jorge
    *
@@ -290 +305 @@
   /**
    * Action class to jump to the image following the red line.
-   * 
+   *
    * @author nokutu
    *
@@ -311 +326 @@
   /**
    * Action class to jump to the image following the blue line.
-   * 
+   *
    * @author nokutu
    *
@@ -364 +379 @@
   /**
    * Creates the layout of the dialog.
-   * 
+   *
    * @param data
    *          The content of the dialog

applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/mode/SelectMode.java

@@ -39 +39 @@
 
   public SelectMode() {
-    data = MapillaryData.getInstance();
     record = MapillaryRecord.getInstance();
   }
@@ -49 +48 @@
       return;
     MapillaryAbstractImage closest = getClosest(e.getPoint());
-    if (Main.map.mapView.getActiveLayer() instanceof OsmDataLayer
-        && closest != null && Main.map.mapMode == Main.map.mapModeSelect) {
+    if (Main.map.mapView.getActiveLayer() instanceof OsmDataLayer && closestTemp != null
+        && Main.map.mapMode == Main.map.mapModeSelect) {
       this.lastClicked = this.closest;
-      MapillaryData.getInstance().setSelectedImage(closest);
+      data.setSelectedImage(closest);
       return;
     } else if (Main.map.mapView.getActiveLayer() != MapillaryLayer
@@ -99 +98 @@
 
     if (!Main.pref.getBoolean("mapillary.developer"))
-      for (MapillaryAbstractImage img : MapillaryData.getInstance()
-          .getMultiSelectedImages()) {
+      for (MapillaryAbstractImage img : data.getMultiSelectedImages()) {
         if (img instanceof MapillaryImage)
           return;
       }
-    if (MapillaryData.getInstance().getSelectedImage() != null) {
+    if (data.getSelectedImage() != null) {
       if (lastButton == MouseEvent.BUTTON1 && !e.isShiftDown()) {
         LatLon to = Main.map.mapView.getLatLon(e.getX(), e.getY());
         LatLon from = Main.map.mapView.getLatLon(start.getX(), start.getY());
-        for (MapillaryAbstractImage img : MapillaryData.getInstance()
-            .getMultiSelectedImages()) {
+        for (MapillaryAbstractImage img : data.getMultiSelectedImages()) {
 
           img.move(to.getX() - from.getX(), to.getY() - from.getY());
@@ -115 +112 @@
         Main.map.repaint();
       } else if (lastButton == MouseEvent.BUTTON1 && e.isShiftDown()) {
-        this.closest.turn(Math.toDegrees(Math.atan2((e.getX() - start.x),
-            -(e.getY() - start.y)))
-            - closest.getTempCa());
-        for (MapillaryAbstractImage img : MapillaryData.getInstance()
-            .getMultiSelectedImages()) {
-          img.turn(Math.toDegrees(Math.atan2((e.getX() - start.x),
-              -(e.getY() - start.y))) - closest.getTempCa());
+        this.closest
+            .turn(Math.toDegrees(Math.atan2((e.getX() - start.x), -(e.getY() - start.y))) - closest.getTempCa());
+        for (MapillaryAbstractImage img : data.getMultiSelectedImages()) {
+          img.turn(Math.toDegrees(Math.atan2((e.getX() - start.x), -(e.getY() - start.y))) - closest.getTempCa());
         }
         Main.map.repaint();
@@ -184 +178 @@
     }
 
-    if (MapillaryData.getInstance().getHighlighted() != closestTemp
-        && closestTemp != null) {
-      MapillaryData.getInstance().setHighlightedImage(closestTemp);
+    if (data.getHighlighted() != closestTemp && closestTemp != null) {
+      data.setHighlightedImage(closestTemp);
       MapillaryMainDialog.getInstance().setImage(closestTemp);
+      MapillaryMainDialog.getInstance().updateImage(false);
+    } else if (data.getHighlighted() != closestTemp && closestTemp == null) {
+      data.setHighlightedImage(null);
+      MapillaryMainDialog.getInstance().setImage(data.getSelectedImage());
       MapillaryMainDialog.getInstance().updateImage();
-    } else if (MapillaryData.getInstance().getHighlighted() != closestTemp
-        && closestTemp == null) {
-      MapillaryData.getInstance().setHighlightedImage(null);
-      MapillaryMainDialog.getInstance().setImage(
-          MapillaryData.getInstance().getSelectedImage());
-      MapillaryMainDialog.getInstance().updateImage();
-    }
-    MapillaryData.getInstance().dataUpdated();
+    }
+    data.dataUpdated();
   }