Changeset 21869 in osm for applications/editors/josm

Timestamp:

2010-06-21T19:57:58+02:00 (15 years ago)

Author:

upliner

Message:

buildings_tools: update cursor and fix NPE

Location:

applications/editors/josm

Files:

• dist/buildings_tools.jar (modified) ( previous)
• plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java (modified) (2 diffs)

applications/editors/josm/plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java

@@ -340 +340 @@
                 if (mousePos == null)
                         return;
+                if (!Main.isDisplayingMapView())
+                        return;
                 Node n = null;
                 if (!isCtrlDown)
@@ -412 +414 @@
                         return;
                 }
-                final int r = 11; // crosshair radius
+                final int R = 9; // crosshair outer radius
+                final int r = 3; // crosshair inner radius
                 BufferedImage img = new BufferedImage(32, 32, BufferedImage.TYPE_INT_ARGB);
                 Graphics2D g = img.createGraphics();
 
                 GeneralPath b = new GeneralPath();
-                b.moveTo(16 - Math.cos(angle) * r, 16 - Math.sin(angle) * r);
+                b.moveTo(16 - Math.cos(angle) * R, 16 - Math.sin(angle) * R);
+                b.lineTo(16 - Math.cos(angle) * r, 16 - Math.sin(angle) * r);
+                b.moveTo(16 + Math.cos(angle) * R, 16 + Math.sin(angle) * R);
                 b.lineTo(16 + Math.cos(angle) * r, 16 + Math.sin(angle) * r);
-                b.moveTo(16 + Math.sin(angle) * r, 16 - Math.cos(angle) * r);
+                b.moveTo(16 + Math.sin(angle) * R, 16 - Math.cos(angle) * R);
+                b.lineTo(16 + Math.sin(angle) * r, 16 - Math.cos(angle) * r);
+                b.moveTo(16 - Math.sin(angle) * R, 16 + Math.cos(angle) * R);
                 b.lineTo(16 - Math.sin(angle) * r, 16 + Math.cos(angle) * r);