Changeset 31356 in osm for applications/editors

Timestamp:

2015-07-09T11:57:16+02:00 (9 years ago)

Author:

nokutu

Message:

Started working on map modes for MapillaryLayer. Atm I'm working with join mode, that allows the user to join images to make sequences.

Location:

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

Files:

• MapillaryLayer.java (modified) (6 diffs)
• mode (added)
• mode/AbstractMode.java (added)
• mode/JoinMode.java (added)
• mode/SelectMode.java (moved) (moved from applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/MapillaryMouseAdapter.java ) (9 diffs)

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

@@ -10 +10 @@
 import org.openstreetmap.josm.plugins.mapillary.gui.MapillaryFilterDialog;
 import org.openstreetmap.josm.plugins.mapillary.gui.MapillaryMainDialog;
+import org.openstreetmap.josm.plugins.mapillary.mode.SelectMode;
 import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.gui.layer.Layer;
@@ -75 +76 @@
   public ArrayList<Bounds> bounds;
 
-  private MouseAdapter mouseAdapter;
+  private MouseAdapter mode;
 
   private int highlightPointRadius = Main.pref.getInteger(
@@ -94 +95 @@
    */
   private void init() {
-    mouseAdapter = new MapillaryMouseAdapter();
+    mode = new SelectMode();
     try {
       CACHE = JCSCacheManager.getCache("Mapillary");
@@ -101 +102 @@
     }
     if (Main.map != null && Main.map.mapView != null) {
-      Main.map.mapView.addMouseListener(mouseAdapter);
-      Main.map.mapView.addMouseMotionListener(mouseAdapter);
+      Main.map.mapView.addMouseListener(mode);
+      Main.map.mapView.addMouseMotionListener(mode);
       Main.map.mapView.addLayer(this);
       MapView.addEditLayerChangeListener(this, false);
@@ -118 +119 @@
     createHatchTexture();
     data.dataUpdated();
+  }
+  
+  public void setMode(MouseAdapter mode) {
+    Main.map.mapView.removeMouseListener(this.mode);
+    Main.map.mapView.removeMouseMotionListener(this.mode);
+    this.mode = mode;
+    Main.map.mapView.addMouseListener(mode);
+    Main.map.mapView.addMouseMotionListener(mode);
   }
 
@@ -186 +195 @@
     MapillaryPlugin.setMenuEnabled(MapillaryPlugin.EXPORT_MENU, false);
     MapillaryPlugin.setMenuEnabled(MapillaryPlugin.ZOOM_MENU, false);
-    Main.map.mapView.removeMouseListener(mouseAdapter);
-    Main.map.mapView.removeMouseMotionListener(mouseAdapter);
+    Main.map.mapView.removeMouseListener(mode);
+    Main.map.mapView.removeMouseMotionListener(mode);
     MapView.removeEditLayerChangeListener(this);
     if (Main.map.mapView.getEditLayer() != null)

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

@@ -1 @@
-package org.openstreetmap.josm.plugins.mapillary;
+package org.openstreetmap.josm.plugins.mapillary.mode;
 
 import java.awt.Point;
-import java.awt.event.MouseAdapter;
 import java.awt.event.MouseEvent;
 import java.util.ArrayList;
@@ -10 +9 @@
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
 import org.openstreetmap.josm.gui.layer.OsmDataLayer;
+import org.openstreetmap.josm.plugins.mapillary.MapillaryAbstractImage;
+import org.openstreetmap.josm.plugins.mapillary.MapillaryData;
+import org.openstreetmap.josm.plugins.mapillary.MapillaryImage;
+import org.openstreetmap.josm.plugins.mapillary.MapillaryImportedImage;
+import org.openstreetmap.josm.plugins.mapillary.MapillaryLayer;
 import org.openstreetmap.josm.plugins.mapillary.commands.CommandMoveImage;
 import org.openstreetmap.josm.plugins.mapillary.commands.CommandTurnImage;
@@ -21 +25 @@
  *
  */
-public class MapillaryMouseAdapter extends MouseAdapter {
+public class SelectMode extends AbstractMode {
   private Point start;
   private int lastButton;
   private MapillaryAbstractImage closest;
   private MapillaryAbstractImage lastClicked;
-  private MapillaryData mapillaryData;
   private MapillaryRecord record;
 
@@ -32 +35 @@
   private boolean imageHighlighted = false;
 
-  public MapillaryMouseAdapter() {
-    mapillaryData = MapillaryData.getInstance();
+  public SelectMode() {
+    data = MapillaryData.getInstance();
     record = MapillaryRecord.getInstance();
   }
@@ -53 +56 @@
       MapillaryImage closest = (MapillaryImage) closestTemp;
       // Doube click
-      if (e.getClickCount() == 2 && mapillaryData.getSelectedImage() != null && closest != null) {
+      if (e.getClickCount() == 2 && data.getSelectedImage() != null && closest != null) {
         for (MapillaryAbstractImage img : closest.getSequence().getImages()) {
-          mapillaryData.addMultiSelectedImage(img);
+          data.addMultiSelectedImage(img);
         }
       }
@@ -61 +64 @@
       this.lastClicked = this.closest;
       this.closest = closest;
-      if (mapillaryData.getMultiSelectedImages().contains(closest))
+      if (data.getMultiSelectedImages().contains(closest))
         return;
       // ctrl+click
       if (e.getModifiers() == (MouseEvent.BUTTON1_MASK | MouseEvent.CTRL_MASK) && closest != null)
-        mapillaryData.addMultiSelectedImage(closest);
+        data.addMultiSelectedImage(closest);
       // shift + click
       else if (e.getModifiers() == (MouseEvent.BUTTON1_MASK | MouseEvent.SHIFT_MASK)
@@ -74 +77 @@
           int j = ((MapillaryImage) this.lastClicked).getSequence().getImages().indexOf(this.lastClicked);
           if (i < j)
-            mapillaryData.addMultiSelectedImage(new ArrayList<>(((MapillaryImage) this.closest).getSequence()
+            data.addMultiSelectedImage(new ArrayList<>(((MapillaryImage) this.closest).getSequence()
                 .getImages().subList(i, j + 1)));
           else
-            mapillaryData.addMultiSelectedImage(new ArrayList<>(((MapillaryImage) this.closest).getSequence()
+            data.addMultiSelectedImage(new ArrayList<>(((MapillaryImage) this.closest).getSequence()
                 .getImages().subList(j, i + 1)));
         }
         // click
       } else
-        mapillaryData.setSelectedImage(closest);
+        data.setSelectedImage(closest);
       // If you select an imported image
     } else if (closestTemp instanceof MapillaryImportedImage) {
@@ -89 +92 @@
       this.lastClicked = this.closest;
       this.closest = closest;
-      if (mapillaryData.getMultiSelectedImages().contains(closest))
+      if (data.getMultiSelectedImages().contains(closest))
         return;
       if (e.getModifiers() == (MouseEvent.BUTTON1_MASK | MouseEvent.CTRL_MASK) && closest != null)
-        mapillaryData.addMultiSelectedImage(closest);
+        data.addMultiSelectedImage(closest);
       else
-        mapillaryData.setSelectedImage(closest);
+        data.setSelectedImage(closest);
     }
-  }
-
-  private MapillaryAbstractImage getClosest(Point clickPoint) {
-    double snapDistance = 10;
-    double minDistance = Double.MAX_VALUE;
-    MapillaryAbstractImage closest = null;
-    for (MapillaryAbstractImage image : mapillaryData.getImages()) {
-      Point imagePoint = Main.map.mapView.getPoint(image.getLatLon());
-      imagePoint.setLocation(imagePoint.getX(), imagePoint.getY());
-      double dist = clickPoint.distanceSq(imagePoint);
-      if (minDistance > dist && clickPoint.distance(imagePoint) < snapDistance && image.isVisible()) {
-        minDistance = dist;
-        closest = image;
-      }
-    }
-    return closest;
   }
 
@@ -146 +133 @@
   @Override
   public void mouseReleased(MouseEvent e) {
-    if (mapillaryData.getSelectedImage() == null)
+    if (data.getSelectedImage() == null)
       return;
-    if (mapillaryData.getSelectedImage().getTempCa() != mapillaryData.getSelectedImage().getCa()) {
-      double from = mapillaryData.getSelectedImage().getTempCa();
-      double to = mapillaryData.getSelectedImage().getCa();
-      record.addCommand(new CommandTurnImage(mapillaryData.getMultiSelectedImages(), to - from));
-    } else if (mapillaryData.getSelectedImage().getTempLatLon() != mapillaryData.getSelectedImage().getLatLon()) {
-      LatLon from = mapillaryData.getSelectedImage().getTempLatLon();
-      LatLon to = mapillaryData.getSelectedImage().getLatLon();
-      record.addCommand(new CommandMoveImage(mapillaryData.getMultiSelectedImages(), to.getX() - from.getX(), to.getY()
+    if (data.getSelectedImage().getTempCa() != data.getSelectedImage().getCa()) {
+      double from = data.getSelectedImage().getTempCa();
+      double to = data.getSelectedImage().getCa();
+      record.addCommand(new CommandTurnImage(data.getMultiSelectedImages(), to - from));
+    } else if (data.getSelectedImage().getTempLatLon() != data.getSelectedImage().getLatLon()) {
+      LatLon from = data.getSelectedImage().getTempLatLon();
+      LatLon to = data.getSelectedImage().getLatLon();
+      record.addCommand(new CommandMoveImage(data.getMultiSelectedImages(), to.getX() - from.getX(), to.getY()
           - from.getY()));
     }
-    for (MapillaryAbstractImage img : mapillaryData.getMultiSelectedImages()) {
+    for (MapillaryAbstractImage img : data.getMultiSelectedImages()) {
       if (img != null)
         img.stopMoving();