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

Timestamp:

2015-08-12T12:39:16+02:00 (9 years ago)

Author:

nokutu

Message:

Added command used to delete images, so it can be undone.

Location:

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

Files:

• MapillaryData.java (modified) (3 diffs)
• MapillaryLayer.java (modified) (6 diffs)
• commands/CommandDeleteImage.java (added)
• commands/CommandMoveImage.java (modified) (2 diffs)
• commands/CommandTurnImage.java (modified) (2 diffs)
• commands/MapillaryCommand.java (modified) (4 diffs)
• commands/MapillaryExecutableCommand.java (added)
• commands/MapillaryRecord.java (modified) (1 diff)

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

@@ -20 +20 @@
 public class MapillaryData {
 
-  private final List<MapillaryAbstractImage> images;
+  private List<MapillaryAbstractImage> images;
   private MapillaryAbstractImage selectedImage;
   /** The image under the cursor */
@@ -64 +64 @@
   public synchronized void add(MapillaryAbstractImage image) {
     add(image, true);
+  }
+
+  /**
+   * Removes an image from the database.
+   *
+   * @param image
+   */
+  public synchronized void delete(MapillaryAbstractImage image) {
+    if (MapillaryMainDialog.getInstance().getImage() != null) {
+      MapillaryMainDialog.getInstance().setImage(null);
+      MapillaryMainDialog.getInstance().updateImage();
+    }
+    setSelectedImage(null);
+    this.images.remove(image);
+    if (image.getSequence() != null)
+      image.getSequence().remove(image);
+    if (Main.main != null)
+      dataUpdated();
+  }
+
+  /**
+   * Removes a set of images from the database.
+   *
+   * @param images
+   */
+  public synchronized void delete(List<MapillaryAbstractImage> images) {
+    for (MapillaryAbstractImage img : images)
+      delete(img);
   }
 
@@ -359 +387 @@
 
   /**
+   * Sets a new ArrayList object as the used set of images.
+   *
+   * @param images
+   */
+  public synchronized void setImages(List<MapillaryAbstractImage> images) {
+    this.images = new ArrayList<>(images);
+  }
+
+  /**
    * Returns the amount of images contained by this object.
    *

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

@@ -5 +5 @@
 
 import org.openstreetmap.josm.plugins.mapillary.cache.CacheUtils;
+import org.openstreetmap.josm.plugins.mapillary.commands.CommandDeleteImage;
+import org.openstreetmap.josm.plugins.mapillary.commands.MapillaryRecord;
 import org.openstreetmap.josm.plugins.mapillary.downloads.MapillaryDownloader;
 import org.openstreetmap.josm.plugins.mapillary.gui.MapillaryFilterDialog;
@@ -44 +46 @@
 import java.awt.Rectangle;
 import java.awt.TexturePaint;
+import java.awt.event.ActionEvent;
 import java.awt.geom.AffineTransform;
 import java.awt.geom.Area;
@@ -49 +52 @@
 import java.awt.image.BufferedImage;
 
+import javax.swing.AbstractAction;
 import javax.swing.ImageIcon;
 import javax.swing.Action;
 import javax.swing.Icon;
+import javax.swing.JComponent;
+import javax.swing.KeyStroke;
 
 import java.util.List;
@@ -126 +132 @@
     }
     createHatchTexture();
+
+    MapillaryMainDialog.getInstance()
+        .getInputMap(JComponent.WHEN_IN_FOCUSED_WINDOW)
+        .put(KeyStroke.getKeyStroke("DELETE"), "MapillaryDel");
+    MapillaryMainDialog.getInstance().getActionMap()
+        .put("MapillaryDel", new DeleteImageAction());
+
     if (Main.main != null)
       MapillaryData.dataUpdated();
@@ -176 +189 @@
   public void destroy() {
     setMode(null);
+
     AbstractMode.resetThread();
     MapillaryDownloader.stopAll();
@@ -593 +607 @@
     // Nothing
   }
+
+  /**
+   * Action used to delete images.
+   *
+   * @author nokutu
+   *
+   */
+  private class DeleteImageAction extends AbstractAction {
+
+    private static final long serialVersionUID = -982809854631863962L;
+
+    @Override
+    public void actionPerformed(ActionEvent e) {
+      if (INSTANCE != null) {
+        MapillaryRecord.getInstance().addCommand(
+            new CommandDeleteImage(getData().getMultiSelectedImages()));
+      }
+    }
+  }
 }

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

@@ -3 +3 @@
 import static org.openstreetmap.josm.tools.I18n.trn;
 
-import java.util.ArrayList;
 import java.util.List;
 
@@ -31 +30 @@
   public CommandMoveImage(List<MapillaryAbstractImage> images, double x,
       double y) {
-    this.images = new ArrayList<MapillaryAbstractImage>(images);
+    super(images);
     this.x = x;
     this.y = y;

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

@@ -3 +3 @@
 import static org.openstreetmap.josm.tools.I18n.trn;
 
-import java.util.ArrayList;
 import java.util.List;
 
@@ -27 +26 @@
    */
   public CommandTurnImage(List<MapillaryAbstractImage> images, double ca) {
-    this.images = new ArrayList<MapillaryAbstractImage>(images);
+    super(images);
     this.ca = ca;
   }

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

@@ -1 +1 @@
 package org.openstreetmap.josm.plugins.mapillary.commands;
 
+import java.util.ArrayList;
 import java.util.List;
 
@@ -13 +14 @@
 public abstract class MapillaryCommand {
   protected List<MapillaryAbstractImage> images;
+
+  /**
+   * Main constructor.
+   *
+   * @param images
+   *          The images that are affected by the command.
+   */
+  public MapillaryCommand(List<MapillaryAbstractImage> images) {
+    this.images = new ArrayList<MapillaryAbstractImage>(images);
+  }
 
   /**
@@ -28 +39 @@
    * they are summed in order to reduce them to just one command.
    *
-   * @param command The command to be summed to last command.
+   * @param command
+   *          The command to be summed to last command.
    */
   public abstract void sum(MapillaryCommand command);
@@ -39 +51 @@
       image.isModified = (image.tempLatLon == image.latLon || image.tempCa == image.ca);
   }
+
+  @Override
+  public abstract String toString();
 }

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

@@ -69 +69 @@
    */
   public void addCommand(MapillaryCommand command) {
+    if (command instanceof MapillaryExecutableCommand)
+      ((MapillaryExecutableCommand) command).execute();
     // Checks if it is a continuation of last command
     if (this.position != -1) {