Changeset 13987 in josm for trunk/src

Timestamp:

2018-06-30T12:01:59+02:00 (6 years ago)

Author:

Don-vip

Message:

see #16128 - don't display names while moving the map. Improves dragging performance greatly.

Location:

trunk/src/org/openstreetmap/josm

Files:

• data/osm/visitor/paint/AbstractMapRenderer.java (modified) (2 diffs)
• data/osm/visitor/paint/StyledMapRenderer.java (modified) (1 diff)
• gui/MapMover.java (modified) (3 diffs)
• gui/layer/OsmDataLayer.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/data/osm/visitor/paint/AbstractMapRenderer.java

@@ -61 +61 @@
     /** Preference: minimum space (displayed way length) to display segment numbers */
     protected int segmentNumberSpace;
+
+    /** Performs slow operations by default. Can be disabled when fast partial rendering is required */
+    protected boolean doSlowOperations;
 
     /**
@@ -243 +246 @@
         }
     }
+
+    /**
+     * Sets whether slow operations such as text rendering must be performed (true by default).
+     * @param enable whether slow operations such as text rendering must be performed
+     * @since 13987
+     */
+    public final void enableSlowOperations(boolean enable) {
+        doSlowOperations = enable;
+    }
 }

trunk/src/org/openstreetmap/josm/data/osm/visitor/paint/StyledMapRenderer.java

@@ -1553 +1553 @@
      */
     public boolean isShowNames() {
-        return showNames;
+        return showNames && doSlowOperations;
     }
 

trunk/src/org/openstreetmap/josm/gui/MapMover.java

@@ -22 +22 @@
 import org.openstreetmap.josm.data.preferences.BooleanProperty;
 import org.openstreetmap.josm.gui.MapViewState.MapViewPoint;
+import org.openstreetmap.josm.gui.layer.Layer;
 import org.openstreetmap.josm.spi.preferences.Config;
 import org.openstreetmap.josm.spi.preferences.PreferenceChangeEvent;
@@ -158 +159 @@
     }
 
-    private boolean movementInProgress() {
+    /**
+     * Determines if a map move is in progress.
+     * @return {@code true} if a map move is in progress
+     * @since 13987
+     */
+    public boolean movementInProgress() {
         return mousePosMoveStart != null;
     }
@@ -238 +244 @@
         nc.resetCursor(this);
         mousePosMoveStart = null;
+        MainApplication.getLayerManager().getLayers().forEach(Layer::invalidate);
     }
 

trunk/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java

@@ -80 +80 @@
 import org.openstreetmap.josm.data.osm.visitor.BoundingXYVisitor;
 import org.openstreetmap.josm.data.osm.visitor.OsmPrimitiveVisitor;
+import org.openstreetmap.josm.data.osm.visitor.paint.AbstractMapRenderer;
 import org.openstreetmap.josm.data.osm.visitor.paint.MapRendererFactory;
-import org.openstreetmap.josm.data.osm.visitor.paint.Rendering;
 import org.openstreetmap.josm.data.osm.visitor.paint.relations.MultipolygonCache;
 import org.openstreetmap.josm.data.preferences.IntegerProperty;
@@ -493 +493 @@
         }
 
-        Rendering painter = MapRendererFactory.getInstance().createActiveRenderer(g, mv, inactive);
+        AbstractMapRenderer painter = MapRendererFactory.getInstance().createActiveRenderer(g, mv, inactive);
+        painter.enableSlowOperations(mv.getMapMover() == null || !mv.getMapMover().movementInProgress());
         painter.render(data, virtual, box);
         MainApplication.getMap().conflictDialog.paintConflicts(g, mv);