Changeset 4327 in josm for trunk/src/org/openstreetmap/josm/data/osm/DataSet.java

Timestamp:

2011-08-21T13:12:53+02:00 (15 years ago)

Author:

xeen

Message:

updates visual appearance of highlights and adds them to select and delete action

in more detail:

• add target highlighting to select action
• add target cursor to select action
• add target highlighting to delete action
• unify ctrl/alt/shift modifier detection in MapMode actions
• highlights are now a halo around the way/node instead of a color change
• default highlight color is now the same as the select color (red)
• ability to highlight WaySegments and VirtualNodes
• various style/whitespace nits
• fixes #2411

This patch touches a lot of areas, so please report any regressions in the map mode
tools. Also please add a comment to #2411 if you find to highlighting in select
mode distracting, so it can be fine tuned (or turned off by default).

File:

• trunk/src/org/openstreetmap/josm/data/osm/DataSet.java (modified) (4 diffs)

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

@@ -115 +115 @@
     private CopyOnWriteArrayList<DataSetListener> listeners = new CopyOnWriteArrayList<DataSetListener>();
 
+    // provide means to highlight map elements that are not osm primitives
+    private Collection<WaySegment> highlightedVirtualNodes = new LinkedList<WaySegment>();
+    private Collection<WaySegment> highlightedWaySegments = new LinkedList<WaySegment>();
+
     // Number of open calls to beginUpdate
     private int updateCount;
@@ -431 +435 @@
 
     /**
+     * returns an unmodifiable collection of *WaySegments* whose virtual
+     * nodes should be highlighted. WaySegments are used to avoid having
+     * to create a VirtualNode class that wouldn't have much purpose otherwise.
+     * 
+     * @return unmodifiable collection of WaySegments
+     */
+    public Collection<WaySegment> getHighlightedVirtualNodes() {
+        return Collections.unmodifiableCollection(highlightedVirtualNodes);
+    }
+
+    /**
+     * returns an unmodifiable collection of WaySegments that should be
+     * highlighted.
+     * 
+     * @return unmodifiable collection of WaySegments
+     */
+    public Collection<WaySegment> getHighlightedWaySegments() {
+        return Collections.unmodifiableCollection(highlightedWaySegments);
+    }
+
+    /**
      * Replies an unmodifiable collection of primitives currently selected
      * in this dataset. May be empty, but not null.
@@ -505 +530 @@
         selectionSnapshot = null;
         return true;
+    }
+
+    /**
+     * set what virtual nodes should be highlighted. Requires a Collection of
+     * *WaySegments* to avoid a VirtualNode class that wouldn't have much use
+     * otherwise.
+     * @param Collection of waySegments
+     */
+    public void setHighlightedVirtualNodes(Collection<WaySegment> waySegments) {
+        if(highlightedVirtualNodes.isEmpty() && waySegments.isEmpty())
+            return;
+
+        highlightedVirtualNodes = waySegments;
+        // can't use fireHighlightingChanged because it requires an OsmPrimitive
+        highlightUpdateCount++;
+    }
+
+    /**
+     * set what virtual ways should be highlighted.
+     * @param Collection of waySegments
+     */
+    public void setHighlightedWaySegments(Collection<WaySegment> waySegments) {
+        if(highlightedWaySegments.isEmpty() && waySegments.isEmpty())
+            return;
+
+        highlightedWaySegments = waySegments;
+        // can't use fireHighlightingChanged because it requires an OsmPrimitive
+        highlightUpdateCount++;
     }
 
@@ -590 +643 @@
         }
         return changed;
+    }
+
+    /**
+     * clear all highlights of virtual nodes
+     */
+    public void clearHighlightedVirtualNodes() {
+        setHighlightedVirtualNodes(new ArrayList<WaySegment>());
+    }
+
+    /**
+     * clear all highlights of way segments
+     */
+    public void clearHighlightedWaySegments() {
+        setHighlightedWaySegments(new ArrayList<WaySegment>());
     }