Changeset 5093 in josm

Timestamp:

2012-03-17T11:18:59+01:00 (12 years ago)

Author:

xeen

Message:

only repaint when the to-be-highlighted primitives change.

The patch only affects the select mode when not dragging. While this should
reduce CPU usage with target highlighting enabled, it’s doubtful it will have
visible effect on those systems where target highlighting feels sluggish. See
#7503 for more ideas to improve the situation.

File:

• trunk/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java (modified) (6 diffs)

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

@@ -268 +268 @@
     }
 
+    private boolean repaintIfRequired(HashSet<OsmPrimitive> newHighlights) {
+        if(!drawTargetHighlight)
+            return false;
+
+        boolean needsRepaint = false;
+        for(OsmPrimitive x : newHighlights) {
+            if(oldHighlights.contains(x)) {
+                continue;
+            }
+            needsRepaint = true;
+            x.setHighlighted(true);
+        }
+        oldHighlights.removeAll(newHighlights);
+        for(OsmPrimitive x : oldHighlights) {
+            x.setHighlighted(false);
+            needsRepaint = true;
+        }
+        oldHighlights = newHighlights;
+        return needsRepaint;
+    }
+
     /**
      * handles adding highlights and updating the cursor for the given mouse event.
@@ -286 +307 @@
      */
     private boolean giveUserFeedback(MouseEvent e, int modifiers) {
-        boolean needsRepaint = false;
-
         Collection<OsmPrimitive> c = MapView.asColl(
                 mv.getNearestNodeOrWay(e.getPoint(), OsmPrimitive.isSelectablePredicate, true));
@@ -294 +313 @@
         determineMapMode(!c.isEmpty());
 
-        if(drawTargetHighlight) {
-            needsRepaint = removeHighlighting();
-        }
+        HashSet<OsmPrimitive> newHighlights = new HashSet<OsmPrimitive>();
 
         virtualWays.clear();
@@ -302 +319 @@
         if(mode == Mode.move && setupVirtual(e)) {
             DataSet ds = getCurrentDataSet();
-            if (ds != null) {
-                if(drawTargetHighlight) ds.setHighlightedVirtualNodes(virtualWays);
+            if (ds != null && drawTargetHighlight) {
+                ds.setHighlightedVirtualNodes(virtualWays);
             }
             mv.setNewCursor(SelectActionCursor.virtual_node.cursor(), this);
             // don't highlight anything else if a virtual node will be
-            return drawTargetHighlight; // if no highlighting, repaint is not needed
+            return repaintIfRequired(newHighlights);
         }
 
@@ -314 +331 @@
         // return early if there can't be any highlights
         if(!drawTargetHighlight || mode != Mode.move || c.isEmpty())
-            return needsRepaint;
+            return repaintIfRequired(newHighlights);
 
         // CTRL toggles selection, but if while dragging CTRL means merge
@@ -323 +340 @@
             // we are in toggle mode.
             if(isToggleMode || !x.isSelected()) {
-                x.setHighlighted(true);
-                oldHighlights.add(x);
-            }
-        }
-        return needsRepaint || !oldHighlights.isEmpty();
+                newHighlights.add(x);
+            }
+        }
+        return repaintIfRequired(newHighlights);
     }