Changeset 2597 in osm for applications/editors

Timestamp:

2007-04-19T19:31:48+02:00 (18 years ago)

Author:

andystreet

Message:

Paint segment order numbers on ways

File:

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

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

@@ -88 +88 @@
                 else
                 {
+                        int orderNumber = 0;
                         for (Segment ls : w.segments)
                         {
-                                if ((!ls.selected) && (isSegmentVisible(ls))) // selected already in good color
-                                        drawSegment(ls, w.selected ?
-                                                getPreferencesColor("selected", Color.YELLOW) : colour,
-                                                width);
+                                orderNumber++;
+                                if (isSegmentVisible(ls))
+                                {
+                                        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
+                                                {
+                                                        drawOrderNumber(ls, orderNumber);
+                                                }
+                                                catch (IllegalAccessError e) {} //SimplePaintVisitor::drawOrderNumber was private prior to rev #211
+                                        }
+                                }
                         }
                 }
@@ -140 +153 @@
 
         /**
-         * Checks is the given segment is int the visible area.
+         * Checks if the given segment is in the visible area.
          * NOTE: This will return true for a small number of non-visible
          *       segments.
@@ -164 +177 @@
                 {
                         g.setColor( getPreferencesColor ("text", Color.WHITE));
+                        Font defaultFont = g.getFont();
                         g.setFont (new Font("Helvetica", Font.PLAIN, 8));
                         g.drawString (name, p.x+w/2+2, p.y+h/2+2);
+                        g.setFont(defaultFont);
                 }
                 if (n.selected)