Changeset 4244 in josm

Timestamp:

Jul 14, 2011 7:29:57 PM (2 years ago)

Author:

stoecker

Message:

zoom to layer also when loading NMEA files

Location:

trunk

Files:

• images_nodist/layer (added)
• images_nodist/layer/rawgps_small.png (moved) (moved from trunk/images/layer/rawgps_small.png)
• src/org/openstreetmap/josm/gui/MapView.java (modified) (2 diffs)
• src/org/openstreetmap/josm/io/NMEAImporter.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/gui/MapView.java

@@ -212 +212 @@
                 scaler.setLocation(10,30);
 
+                new MapMover(MapView.this, contentPane);
                 OsmDataLayer layer = getEditLayer();
                 if (layer != null) {
@@ -221 +222 @@
                     AutoScaleAction.autoScale("layer");
                 }
-
-                new MapMover(MapView.this, contentPane);
             }
         });

trunk/src/org/openstreetmap/josm/io/NMEAImporter.java

@@ -9 +9 @@
 
 import javax.swing.JOptionPane;
+import javax.swing.SwingUtilities;
 
 import org.openstreetmap.josm.Main;
@@ -26 +27 @@
 
     @Override public void importData(File file, ProgressMonitor progressMonitor) throws IOException {
-        String fn = file.getName();
-        NmeaReader r = new NmeaReader(new FileInputStream(file), file.getAbsoluteFile().getParentFile());
+        final String fn = file.getName();
+        final NmeaReader r = new NmeaReader(new FileInputStream(file), file.getAbsoluteFile().getParentFile());
         if (r.getNumberOfCoordinates() > 0) {
             r.data.storageFile = file;
-            GpxLayer gpxLayer = new GpxLayer(r.data, fn, true);
-            Main.main.addLayer(gpxLayer);
-            if (Main.pref.getBoolean("marker.makeautomarkers", true)) {
-                MarkerLayer ml = new MarkerLayer(r.data, tr("Markers from {0}", fn), file, gpxLayer);
-                if (ml.data.size() > 0) {
-                    Main.main.addLayer(ml);
+            final GpxLayer gpxLayer = new GpxLayer(r.data, fn, true);
+            final File fileFinal = file;
+
+            Runnable uiStuff = new Runnable() {
+                public void run() {
+                    Main.main.addLayer(gpxLayer);
+                    if (Main.pref.getBoolean("marker.makeautomarkers", true)) {
+                        MarkerLayer ml = new MarkerLayer(r.data, tr("Markers from {0}", fn), fileFinal, gpxLayer);
+                        if (ml.data.size() > 0) {
+                            Main.main.addLayer(ml);
+                        }
+                    }
                 }
+            };
+            if (SwingUtilities.isEventDispatchThread()) {
+                uiStuff.run();
+            } else {
+                SwingUtilities.invokeLater(uiStuff);
             }
         }