Changeset 31280 in osm

Timestamp:

2015-06-18T19:28:21+02:00 (9 years ago)

Author:

nokutu

Message:

Solved graphic bug with toggledialogs and another one with HistoryRecord

Location:

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

Files:

• MapillaryLayer.java (modified) (3 diffs)
• MapillaryPlugin.java (modified) (2 diffs)
• commands/MapillaryRecord.java (modified) (2 diffs)

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

@@ -7 +7 @@
 import org.openstreetmap.josm.plugins.mapillary.cache.MapillaryCache;
 import org.openstreetmap.josm.plugins.mapillary.downloads.MapillaryDownloader;
-import org.openstreetmap.josm.plugins.mapillary.gui.MapillaryHistoryDialog;
 import org.openstreetmap.josm.plugins.mapillary.gui.MapillaryToggleDialog;
 import org.openstreetmap.josm.Main;
@@ -67 +66 @@
     public List<Bounds> bounds;
 
-    private MapillaryToggleDialog mtd;
-    private MapillaryHistoryDialog mhd;
 
     private MouseAdapter mouseAdapter;
@@ -101 +98 @@
             MapView.addLayerChangeListener(this);
             Main.map.mapView.getEditLayer().data.addDataSetListener(this);
-            if (mtd == null) {
-                if (MapillaryToggleDialog.INSTANCE == null) {
-                    mtd = MapillaryToggleDialog.getInstance();
-                    Main.map.addToggleDialog(mtd, false);
-                } else
-                    mtd = MapillaryToggleDialog.getInstance();
-            }
-            if (mhd == null) {
-                if (MapillaryHistoryDialog.INSTANCE == null) {
-                    mhd = MapillaryHistoryDialog.getInstance();
-                    Main.map.addToggleDialog(mhd, false);
-                } else
-                    mhd = MapillaryHistoryDialog.getInstance();
-            }
         }
         MapillaryPlugin.setMenuEnabled(MapillaryPlugin.EXPORT_MENU, true);

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

@@ -18 +18 @@
 import org.openstreetmap.josm.plugins.Plugin;
 import org.openstreetmap.josm.plugins.PluginInformation;
+import org.openstreetmap.josm.plugins.mapillary.gui.MapillaryHistoryDialog;
 import org.openstreetmap.josm.plugins.mapillary.gui.MapillaryPreferenceSetting;
 import org.openstreetmap.josm.plugins.mapillary.gui.MapillaryToggleDialog;
@@ -104 +105 @@
     public void mapFrameInitialized(MapFrame oldFrame, MapFrame newFrame) {
         if (oldFrame == null && newFrame != null) { // map frame added
+            Main.map.addToggleDialog(MapillaryToggleDialog.getInstance(), false);
+            Main.map.addToggleDialog(MapillaryHistoryDialog.getInstance(), false);
         }
         if (oldFrame != null && newFrame == null) { // map frame destroyed

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

@@ -2 +2 @@
 
 import java.util.ArrayList;
+
+import org.openstreetmap.josm.plugins.mapillary.MapillaryAbstractImage;
 
 /**
@@ -45 +47 @@
     public void addCommand(MapillaryCommand command) {
         // Checks if it is a continuation of last command
-        if (position != -1
-                && commandList.get(position).images.equals(command.images)
-                && commandList.get(position).getClass() == command.getClass()) {
-            commandList.get(position).sum(command);
-            fireRecordChanged();
-            return;
+        if (position != -1) {
+            boolean equalSets = true;
+            for (MapillaryAbstractImage img : commandList.get(position).images)
+                if (!command.images.contains(img))
+                    equalSets = false;
+            if (equalSets
+                    && commandList.get(position).getClass() == command
+                            .getClass()) {
+                commandList.get(position).sum(command);
+                fireRecordChanged();
+                return;
+            }
         }
+        // Adds the command to the las position of the list.
         commandList.add(position + 1, command);
         position++;