Changeset 3822 in josm for trunk/src/org/openstreetmap

Timestamp:

2011-01-26T12:32:05+01:00 (13 years ago)

Author:

bastiK

Message:

move painting code to AreaElemStyles

Location:

trunk/src/org/openstreetmap/josm

Files:

• data/osm/visitor/paint/MapPaintVisitor.java (modified) (2 diffs)
• data/osm/visitor/paint/MapPainter.java (modified) (1 diff)
• gui/mappaint/AreaElemStyle.java (modified) (2 diffs)

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

@@ -170 +170 @@
             if (fillAreas > dist)
             {
-                painter.drawArea(getPolygon(w), (data.isSelected(w) ? paintSettings.getSelectedColor() : areaStyle.color), painter.getAreaName(w));
+                areaStyle.paintPrimitive(w, paintSettings, painter, data.isSelected(w), false);
             }
             areaStyle.getLineStyle().paintPrimitive(w, paintSettings, painter, data.isSelected(w), false);
@@ -461 +461 @@
         if (bounds.y + bounds.height < 0) return false;
         return true;
-    }
-
-    protected Polygon getPolygon(Way w)
-    {
-        Polygon polygon = new Polygon();
-
-        for (Node n : w.getNodes())
-        {
-            Point p = nc.getPoint(n);
-            polygon.addPoint(p.x,p.y);
-        }
-        return polygon;
     }
 

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

@@ -251 +251 @@
     }
 
+    private Polygon getPolygon(Way w) {
+        Polygon polygon = new Polygon();
+
+        for (Node n : w.getNodes()) {
+            Point p = nc.getPoint(n);
+            polygon.addPoint(p.x,p.y);
+        }
+        return polygon;
+    }
+
+    public void drawArea(Way w, Color color, String name) {
+        Polygon polygon = getPolygon(w);
+        drawArea(polygon, color, name);
+    }
+
     protected void drawArea(Polygon polygon, Color color, String name) {
 

trunk/src/org/openstreetmap/josm/gui/mappaint/AreaElemStyle.java

@@ -4 +4 @@
 
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
+import org.openstreetmap.josm.data.osm.Relation;
+import org.openstreetmap.josm.data.osm.Way;
 import org.openstreetmap.josm.data.osm.visitor.paint.MapPaintSettings;
 import org.openstreetmap.josm.data.osm.visitor.paint.MapPainter;
@@ -51 +53 @@
     @Override
     public void paintPrimitive(OsmPrimitive primitive, MapPaintSettings paintSettings, MapPainter painter, boolean selected, boolean member) {
-        // TODO
-        /*Way way = (Way)primitive;
-        String name = painter.isShowNames() ? painter.getWayName(way) : null;
-        painter.drawArea(getPolygon(way), selected ? paintSettings.getSelectedColor() : color, name);
-        line.paintPrimitive(way, paintSettings, painter, selected);*/
+        if (primitive instanceof Way) {
+            Way w = (Way) primitive;
+            String name = painter.isShowNames() ? painter.getAreaName(w) : null;
+            painter.drawArea(w, w.isSelected() ? paintSettings.getSelectedColor() : color, name);
+            // line.paintPrimitive(way, paintSettings, painter, selected);
+        }
     }
 }