Changeset 25910 in osm for applications/editors/josm

Timestamp:

2011-04-27T18:01:10+02:00 (14 years ago)

Author:

kachkaev

Message:

JOSM ImproveWayAccuracy plugin: Minor improvements (dashed line style for node moving preview; blocking preview after a node was moved/added until mouse move; link to Russian wiki page in MANIFEST).

Location:

applications/editors/josm/plugins/ImproveWayAccuracy

Files:

• build.xml (modified) (1 diff)
• src/org/openstreetmap/josm/plugins/iwa/IWAMode.java (modified) (6 diffs)

applications/editors/josm/plugins/ImproveWayAccuracy/build.xml

@@ -103 +103 @@
                                 <attribute name="Plugin-Class" value="org.openstreetmap.josm.plugins.iwa.IWAPlugin" />
                                 <attribute name="Plugin-Date" value="${version.entry.commit.date}" />
+                                <attribute name="Plugin-Icon" value="images/favicon.png" />
                                 <attribute name="Plugin-Description" value="Can be useful when you are improving accuracy of existing ways. The idea of the plugin is to substitute dragging and dropping nodes with clicking to quicken the editing process." />
-                                <attribute name="Plugin-Icon" value="images/favicon.png" />
                                 <attribute name="Plugin-Link" value="http://wiki.openstreetmap.org/wiki/JOSM/Plugins/ImproveWayAccuracy" />
+                <attribute name="ru_Plugin-Link" value="http://wiki.openstreetmap.org/wiki/RU:JOSM/Plugins/ImproveWayAccuracy" />
                                 <attribute name="Plugin-Mainversion" value="${plugin.main.version}" />
                                 <attribute name="Plugin-Version" value="${version.entry.commit.revision}" />

applications/editors/josm/plugins/ImproveWayAccuracy/src/org/openstreetmap/josm/plugins/iwa/IWAMode.java

@@ -89 +89 @@
 
     private final Color guideColor;
+    private final BasicStroke selectTargetWayStroke;
+    private final BasicStroke moveNodeStroke;
+    private final BasicStroke addNodeStroke;
 
     private boolean selectionChangedBlocked = false;
@@ -111 +114 @@
 
         guideColor = PaintColors.HIGHLIGHT.get();
+        selectTargetWayStroke = new BasicStroke(2, BasicStroke.CAP_ROUND,
+                BasicStroke.JOIN_ROUND);
+        float dash1[] = { 4.0f };
+        moveNodeStroke = new BasicStroke(1.0f, BasicStroke.CAP_BUTT,
+                BasicStroke.JOIN_MITER, 10.0f, dash1, 0.0f);
+        addNodeStroke = new BasicStroke(1, BasicStroke.CAP_BUTT,
+                BasicStroke.JOIN_MITER);
     }
 
@@ -216 +226 @@
             // Non-native highlighting is used, because sometimes highlighted
             // segments are covered with others, which is bad.
-            g.setStroke(new BasicStroke(2, BasicStroke.CAP_ROUND,
-                    BasicStroke.JOIN_ROUND));
+            g.setStroke(selectTargetWayStroke);
 
             List<Node> nodes = targetWay.getNodes();
@@ -239 +248 @@
             // that is going to be moved.
             // Non-native highlighting is used here as well.
-            g.setStroke(new BasicStroke(1, BasicStroke.CAP_ROUND,
-                    BasicStroke.JOIN_ROUND));
 
             // Finding endpoints
             Point p1 = null, p2 = null;
             if (candidateSegment != null) {
+                g.setStroke(addNodeStroke);
                 p1 = mv.getPoint(candidateSegment.getFirstNode());
                 p2 = mv.getPoint(candidateSegment.getSecondNode());
             } else if (candidateNode != null) {
+                g.setStroke(moveNodeStroke);
                 List<Pair<Node, Node>> wpps = targetWay.getNodePairs(false);
                 for (Pair<Node, Node> wpp : wpps) {
@@ -262 +271 @@
             GeneralPath b = new GeneralPath();
             if (p1 != null) {
-                b.moveTo(p1.x, p1.y);
-                b.lineTo(mousePos.x, mousePos.y);
-            } else {
                 b.moveTo(mousePos.x, mousePos.y);
-            }
-            if (p2 != null)
+                b.lineTo(p1.x, p1.y);
+            }
+            if (p2 != null) {
+                b.moveTo(mousePos.x, mousePos.y);
                 b.lineTo(p2.x, p2.y);
+            }
             g.draw(b);
 
@@ -415 +424 @@
         }
 
+        mousePos = null;
         updateCursor();
         updateStatusLine();