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

Timestamp:

2015-06-15T14:13:09+02:00 (10 years ago)

Author:

nokutu

Message:

Picture's author and capture date is shown

Location:

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

Files:

• MapillaryImage.java (modified) (4 diffs)
• downloads/MapillaryImageInfoDownloaderThread.java (modified) (1 diff)
• gui/MapillaryToggleDialog.java (modified) (6 diffs)

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

@@ -1 +1 @@
 package org.openstreetmap.josm.plugins.mapillary;
 
+import java.sql.Date;
+import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.List;
@@ -17 +19 @@
         private MapillarySequence sequence;
 
-        private int capturedAt;
+        private long capturedAt;
         private String user;
         private List<String> signals;
@@ -65 +67 @@
         }
 
-        public void setCapturedAt(int capturedAt) {
+        public void setCapturedAt(long capturedAt) {
                 this.capturedAt = capturedAt;
         }
 
-        public int getCapturedAt() {
+        public long getCapturedAt() {
                 return capturedAt;
         }
@@ -128 +130 @@
                 return this.getSequence().previous(this);
         }
+        
+        public String getDate() {
+                Date date = new Date(getCapturedAt());
+
+                SimpleDateFormat formatter = new SimpleDateFormat("dd/MM/yyyy - hh:mm:ss");
+                return formatter.format(date);
+        }
 
         @Override

applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/downloads/MapillaryImageInfoDownloaderThread.java

@@ -52 +52 @@
                                                                         .getString("user"));
                                                         ((MapillaryImage) image).setCapturedAt(data
-                                                                        .getJsonNumber("captured_at").intValue());
+                                                                        .getJsonNumber("captured_at").longValue());
                                                         ((MapillaryImage) image).setLocation(data
                                                                         .getString("location"));

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

@@ -48 +48 @@
         public final static int SIGNAL_MODE = 1;
 
+        public final static String BASE_TITLE = "Mapillary picture";
+
         public static MapillaryToggleDialog INSTANCE;
 
@@ -76 +78 @@
 
         public MapillaryToggleDialog() {
-                super(tr("Mapillary image"), "mapillary.png",
-                                tr("Open Mapillary window"), Shortcut.registerShortcut(
-                                                tr("Mapillary dialog"),
+                super(tr(BASE_TITLE), "mapillary.png", tr("Open Mapillary window"),
+                                Shortcut.registerShortcut(tr("Mapillary dialog"),
                                                 tr("Open Mapillary main dialog"), KeyEvent.VK_M,
                                                 Shortcut.NONE), 200);
@@ -130 +131 @@
                 createLayout(mapillaryImageDisplay, list,
                                 Main.pref.getBoolean("mapillary.reverse-buttons"));
+                disableAllButtons();
                 updateImage();
         }
@@ -149 +151 @@
                                 return;
                         }
-                        if (this.image == null)
+                        if (this.image == null) {
+                                mapillaryImageDisplay.setImage(null);
+                                titleBar.setTitle(BASE_TITLE);
+                                disableAllButtons();
                                 return;
+                        }
                         if (image instanceof MapillaryImage) {
                                 MapillaryImage mapillaryImage = (MapillaryImage) this.image;
+                                String title = BASE_TITLE;
+                                if (mapillaryImage.getUser() != null)
+                                        title += " -- " + mapillaryImage.getUser();
+                                if (mapillaryImage.getCapturedAt() != 0)
+                                        title += " -- " + mapillaryImage.getDate();
+                                titleBar.setTitle(title);
                                 if (mode == NORMAL_MODE) {
                                         this.nextButton.setEnabled(true);
@@ -215 +227 @@
         }
 
+        private void disableAllButtons() {
+                nextButton.setEnabled(false);
+                previousButton.setEnabled(false);
+                blueButton.setEnabled(false);
+                redButton.setEnabled(false);
+                nextSignalButton.setEnabled(false);
+                previousSignalButton.setEnabled(false);
+        }
+
         /**
          * Sets a new MapillaryImage to be shown.
@@ -382 +403 @@
 
         @Override
-        public void selectedImageChanged(MapillaryAbstractImage oldImage, MapillaryAbstractImage newImage) {
+        public void selectedImageChanged(MapillaryAbstractImage oldImage,
+                        MapillaryAbstractImage newImage) {
                 setImage(MapillaryData.getInstance().getSelectedImage());
                 updateImage();