Changeset 31396 in osm for applications

Timestamp:

2015-07-21T16:34:28+02:00 (9 years ago)

Author:

nokutu

Message:

Walk mode created. Set an interval and it will automatically switch to next picture.

Location:

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

Files:

• MapillaryData.java (modified) (3 diffs)
• MapillaryPlugin.java (modified) (6 diffs)
• actions/MapillaryImportIntoSequenceAction.java (modified) (1 diff)
• actions/MapillaryWalkAction.java (added)
• gui/MapillaryMainDialog.java (modified) (2 diffs)
• gui/MapillaryPreferenceSetting.java (modified) (1 diff)
• gui/MapillaryWalkDialog.java (added)

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

@@ -32 +32 @@
   private final List<MapillaryAbstractImage> multiSelectedImages;
 
-  private List<MapillaryDataListener> listeners = new ArrayList<>();
+  private List<MapillaryDataListener> listeners = new CopyOnWriteArrayList<>();
 
   /**
@@ -41 +41 @@
     multiSelectedImages = new ArrayList<>();
     selectedImage = null;
+    
+    addListener(MapillaryPlugin.walkAction);
   }
 
@@ -219 +221 @@
 
   /**
-   * Selects a new image.If the user does ctrl+click, this isn't triggered.
+   * Selects a new image.If the user does ctrl + click, this isn't triggered.
    *
    * @param image

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

@@ -40 +40 @@
   public static final ImageIcon MAP_ICON_SELECTED = new ImageProvider(
       "mapiconselected.png").get();
-  /** Icon representing an imported iage in the map. */
+  /** Icon representing an imported image in the map. */
   public static final ImageIcon MAP_ICON_IMPORTED = new ImageProvider(
       "mapiconimported.png").get();
   /** Icon used to identify which images have signs on them */
   public static final ImageIcon MAP_SIGN = new ImageProvider("sign.png").get();
-  public static final int ICON_SIZE = 24;
 
   /** Cache that stores the pictures the downloaded pictures. */
@@ -57 +56 @@
   private final MapillaryImportIntoSequenceAction importIntoSequenceAction;
   private final MapillaryJoinAction joinAction;
+  /** Walk action */
+  public final static MapillaryWalkAction walkAction = new MapillaryWalkAction();
 
   /** Menu button for the {@link MapillaryDownloadAction} action. */
@@ -72 +73 @@
   /** Menu button for the {@link MapillaryJoinAction} action. */
   public static JMenuItem JOIN_MENU;
+  /** Menu button for the {@link MapillaryWalkAction} action. */
+  public static JMenuItem WALK_MENU;
 
   /**
@@ -101 +104 @@
           downloadViewAction, false, 14);
       JOIN_MENU = MainMenu.add(Main.main.menu.dataMenu, joinAction, false);
+      WALK_MENU = MainMenu.add(Main.main.menu.moreToolsMenu, walkAction, false);
     }
 
@@ -110 +114 @@
     DOWNLOAD_VIEW_MENU.setEnabled(false);
     JOIN_MENU.setEnabled(false);
+    WALK_MENU.setEnabled(false);
 
     try {
@@ -151 +156 @@
    *          The JMenuItem object that is going to be enabled or disabled.
    * @param value
-   *          true to enable de JMenuItem; false to disable it.
+   *          true to enable the JMenuItem; false to disable it.
    */
   public static void setMenuEnabled(JMenuItem menu, boolean value) {

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

@@ -46 +46 @@
   private LinkedList<MapillaryImportedImage> images;
 
+  /**
+   * Main constructor.
+   */
   public MapillaryImportIntoSequenceAction() {
     super(tr("Import pictures into sequence"), new ImageProvider("icon24.png"),

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

@@ -65 +65 @@
   private JPanel buttonsPanel;
 
-  private MapillaryImageDisplay mapillaryImageDisplay;
+  /** Object containing the shown image and that handles zoom and drag */
+  public MapillaryImageDisplay mapillaryImageDisplay;
 
   private MapillaryCache imageCache;
@@ -257 +258 @@
             title += " -- " + mapillaryImage.getDate();
           setTitle(title);
-        }
-        else if (this.image instanceof MapillaryImportedImage) {
+        } else if (this.image instanceof MapillaryImportedImage) {
           MapillaryImportedImage mapillaryImportedImage = (MapillaryImportedImage) this.image;
           String title = tr(BASE_TITLE);

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

@@ -67 +67 @@
       oauth.setText("Login");
     else
-       oauth.setText("Already loged in, click to relogin");
+       oauth.setText("Already loged in, click to relogin.");
     panel.add(oauth);
     gui.getDisplayPreference().addSubTab(this, "Mapillary", panel);