Changeset 3964 in josm for trunk/src/org

Timestamp:

2011-03-08T17:12:21+01:00 (14 years ago)

Author:

bastiK

Message:

fix bug: with setting "Draw only outline of areas" the text labels of areas are also hidden

Location:

trunk/src/org/openstreetmap/josm/data/osm/visitor/paint

Files:

• MapPaintVisitor.java (modified) (1 diff)
• MapPainter.java (modified) (3 diffs)

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

@@ -104 +104 @@
 
         circum = nc.getDist100Pixel();
-        boolean drawArea = circum <= Main.pref.getInteger("mappaint.fillareas", 10000000) && !paintSettings.isOutlineOnly();
+        boolean drawArea = circum <= Main.pref.getInteger("mappaint.fillareas", 10000000);
         boolean drawMultipolygon = drawArea && Main.pref.getBoolean("mappaint.multipolygon", true);
         styles.setDrawMultipolygon(drawMultipolygon);

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

@@ -56 +56 @@
     private final boolean showIcons;
 
+    private final boolean  isOutlineOnly;
+
     private final Color inactiveColor;
     private final Color selectedColor;
@@ -87 +89 @@
         this.showNames = settings.getShowNamesDistance() > circum;
         this.showIcons = settings.getShowIconsDistance() > circum;
+
+        this.isOutlineOnly = settings.isOutlineOnly();
 
         this.inactiveColor = PaintColors.INACTIVE.get();
@@ -498 +502 @@
     protected void drawArea(OsmPrimitive osm, Polygon polygon, Color color, BufferedImage fillImage, float fillImageAlpha, TextElement text) {
 
-        if (fillImage == null) {
-            g.setColor(color);
-            g.fillPolygon(polygon);
-        } else {
-            TexturePaint texture = new TexturePaint(fillImage, 
-                    new Rectangle(polygon.xpoints[0], polygon.ypoints[0], fillImage.getWidth(), fillImage.getHeight()));
-            g.setPaint(texture);
-            if (fillImageAlpha != 1f) {
-                g.setComposite(AlphaComposite.getInstance(AlphaComposite.SRC_OVER, fillImageAlpha));
-            }
-            g.fill(polygon);
-            g.setPaintMode();
+        if (!isOutlineOnly) {
+            if (fillImage == null) {
+                g.setColor(color);
+                g.fillPolygon(polygon);
+            } else {
+                TexturePaint texture = new TexturePaint(fillImage,
+                        new Rectangle(polygon.xpoints[0], polygon.ypoints[0], fillImage.getWidth(), fillImage.getHeight()));
+                g.setPaint(texture);
+                if (fillImageAlpha != 1f) {
+                    g.setComposite(AlphaComposite.getInstance(AlphaComposite.SRC_OVER, fillImageAlpha));
+                }
+                g.fill(polygon);
+                g.setPaintMode();
+            }
         }