Changeset 2602 in osm for applications

Timestamp:

2007-04-19T22:59:49+02:00 (18 years ago)

Author:

andystreet

Message:

Improvement on segment numbering to include areas

File:

• applications/editors/josm/plugins/mappaint/src/mappaint/MapPaintVisitor.java (modified) (3 diffs)

applications/editors/josm/plugins/mappaint/src/mappaint/MapPaintVisitor.java

@@ -81 +81 @@
                         }
                 }
-
-                if(area)
-                {
-                        drawWayAsArea(w,colour);
-                }
-                else
-                {
-                        int orderNumber = 0;
-                        for (Segment ls : w.segments)
-                        {
-                                orderNumber++;
-                                if (isSegmentVisible(ls))
+                boolean fillAreas = Main.pref.getBoolean("mappaint.fillareas", true);
+                
+                if (area && fillAreas)
+                        drawWayAsArea(w, colour);
+                int orderNumber = 0;
+                for (Segment ls : w.segments)
+                {
+                        orderNumber++;
+                        if (isSegmentVisible(ls))
+                        {
+                                if (area && fillAreas)
+                                        //Draw segments in a different colour so direction arrows show against the fill
+                                        drawSegment(ls, w.selected ? getPreferencesColor("selected", Color.YELLOW) : getPreferencesColor("untagged",Color.GRAY), width);
+                                else
+                                        drawSegment(ls, w.selected ? getPreferencesColor("selected", Color.YELLOW) : colour, width);
+                                if (!ls.incomplete && Main.pref.getBoolean("draw.segment.order_number"))
                                 {
-                                        if (!ls.selected) // selected already in good color
-                                                drawSegment(ls, w.selected ?
-                                                        getPreferencesColor("selected", Color.YELLOW) : colour,
-                                                        width);
-                                        if (!ls.incomplete && Main.pref.getBoolean("draw.segment.order_number"))
+                                        try
                                         {
-                                                try
-                                                {
-                                                        drawOrderNumber(ls, orderNumber);
-                                                }
-                                                catch (IllegalAccessError e) {} //SimplePaintVisitor::drawOrderNumber was private prior to rev #211
+                                                g.setColor(w.selected ? getPreferencesColor("selected", Color.YELLOW) : colour);
+                                                drawOrderNumber(ls, orderNumber);
                                         }
+                                        catch (IllegalAccessError e) {} //SimplePaintVisitor::drawOrderNumber was private prior to rev #211
                                 }
                         }
@@ -133 +131 @@
                                                 getPreferencesColor("selected", Color.YELLOW) : colour);
 
-                if(Main.pref.getBoolean("mappaint.fillareas", true))
-                        g.fillPolygon(polygon);
-                else
-                {
-                        Graphics2D g2d = (Graphics2D)g;
-                        g2d.setStroke(new BasicStroke(2));
-                        g.drawPolygon(polygon);
-                        g2d.setStroke(new BasicStroke(1));
-                }
+                g.fillPolygon(polygon);
         }
 
@@ -234 +224 @@
         // Shows areas before non-areas
         public void visitAll(DataSet data) {
-
-                for (final OsmPrimitive osm : data.ways) {
-                        if(!osm.deleted && MapPaintPlugin.elemStyles.isArea(osm))
-                                osm.visit(this);
-                }
-
                 for (final OsmPrimitive osm : data.segments)
                         if (!osm.deleted)
                                 osm.visit(this);
-
-
-                for (final OsmPrimitive osm : data.ways) {
-                        if(!osm.deleted && !MapPaintPlugin.elemStyles.isArea(osm))
-                                osm.visit(this);
-                }
+                                
+                for (final OsmPrimitive osm : data.ways)
+                        if (!osm.deleted && MapPaintPlugin.elemStyles.isArea(osm))
+                                osm.visit(this);
+
+                for (final OsmPrimitive osm : data.ways)
+                        if (!osm.deleted && !MapPaintPlugin.elemStyles.isArea(osm))
+                                osm.visit(this);
 
                 for (final OsmPrimitive osm : data.nodes)