Changeset 145 in josm

Timestamp:

2006-10-01T22:45:50+02:00 (18 years ago)

Author:

imi

Message:

• fixed bug that incomplete ways get selected when selecting nothing as rectangle
• geotagged image popup is now non-modal
• fixed mappaint plugin to unregister itself when deleting a layer

Location:

src/org/openstreetmap/josm

Files:

• Main.java (modified) (2 diffs)
• gui/SelectionManager.java (modified) (2 diffs)
• gui/layer/GeoImageLayer.java (modified) (3 diffs)
• io/GpxWriter.java (modified) (1 diff)
• plugins/Plugin.java (modified) (1 diff)
• plugins/mappaint/MapPaintPlugin.java (modified) (1 diff)

src/org/openstreetmap/josm/Main.java

@@ -99 +99 @@
          */
         public final void setMapFrame(final MapFrame map) {
+                MapFrame old = Main.map;
                 Main.map = map;
                 panel.setVisible(false);
@@ -126 +127 @@
 
                 for (Plugin plugin : plugins)
-                        plugin.mapFrameInitialized(map);
+                        plugin.mapFrameInitialized(old, map);
         }
 

src/org/openstreetmap/josm/gui/SelectionManager.java

@@ -311 +311 @@
                                 if (w.deleted)
                                         continue;
-                                boolean wholeWaySelected = !w.segments.isEmpty();
+                                boolean someSelectableSegment = false;
+                                boolean wholeWaySelected = true;
                                 for (Segment s : w.segments) {
                                         if (s.incomplete)
                                                 continue;
+                                        someSelectableSegment = true;
                                         if (!rectangleContainSegment(r, alt, s)) {
                                                 wholeWaySelected = false;
@@ -320 +322 @@
                                         }
                                 }
-                                if (wholeWaySelected)
+                                if (someSelectableSegment && wholeWaySelected)
                                         selection.add(w);
                         }

src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java

@@ -32 +32 @@
 import javax.swing.Icon;
 import javax.swing.ImageIcon;
+import javax.swing.JDialog;
 import javax.swing.JFileChooser;
 import javax.swing.JLabel;
@@ -235 +236 @@
                 final JPanel p = new JPanel(new BorderLayout());
                 final JScrollPane scroll = new JScrollPane(new JLabel(loadScaledImage(e.image, 580)));
-                //scroll.setPreferredSize(new Dimension(800,600));
                 final JViewport vp = scroll.getViewport();
                 p.add(scroll, BorderLayout.CENTER);
@@ -254 +254 @@
                 });
                 scale.setSelected(true);
-                JOptionPane.showMessageDialog(Main.parent, p, e.image+" ("+e.coor.lat()+","+e.coor.lon()+")", JOptionPane.PLAIN_MESSAGE);
+                JOptionPane pane = new JOptionPane(p, JOptionPane.PLAIN_MESSAGE);
+                JDialog dlg = pane.createDialog(Main.parent, e.image+" ("+e.coor.lat()+","+e.coor.lon()+")");
+                dlg.setModal(false);
+                dlg.setVisible(true);
         }
 

src/org/openstreetmap/josm/io/GpxWriter.java

@@ -92 +92 @@
                         GpxWriter writer = new GpxWriter(out);
                         // calculate bounds
-                        Bounds b = new Bounds(new LatLon(Double.MAX_VALUE, Double.MAX_VALUE), new LatLon(Double.MIN_VALUE, Double.MIN_VALUE));
+                        Bounds b = new Bounds(new LatLon(Double.MAX_VALUE, Double.MAX_VALUE), new LatLon(-Double.MAX_VALUE, -Double.MAX_VALUE));
                         for (Node n : data.nodes)
                                 if (!n.deleted)

src/org/openstreetmap/josm/plugins/Plugin.java

@@ -29 +29 @@
          * Called after Main.mapFrame is initalized. (After the first data is loaded).
          */
-        public void mapFrameInitialized(MapFrame mapFrame) {}
+        public void mapFrameInitialized(MapFrame oldFrame, MapFrame newFrame) {}
 }

src/org/openstreetmap/josm/plugins/mappaint/MapPaintPlugin.java

@@ -41 +41 @@
         }
 
-        @Override public void mapFrameInitialized(MapFrame mapFrame) {
-                mapFrame.mapView.addLayerChangeListener(this);
+        @Override public void mapFrameInitialized(MapFrame oldFrame, MapFrame newFrame) {
+                if (newFrame != null)
+                        newFrame.mapView.addLayerChangeListener(this);
+                else
+                        oldFrame.mapView.removeLayerChangeListener(this);
         }