Changeset 11226 in josm for trunk/src/org/openstreetmap/josm/gui/MapView.java

Timestamp:

2016-11-09T00:27:35+01:00 (7 years ago)

Author:

michael2402

Message:

MapView: Allow public access to paintLayer.

This allows plugins like the areaselector to access the drawing code of the map view.

See ​https://github.com/JOSM/areaselector/issues/25

File:

• trunk/src/org/openstreetmap/josm/gui/MapView.java (modified) (6 diffs)

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

@@ -420 +420 @@
     }
 
-    private void paintLayer(Layer layer, Graphics2D g, Bounds box) {
+    /**
+     * Paints the given layer to the graphics object, using the current state of this map view.
+     * @param layer The layer to draw.
+     * @param g A graphics object. It should have the width and height of this component
+     * @throws IllegalArgumentException If the layer is not part of this map view.
+     * @since 11226
+     */
+    public void paintLayer(Layer layer, Graphics2D g) {
         try {
             LayerPainter painter = registeredLayers.get(layer);
@@ -435 +442 @@
             g.setPaintMode();
         } catch (RuntimeException t) {
-            BugReport.intercept(t).put("layer", layer).put("bounds", box).warn();
+            BugReport.intercept(t).put("layer", layer).warn();
         }
     }
@@ -480 +487 @@
         Graphics2D tempG = offscreenBuffer.createGraphics();
         tempG.setClip(g.getClip());
-        Bounds box = getLatLonBounds(g.getClipBounds());
 
         if (!canUseBuffer || nonChangedLayersBuffer == null) {
@@ -493 +499 @@
 
             for (int i = 0; i < nonChangedLayersCount; i++) {
-                paintLayer(visibleLayers.get(i), g2, box);
+                paintLayer(visibleLayers.get(i), g2);
             }
         } else {
@@ -501 +507 @@
                 g2.setClip(g.getClip());
                 for (int i = nonChangedLayers.size(); i < nonChangedLayersCount; i++) {
-                    paintLayer(visibleLayers.get(i), g2, box);
+                    paintLayer(visibleLayers.get(i), g2);
                 }
             }
@@ -514 +520 @@
 
         for (int i = nonChangedLayersCount; i < visibleLayers.size(); i++) {
-            paintLayer(visibleLayers.get(i), tempG, box);
+            paintLayer(visibleLayers.get(i), tempG);
         }
 
         try {
-            drawTemporaryLayers(tempG, box);
+            drawTemporaryLayers(tempG, getLatLonBounds(g.getClipBounds()));
         } catch (RuntimeException e) {
             BugReport.intercept(e).put("temporaryLayers", temporaryLayers).warn();