Changeset 12964 in josm for trunk/src/org/openstreetmap/josm/data/osm/visitor/paint/StyledMapRenderer.java

Timestamp:

2017-10-09T15:22:45+02:00 (7 years ago)

Author:

bastiK

Message:

see #15273 - more straightforward way to set up the styles for rendering

File:

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

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

@@ -65 +65 @@
 import org.openstreetmap.josm.gui.draw.MapViewPath;
 import org.openstreetmap.josm.gui.draw.MapViewPositionAndRotation;
+import org.openstreetmap.josm.gui.mappaint.ElemStyles;
+import org.openstreetmap.josm.gui.mappaint.MapPaintStyles;
 import org.openstreetmap.josm.gui.mappaint.styleelement.BoxTextElement;
 import org.openstreetmap.josm.gui.mappaint.styleelement.BoxTextElement.HorizontalTextAlignment;
@@ -261 +263 @@
 
     private MapPaintSettings paintSettings;
+    private ElemStyles styles;
 
     private Color highlightColorTransparent;
@@ -345 +348 @@
         Component focusOwner = FocusManager.getCurrentManager().getFocusOwner();
         useWiderHighlight = !(focusOwner instanceof AbstractButton || focusOwner == nc);
+        this.styles = MapPaintStyles.getStyles();
+    }
+
+    /**
+     * Set the {@link ElemStyles} instance to use for this renderer.
+     * @param styles the {@code ElemStyles} instance to use
+     */
+    public void setStyles(ElemStyles styles) {
+        this.styles = styles;
     }
 
@@ -1626 +1638 @@
             // (Could be synchronized, but try to avoid this for performance reasons.)
             THREAD_POOL.invoke(new ComputeStyleListWorker(circum, nc, relations, allStyleElems,
-                    Math.max(20, relations.size() / THREAD_POOL.getParallelism() / 3)));
+                    Math.max(20, relations.size() / THREAD_POOL.getParallelism() / 3), styles));
             THREAD_POOL.invoke(new ComputeStyleListWorker(circum, nc, new CompositeList<>(nodes, ways), allStyleElems,
-                    Math.max(100, (nodes.size() + ways.size()) / THREAD_POOL.getParallelism() / 3)));
+                    Math.max(100, (nodes.size() + ways.size()) / THREAD_POOL.getParallelism() / 3), styles));
 
             if (!benchmark.renderSort()) {