Changeset 31296 in osm

Timestamp:

2015-06-22T13:13:47+02:00 (9 years ago)

Author:

nokutu

Message:

Improved picture's capture time visualization and start with choose signals GUI

Location:

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

Files:

• MapillaryAbstractImage.java (modified) (1 diff)
• downloads/MapillaryDownloader.java (modified) (1 diff)
• gui/MapillaryFilterChooseSigns.java (added)
• gui/MapillaryFilterDialog.java (modified) (5 diffs)
• gui/MapillaryPreferenceSetting.java (modified) (4 diffs)

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

@@ -141 +141 @@
      */
     public String getDate() {
-        return getDate("dd/MM/yyyy - hh:mm:ss");
+        String format = "";
+        if (Main.pref.getBoolean("iso.dates"))
+            format += "yyyy-MM-dd";
+        else
+            format += "dd/MM/yyyy";
+        if (Main.pref.getBoolean("mapillary.display-hour")){
+            if (Main.pref.getBoolean("mapillary.format-24"))
+                format += " - HH:mm:ss";
+            else
+                format += " - h:mm:ss a";
+        }
+        return getDate(format);
     }
 

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

@@ -48 +48 @@
         url2 += buildParameters(hash);
         url3 += buildParameters(hash);
-        System.out.println(url2);
 
         try {

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

@@ -3 +3 @@
 import static org.openstreetmap.josm.tools.I18n.tr;
 
+import java.awt.Dimension;
 import java.awt.FlowLayout;
 import java.awt.GridLayout;
@@ -14 +15 @@
 import javax.swing.JCheckBox;
 import javax.swing.JComboBox;
+import javax.swing.JDialog;
 import javax.swing.JLabel;
+import javax.swing.JOptionPane;
 import javax.swing.JPanel;
 import javax.swing.JTextField;
 
+import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.gui.SideButton;
 import org.openstreetmap.josm.gui.dialogs.ToggleDialog;
@@ -66 +70 @@
         imported = new JCheckBox("Imported images");
         downloaded = new JCheckBox(new downloadCheckBoxAction());
-        onlySigns = new JCheckBox("Only images with signs");
+        onlySigns = new JCheckBox(new OnlySignsAction());
 
         signChooser = new JButton(new SignChooserAction());
@@ -221 +225 @@
         }
     }
+    
+    private class OnlySignsAction extends AbstractAction {
+        public OnlySignsAction() {
+            putValue(NAME, tr("Only images with signs"));
+        }
+
+        @Override
+        public void actionPerformed(ActionEvent arg0) {
+            signChooser.setEnabled(onlySigns.isSelected());
+        }
+    }
 
     private class SignChooserAction extends AbstractAction {
@@ -229 +244 @@
         @Override
         public void actionPerformed(ActionEvent arg0) {
+            JPanel dialog = MapillaryFilterChooseSigns.getInstance();
+            JOptionPane pane = new JOptionPane(dialog, JOptionPane.PLAIN_MESSAGE,
+                    JOptionPane.OK_CANCEL_OPTION);
+            JDialog dlg = pane.createDialog(Main.parent, tr("Choose signs"));
+            dlg.setMinimumSize(new Dimension(400, 150));
+            dlg.setVisible(true);
             MapillaryFilterDialog.getInstance().refresh();
+            dlg.dispose();
+
         }
     }

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

@@ -2 +2 @@
 
 import static org.openstreetmap.josm.tools.I18n.tr;
+
 import java.awt.FlowLayout;
 
@@ -18 +19 @@
     private JCheckBox downloadMode = new JCheckBox(
             tr("Download images manually"));
+    private JCheckBox displayHour = new JCheckBox(tr("Display hour when the picture was taken"));
+    private JCheckBox format24 = new JCheckBox(tr("Use 24 hour format"));
 
     @Override
@@ -32 +35 @@
         downloadMode.setSelected(Main.pref
                 .getBoolean("mapillary.download-manually"));
+        displayHour.setSelected(Main.pref.getBoolean("mapillary.display-hour", true));
+        format24.setSelected(Main.pref.getBoolean("mapillary.format-24"));
 
         panel.setLayout(new FlowLayout(FlowLayout.LEFT));
         panel.add(reverseButtons);
         panel.add(downloadMode);
+        panel.add(displayHour);
+        panel.add(format24);
         gui.getDisplayPreference().addSubTab(this, "Mapillary", panel);
     }
@@ -44 +51 @@
         Main.pref.put("mapillary.reverse-buttons", reverseButtons.isSelected());
         Main.pref.put("mapillary.download-manually", downloadMode.isSelected());
+        Main.pref.put("mapillary.display-hour", displayHour.isSelected());
+        Main.pref.put("mapillary.format-24", format24.isSelected());
         return mod;
     }