Changeset 1409 in josm

Timestamp:

2009-02-15T18:30:41+01:00 (16 years ago)

Author:

stoecker

Message:

close #1902. Patch by xeen

Location:

trunk

Files:

• images/cursor/modifier/joinnode.png (added)
• images/cursor/modifier/joinway.png (added)
• src/org/openstreetmap/josm/actions/mapmode/DrawAction.java (modified) (22 diffs)
• src/org/openstreetmap/josm/data/osm/OsmPrimitive.java (modified) (1 diff)
• src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java (modified) (4 diffs)
• src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java (modified) (7 diffs)

trunk/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java

@@ -66 +66 @@
     private boolean alt;
     private boolean shift;
-    private boolean mouseOnExistingNode;
+    private Node mouseOnExistingNode;
+    private Set<Way> mouseOnExistingWays = new HashSet<Way>();
+    private Set<OsmPrimitive> oldHighlights = new HashSet<OsmPrimitive>();
     private boolean drawHelperLine;
     private boolean wayIsFinished = false;
+    private boolean drawTargetHighlight;
+    private boolean drawTargetCursor;
     private Point mousePos;
     private Color selectedColor;
@@ -93 +97 @@
     }
 
+    /**
+     * Sets a special cursor to indicate that the next click will automatically join into
+     * an existing node or way (if feature is enabled)
+     *
+     * @param way If true, the cursor will indicate it is joined into a way; node otherwise
+     */
+    private void setJoinCursor(boolean way) {
+        if(!drawTargetCursor) {
+            resetCursor();
+            return;
+        }
+        try {
+            Main.map.mapView.setCursor(
+                    ImageProvider.getCursor("crosshair", (way ? "joinway" : "joinnode"))
+            );
+            return;
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        resetCursor();
+    }
+
+    /**
+     * Resets the cursor to the default cursor for drawing mode (i.e. crosshair)
+     */
+    private void resetCursor() {
+        Main.map.mapView.setCursor(getCursor());
+    }
+
+    /**
+     * Takes the data from computeHelperLine to determine which ways/nodes should be highlighted
+     * (if feature enabled). Also sets the target cursor if appropriate.
+     */
+    private void addHighlighting() {
+        // if ctrl key is held ("no join"), don't highlight anything
+        if (ctrl) {
+            removeHighlighting();
+            resetCursor();
+            return;
+        }
+
+        if (mouseOnExistingNode != null) {
+            setJoinCursor(false);
+            // Clean old highlights
+            removeHighlighting();
+            if(drawTargetHighlight) {
+                oldHighlights.add(mouseOnExistingNode);
+                mouseOnExistingNode.highlighted = true;
+            }
+            return;
+        }
+
+        // Insert the node into all the nearby way segments
+        if(mouseOnExistingWays.size() == 0) {
+            removeHighlighting();
+            resetCursor();
+            return;
+        }
+
+        setJoinCursor(true);
+        // Clean old highlights
+        removeHighlighting();
+
+        if(!drawTargetHighlight) return;
+        oldHighlights.addAll(mouseOnExistingWays);
+        for(Way w : mouseOnExistingWays) {
+            w.highlighted = true;
+        }
+    }
+
+    /**
+     * Removes target highlighting from primitives
+     */
+    private void removeHighlighting() {
+        for(OsmPrimitive prim : oldHighlights) {
+            prim.highlighted = false;
+        }
+    }
+
     @Override public void enterMode() {
         super.enterMode();
         selectedColor = Main.pref.getColor(marktr("selected"), Color.red);
         drawHelperLine = Main.pref.getBoolean("draw.helper-line", true);
+        drawTargetHighlight = Main.pref.getBoolean("draw.target-highlight", true);
+        drawTargetCursor = Main.pref.getBoolean("draw.target-cursor", true);
         wayIsFinished = false;
-        
+
         Main.map.mapView.addMouseListener(this);
         Main.map.mapView.addMouseMotionListener(this);
         Main.map.mapView.addTemporaryLayer(this);
         DataSet.selListeners.add(this);
+
         try {
             Toolkit.getDefaultToolkit().addAWTEventListener(this, AWTEvent.KEY_EVENT_MASK);
@@ -110 +196 @@
         // computeHelperLine(false, false, false);
     }
+
     @Override public void exitMode() {
         super.exitMode();
@@ -116 +203 @@
         Main.map.mapView.removeTemporaryLayer(this);
         DataSet.selListeners.remove(this);
+        removeHighlighting();
         try {
             Toolkit.getDefaultToolkit().removeAWTEventListener(this);
@@ -147 +235 @@
         mouseClicked(e);
     }
-    
+
     /**
      * If user clicked with the left button, add a node at the current mouse
@@ -184 +272 @@
         if (!ctrl)
             n = Main.map.mapView.getNearestNode(mousePos);
-      
+
         if (n != null) {
             // user clicked on node
@@ -259 +347 @@
             Node selectedNode = null;
             Way selectedWay = null;
-            
+
             for (OsmPrimitive p : selection) {
                 if (p instanceof Node) {
@@ -277 +365 @@
                 }
             }
-            
+
             // No nodes or ways have been selected, try again with no selection
             // This occurs when a relation has been selected
@@ -292 +380 @@
                     n0 = lastUsedNode;
                 } else {
-                    // We have a way selected, but no suitable node to continue from. Start anew. 
+                    // We have a way selected, but no suitable node to continue from. Start anew.
                     tryAgain(e);
                     return;
@@ -326 +414 @@
                 }
             }
-            
+
             // User clicked last node again, finish way
             if(n0 == n) {
@@ -379 +467 @@
             Main.ds.setSelected(way);
         }
-      
+
         String title;
         if (!extendedWay) {
@@ -404 +492 @@
         if(!wayIsFinished) lastUsedNode = n;
         computeHelperLine();
+        removeHighlighting();
         Main.map.mapView.repaint();
     }
@@ -420 +509 @@
         mousePos = e.getPoint();
 
+        addHighlighting();
         computeHelperLine();
     }
@@ -444 +534 @@
         Way selectedWay = null;
         Node currentMouseNode = null;
-        mouseOnExistingNode = false;
+        mouseOnExistingNode = null;
+        mouseOnExistingWays = new HashSet<Way>();
 
         Main.map.statusLine.setAngle(-1);
@@ -452 +543 @@
         if (!ctrl && mousePos != null) {
             currentMouseNode = Main.map.mapView.getNearestNode(mousePos);
+        }
+
+        // We need this for highlighting and we'll only do so if we actually want to re-use
+        // *and* there is no node nearby (because nodes beat ways when re-using)
+        if(!ctrl && currentMouseNode == null) {
+            List<WaySegment> wss = Main.map.mapView.getNearestWaySegments(mousePos);
+            for(WaySegment ws : wss)
+                mouseOnExistingWays.add(ws.way);
         }
 
@@ -458 +557 @@
             if (selection.isEmpty()) return;
             currentMouseEastNorth = currentMouseNode.eastNorth;
-            mouseOnExistingNode = true;
+            mouseOnExistingNode = currentMouseNode;
         } else {
             // no node found in clicked area
@@ -511 +610 @@
         updateStatusLine();
 
-        if (!drawHelperLine || wayIsFinished) return;
-
+        if ((!drawHelperLine || wayIsFinished) && !drawTargetHighlight) return;
         Main.map.mapView.repaint();
     }
@@ -640 +738 @@
 
     public void paint(Graphics g, MapView mv) {
-
-        // don't draw line if disabled in prefs
-        if (!drawHelperLine) return;
+        if (!drawHelperLine && !drawTargetHighlight) return;
 
         // sanity checks
@@ -652 +748 @@
 
         // don't draw line if we don't know where from or where to
-        if (currentBaseNode == null) return;
-        if (currentMouseEastNorth == null) return;
+        if (currentBaseNode == null || currentMouseEastNorth == null) return;
 
         // don't draw line if mouse is outside window
@@ -677 +772 @@
         g2.draw(b);
         g2.setStroke(new BasicStroke(1));
-
     }
 
@@ -684 +778 @@
 
         if (currentBaseNode != null && !shift) {
-            if (mouseOnExistingNode) {
+            if (mouseOnExistingNode != null) {
                 if (alt && /* FIXME: way exists */true)
                     rv = tr("Click to create a new way to the existing node.");
@@ -704 +798 @@
         return rv.toString();
     }
-    
+
     @Override public boolean layerIsSupported(Layer l) {
         return l instanceof OsmDataLayer;

trunk/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java

@@ -123 +123 @@
      */
     public volatile boolean selected = false;
+    
+    /**
+     * If set to true, this object is highlighted. Currently this is only used to
+     * show which ways/nodes will connect 
+     */
+    public volatile boolean highlighted = false;
 
     /**

trunk/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java

@@ -120 +120 @@
         if(osm.mappaintStyle == null && styles != null) {
             osm.mappaintStyle = styles.get(osm);
-            if(osm instanceof Way)
-                osm.isMappaintArea = styles.isArea(osm);
+            osm.isMappaintArea = styles.isArea(osm);
         }
         return osm.isMappaintArea;
@@ -151 +150 @@
         if (nodeStyle != null && isZoomOk(nodeStyle) && showIcons > dist)
             drawNode(n, nodeStyle.icon, nodeStyle.annotate, n.selected);
+        else if (n.highlighted)
+            drawNode(n, highlightColor, selectedNodeSize, selectedNodeRadius, fillSelectedNode);
         else if (n.selected)
             drawNode(n, selectedColor, selectedNodeSize, selectedNodeRadius, fillSelectedNode);
@@ -266 +267 @@
             if (tmpWidth > width) width = tmpWidth;
         }
-        if(w.selected)
+
+        if(w.highlighted)
+            color = highlightColor;
+        else if(w.selected)
             color = selectedColor;
 
@@ -1136 +1140 @@
                 g2d.draw(currentPath);
             }
-            
+
             if(useStrokes > dist)
                 g2d.setStroke(new BasicStroke(1));

trunk/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java

@@ -37 +37 @@
     public final static Color darkgreen = new Color(0,128,0);
     public final static Color teal = new Color(0,128,128);
+    public final static Color lightteal= new Color(0, 255, 186);
 
     /**
@@ -62 +63 @@
     protected Color incompleteColor;
     protected Color backgroundColor;
+    protected Color highlightColor;
     protected boolean showDirectionArrow;
     protected boolean showRelevantDirectionsOnly;
@@ -97 +99 @@
         incompleteColor = Main.pref.getColor(marktr("incomplete way"), darkerblue);
         backgroundColor = Main.pref.getColor(marktr("background"), Color.BLACK);
+        highlightColor = Main.pref.getColor(marktr("highlight"), lightteal);
     }
 
@@ -132 +135 @@
 
         getSettings(virtual);
-        
-        if(profiler) 
+
+        if(profiler)
         {
             System.out.format("Prepare  : %4dms\n", (java.lang.System.currentTimeMillis()-profilerLast));
             profilerLast = java.lang.System.currentTimeMillis();
         }
-        
+
         // draw tagged ways first, then untagged ways. takes
         // time to iterate through list twice, OTOH does not
@@ -245 +248 @@
         if (inactive)
             drawNode(n, inactiveColor, unselectedNodeSize, unselectedNodeRadius, fillUnselectedNode);
+        else if (n.highlighted)
+            drawNode(n, highlightColor, selectedNodeSize, selectedNodeRadius, fillSelectedNode);
         else if (n.selected)
             drawNode(n, selectedColor, selectedNodeSize, selectedNodeRadius, fillSelectedNode);
@@ -301 +306 @@
         if (inactive) {
             wayColor = inactiveColor;
+        } else if(w.highlighted) {
+            wayColor = highlightColor;
+        } else if(w.selected) {
+            wayColor = selectedColor;
         } else if (!w.tagged) {
             wayColor = untaggedWayColor;
@@ -312 +321 @@
             for (int orderNumber = 1; it.hasNext(); orderNumber++) {
                 Point p = nc.getPoint(it.next().eastNorth);
-                drawSegment(lastP, p, w.selected && !inactive ? selectedColor : wayColor, 
+                drawSegment(lastP, p, wayColor,
                     showOnlyHeadArrowOnly ? !it.hasNext() : showThisDirectionArrow);
                 if (showOrderNumber)