Changeset 31331 in osm for applications/editors/josm/plugins

Timestamp:

2015-07-02T13:57:34+02:00 (9 years ago)

Author:

nokutu

Message:

Improved exportation and code cleaned

Location:

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

Files:

• MapillaryAbstractImage.java (modified) (8 diffs)
• MapillaryData.java (modified) (4 diffs)
• MapillaryLayer.java (modified) (7 diffs)
• actions/MapillaryDownloadAction.java (modified) (1 diff)
• actions/MapillaryDownloadViewAction.java (modified) (3 diffs)
• actions/MapillaryExportAction.java (modified) (1 diff)
• commands/CommandTurnImage.java (modified) (1 diff)
• commands/MapillaryRecord.java (modified) (1 diff)
• downloads/MapillaryDownloader.java (modified) (2 diffs)
• downloads/MapillaryExportDownloadThread.java (modified) (2 diffs)
• downloads/MapillaryExportManager.java (modified) (5 diffs)
• downloads/MapillaryExportWriterThread.java (modified) (2 diffs)
• downloads/MapillaryImageInfoDownloaderThread.java (modified) (1 diff)
• downloads/MapillarySequenceDownloadThread.java (modified) (1 diff)
• downloads/MapillarySignDownloaderThread.java (modified) (1 diff)
• downloads/MapillarySquareDownloadManagerThread.java (modified) (1 diff)
• gui/MapillaryExportDialog.java (modified) (5 diffs)
• gui/MapillaryHistoryDialog.java (modified) (1 diff)
• gui/MapillaryImageDisplay.java (modified) (1 diff)

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

@@ -20 +20 @@
  */
 public abstract class MapillaryAbstractImage {
-    
+
     public static Lock lock = new ReentrantLock();
 
@@ -30 +30 @@
     public final double ca;
     public boolean isModified = false;
-    /** Temporal position of the picture until it is uplaoded */
+    /** Temporal position of the picture until it is uploaded */
     public LatLon tempLatLon;
     /**
@@ -37 +37 @@
      */
     public LatLon movingLatLon;
-    /** Temporal direction of the picture until it is uplaoded */
+    /** Temporal direction of the picture until it is uploaded */
     public double tempCa;
     /**
@@ -75 +75 @@
     }
 
+    /**
+     * Returns whether the image is visible on the map or not.
+     * 
+     * @return
+     */
     public boolean isVisible() {
         return visible;
@@ -84 +89 @@
 
     /**
-     * Returns the last fixed coorditanes of the object.
+     * Returns the last fixed coordinates of the object.
      * 
      * @return
@@ -95 +100 @@
      * Moves the image temporally to another position
      * 
-     * @param pos
+     * @param x
+     * @param y
      */
     public void move(double x, double y) {
@@ -182 +188 @@
     }
 
+    /**
+     * Parses a string with a given format and returns the Epoch time.
+     * 
+     * @param date
+     * @param format
+     * @return
+     */
     public long getEpoch(String date, String format) {
 
@@ -194 +207 @@
     }
 
+    /**
+     * Returns current time in Epoch format
+     * 
+     * @return
+     */
     private long currentTime() {
         Calendar cal = Calendar.getInstance();

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

@@ -25 +25 @@
     private final List<MapillaryAbstractImage> images;
     private MapillaryAbstractImage selectedImage;
-    private MapillaryAbstractImage hoveredImage;
+    /** The image under the cursor */
+    private MapillaryAbstractImage highlightedImage;
     private final List<MapillaryAbstractImage> multiSelectedImages;
 
@@ -97 +98 @@
      */
     public void setHoveredImage(MapillaryAbstractImage image) {
-        hoveredImage = image;
+        highlightedImage = image;
     }
 
@@ -106 +107 @@
      */
     public MapillaryAbstractImage getHoveredImage() {
-        return hoveredImage;
+        return highlightedImage;
     }
 
@@ -237 +238 @@
             if (image instanceof MapillaryImage) {
                 MapillaryImage mapillaryImage = (MapillaryImage) image;
+                // Donwloadins thumbnails of surrounding pictures.
                 if (mapillaryImage.next() != null) {
                     new MapillaryCache(mapillaryImage.next().getKey(),

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

@@ -64 +64 @@
             "mapillary.sequence-max-jump-distance", 100);
 
+    private boolean TEMP_MANUAL = false;
+
     public static MapillaryLayer INSTANCE;
     public static CacheAccess<String, BufferedImageCacheEntry> CACHE;
@@ -82 +84 @@
     private volatile TexturePaint hatched;
 
-    public MapillaryLayer() {
+    private MapillaryLayer() {
         super(tr("Mapillary Images"));
         bounds = new ArrayList<>();
@@ -92 +94 @@
      */
     private void init() {
-        MapillaryLayer.INSTANCE = this;
-        startMouseAdapter();
+        mouseAdapter = new MapillaryMouseAdapter();
         try {
             CACHE = JCSCacheManager.getCache("Mapillary");
@@ -115 +116 @@
     }
 
-    private void startMouseAdapter() {
-        mouseAdapter = new MapillaryMouseAdapter();
-    }
-
     public synchronized static MapillaryLayer getInstance() {
         if (MapillaryLayer.INSTANCE == null)
@@ -130 +127 @@
      */
     public void download() {
-        checkBigAreas();
-        if (Main.pref.getBoolean("mapillary.download-manually"))
+        checkAreaTooBig();
+        if (Main.pref.getBoolean("mapillary.download-manually") || TEMP_MANUAL)
             return;
         for (Bounds bounds : Main.map.mapView.getEditLayer().data
@@ -149 +146 @@
      * shown and you will have to download areas manually.
      */
-    private void checkBigAreas() {
+    private void checkAreaTooBig() {
         double area = 0;
         for (Bounds bounds : Main.map.mapView.getEditLayer().data
@@ -156 +153 @@
         }
         if (area > MapillaryDownloadViewAction.MAX_AREA) {
-            Main.pref.put("mapillary.download-manually", true);
+            TEMP_MANUAL = true;
+            MapillaryPlugin.setMenuEnabled(MapillaryPlugin.DOWNLOAD_VIEW_MENU,
+                    true);
             JOptionPane
                     .showMessageDialog(
                             Main.parent,
-                            tr("The downloaded OSM area is too big. Download mode has been change to manual. You can change this back to automatic in preferences settings."));
+                            tr("The downloaded OSM area is too big. Download mode has been changed to manual until the layer is restarted."));
         }
     }

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

@@ -16 +16 @@
 
 /**
- * Action that triggers the plugin.
+ * Action that triggers the plugin. If in automatic mode, it will automatically
+ * download the images in the areas where there is OSM data.
  * 
  * @author nokutu

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

@@ -15 +15 @@
 import org.openstreetmap.josm.tools.Shortcut;
 
+/**
+ * If in manual mode, downloads all the images in the current view.
+ * 
+ * @author nokutu
+ *
+ */
 public class MapillaryDownloadViewAction extends JosmAction {
 
@@ -33 +39 @@
     @Override
     public void actionPerformed(ActionEvent arg0) {
-        MapillaryLayer.getInstance();
         MapillaryLayer.getInstance().bounds.add(Main.map.mapView
                 .getRealBounds());
@@ -41 +46 @@
         } else {
             JOptionPane.showMessageDialog(Main.parent,
-                    tr("This area too big to be downloaded"));
+                    tr("This area is too big to be downloaded"));
         }
     }

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

@@ -25 +25 @@
 
 /**
- * Action that launches a MapillaryExportDialog.
+ * Action that launches a MapillaryExportDialog and lets you export the images.
  * 
  * @author nokutu

applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/commands/CommandTurnImage.java

@@ -10 +10 @@
 
 /**
- * Command created when a image's direction is changed.
+ * Command created when an image's direction is changed.
  * 
  * @author nokutu

applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/commands/MapillaryRecord.java

@@ -6 +6 @@
 
 /**
- * History record system in order to let you undo commands
+ * History record system in order to let the user undo and redo commands
  * 
  * @author nokutu

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

@@ -11 +11 @@
 
 /**
- * Class that concentrates all the ways of downloading of the plugin.
+ * Class that concentrates all the ways of downloading of the plugin. All the
+ * download petitions will be managed one by one.
  * 
  * @author nokutu
@@ -62 +63 @@
     }
 
+    /**
+     * Gets the images within the given bounds.
+     * 
+     * @param bounds
+     */
     public void getImages(Bounds bounds) {
         getImages(bounds.getMin(), bounds.getMax());

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

@@ -19 +19 @@
 /**
  * This is the thread that downloads one of the images that are going to be
- * exported and writes them in a {@link ArrayBlockQueue}.
+ * exported and writes them in a {@link ArrayBlockingQueue}.
  * 
  * @author nokutu
  * @see MapillaryExportManager
  */
-public class MapillaryExportDownloadThread implements Runnable,
+public class MapillaryExportDownloadThread extends Thread implements
         ICachedLoaderListener {
 
@@ -48 +48 @@
         new MapillaryCache(image.getKey(), MapillaryCache.Type.FULL_IMAGE)
                 .submit(this, false);
-
     }
 

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

@@ -21 +21 @@
 /**
  * Export main thread. Exportation works by creating a
- * {@link MapillaryWriterThread} and several
+ * {@link MapillaryExportWriterThread} and several
  * {@link MapillaryExportDownloadThread}. The second ones download every single
  * image that is going to be exported and stores them in an
@@ -38 +38 @@
     List<MapillaryAbstractImage> images;
     String path;
+    
+    private Thread writer;
+    private ThreadPoolExecutor ex;
 
     public MapillaryExportManager(List<MapillaryAbstractImage> images,
@@ -72 +75 @@
     @Override
     protected void cancel() {
-        // TODO Auto-generated method stub
+        writer.interrupt();
+        ex.shutdown();
     }
 
@@ -79 +83 @@
             OsmTransferException {
         // Starts a writer thread in order to write the pictures on the disk.
-        Thread writer = new Thread(new MapillaryExportWriterThread(path, queue,
-                queueImages, amount, this.getProgressMonitor()));
+        writer = new MapillaryExportWriterThread(path, queue,
+                queueImages, amount, this.getProgressMonitor());
         writer.start();
         if (path == null) {
@@ -90 +94 @@
             return;
         }
-        ThreadPoolExecutor ex = new ThreadPoolExecutor(20, 35, 25,
+        ex = new ThreadPoolExecutor(20, 35, 25,
                 TimeUnit.SECONDS, new ArrayBlockingQueue<Runnable>(10));
         for (MapillaryAbstractImage image : images) {

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

@@ -32 +32 @@
  * @see MapillaryExportManager
  */
-public class MapillaryExportWriterThread implements Runnable {
+public class MapillaryExportWriterThread extends Thread {
 
     private final String path;
@@ -103 +103 @@
                 os.close();
             } catch (InterruptedException e) {
-                Main.error(e);
+                Main.info("Mapillary export cancelled");
+                return;
             } catch (IOException e) {
                 Main.error(e);

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

@@ -22 +22 @@
  * 
  * @author nokutu
- * @see MapillarySqueareDownloadManagerThread
+ * @see MapillarySquareDownloadManagerThread
  */
-public class MapillaryImageInfoDownloaderThread implements Runnable {
+public class MapillaryImageInfoDownloaderThread extends Thread {
     private final String url;
     private final ExecutorService ex;

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

@@ -27 +27 @@
  * 
  * @author nokutu
- * @see MapillarySquareDownloadManagarThread
+ * @see MapillarySquareDownloadManagerThread
  */
-public class MapillarySequenceDownloadThread implements Runnable {
+public class MapillarySequenceDownloadThread extends Thread {
 
     private final String url;

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

@@ -17 +17 @@
 import org.openstreetmap.josm.plugins.mapillary.MapillaryLayer;
 
-public class MapillarySignDownloaderThread implements Runnable {
+public class MapillarySignDownloaderThread extends Thread {
 
     private final String url;

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

@@ -21 +21 @@
  * @see MapillaryDownloader
  */
-public class MapillarySquareDownloadManagerThread implements Runnable {
+public class MapillarySquareDownloadManagerThread extends Thread {
 
     private final String urlImages;

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

@@ -7 +7 @@
 import java.awt.event.ActionListener;
 
+import javax.swing.AbstractAction;
 import javax.swing.BoxLayout;
 import javax.swing.ButtonGroup;
@@ -16 +17 @@
 import javax.swing.JRadioButton;
 
+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;
 
 /**
@@ -49 +52 @@
     public MapillaryExportDialog() {
         setLayout(new BoxLayout(this, BoxLayout.PAGE_AXIS));
-
+        
+        RewriteButtonAction action = new RewriteButtonAction(this);
         group = new ButtonGroup();
-        all = new JRadioButton(tr("Export all images"));
-        sequence = new JRadioButton(tr("Export selected sequence"));
-        selected = new JRadioButton(tr("Export selected images"));
-        rewrite = new JRadioButton(tr("Rewrite imported images"));
+        all = new JRadioButton(action);
+        all.setText(tr("Export all images"));
+        sequence = new JRadioButton(action);
+        sequence.setText(tr("Export selected sequence"));
+        selected = new JRadioButton(action);
+        selected.setText(tr("Export selected images"));
+        rewrite = new JRadioButton(action);
+        rewrite.setText(tr("Rewrite imported images"));
         group.add(all);
         group.add(sequence);
@@ -68 +76 @@
             selected.setEnabled(false);
         }
+        rewrite.setEnabled(false);
+        for (MapillaryAbstractImage img : MapillaryData.getInstance().getImages())
+            if (img instanceof MapillaryImportedImage)
+                rewrite.setEnabled(true);
+        
         path = new JLabel(tr("Select a folder"));
         choose = new JButton(tr("Explore"));
@@ -105 +118 @@
         }
     }
+    
+    public class RewriteButtonAction extends AbstractAction {
+
+        private String lastPath;
+        private MapillaryExportDialog dlg;
+        
+        public RewriteButtonAction(MapillaryExportDialog dlg) {
+            this.dlg = dlg;
+        }
+        
+        @Override
+        public void actionPerformed(ActionEvent arg0) {
+           choose.setEnabled(!rewrite.isSelected());
+           if (rewrite.isSelected()) {
+               lastPath = dlg.path.getText();
+               dlg.path.setText(" ");
+           } 
+           else if (lastPath != null){
+               dlg.path.setText(lastPath);
+           }
+           
+        }
+        
+    }
 }

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

@@ -30 +30 @@
 import javax.swing.tree.DefaultMutableTreeNode;
 
+/**
+ * Toggle dialog that shows you the latest commands done and allows the user to
+ * revert them.
+ * 
+ * @see MapillaryRecord
+ * @author nokutu
+ *
+ */
 public class MapillaryHistoryDialog extends ToggleDialog implements
         MapillaryRecordListener {

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

@@ -28 +28 @@
  * 
  * @author Jorge
- * @see ImageDisplay
+ * @see MapillaryImageDisplay
  * @see MapillaryToggleDialog
  */