Ticket #13743: 13743.patch

src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintSettings.java

@@ -25 +25 @@
     private int defaultSegmentWidth;
     /** Preference: should the segment numbers of ways be displayed */
     private boolean showOrderNumber;
+    /** Preference: should the segment numbers of ways be displayed on selected way */
+    private boolean showOrderNumberOnSelectedWay;
     /** Preference: should only the last arrow of a way be displayed */
     private boolean showHeadArrowOnly;
     private int showNamesDistance;
@@ -89 +91 @@
         }
 
         showOrderNumber = Main.pref.getBoolean("draw.segment.order_number", false);
+        showOrderNumberOnSelectedWay = Main.pref.getBoolean("draw.segment.order_number.on_selected", false);
         showHeadArrowOnly = Main.pref.getBoolean("draw.segment.head_only", false);
 
         showNamesDistance = Main.pref.getInteger("mappaint.shownames", 10000000);
@@ -235 +238 @@
     }
 
     /**
+     * Determines if the segment numbers of the selected way should be displayed
+     * @return {@code true} if the segment numbers of the selected way should be displayed
+     */
+    public boolean isShowOrderNumberOnSelectedWay() {
+        return showOrderNumberOnSelectedWay;
+    }
+
+    /**
      * Specifies if only the last arrow of a way should be displayed
      * @param showHeadArrowOnly {@code true} if only the last arrow of a way should be displayed
      */

src/org/openstreetmap/josm/data/osm/visitor/paint/WireframeMapRenderer.java

@@ -59 +59 @@
     protected boolean showHeadArrowOnly;
     /** Preference: should the segment numbers of ways be displayed */
     protected boolean showOrderNumber;
+    /** Preference: should the segment numbers of the selected be displayed */
+    protected boolean showOrderNumberOnSelectedWay;
     /** Preference: should selected nodes be filled */
     protected boolean fillSelectedNode;
     /** Preference: should unselected nodes be filled */
@@ -133 +135 @@
         showOnewayArrow = settings.isShowOnewayArrow();
         showHeadArrowOnly = settings.isShowHeadArrowOnly();
         showOrderNumber = settings.isShowOrderNumber();
+        showOrderNumberOnSelectedWay = settings.isShowOrderNumberOnSelectedWay();
         selectedNodeSize = settings.getSelectedNodeSize();
         unselectedNodeSize = settings.getUnselectedNodeSize();
         connectionNodeSize = settings.getConnectionNodeSize();
@@ -320 +323 @@
                 if ((pOutside & lastPOutside) == 0) {
                     drawSegment(lastP, p, wayColor,
                             showOnlyHeadArrowOnly ? !it.hasNext() : showThisDirectionArrow);
-                    if (showOrderNumber && !isInactiveMode) {
+                    if ((showOrderNumber || (showOrderNumberOnSelectedWay && w.isSelected())) && !isInactiveMode) {
                         drawOrderNumber(lastP, p, orderNumber, g.getColor());
                     }
                 }

src/org/openstreetmap/josm/gui/mappaint/styleelement/LineElement.java

@@ -115 +115 @@
         painter.drawWay(w, myColor, myLine, myDashLine, myDashedColor, offset, showOrientation,
                 showOnlyHeadArrowOnly, showOneway, onewayReversed);
 
-        if (paintSettings.isShowOrderNumber() && !painter.isInactiveMode()) {
+        if ((paintSettings.isShowOrderNumber() || (paintSettings.isShowOrderNumberOnSelectedWay() && selected))
+                && !painter.isInactiveMode()) {
             int orderNumber = 0;
             lastN = null;
             for (Node n : w.getNodes()) {

src/org/openstreetmap/josm/gui/preferences/display/DrawingPreference.java

@@ -42 +42 @@
     private final JCheckBox headArrow = new JCheckBox(tr("Only on the head of a way."));
     private final JCheckBox onewayArrow = new JCheckBox(tr("Draw oneway arrows."));
     private final JCheckBox segmentOrderNumber = new JCheckBox(tr("Draw segment order numbers"));
+    private final JCheckBox segmentOrderNumberOnSelectedWay = new JCheckBox(tr("Draw segment order numbers on selected way"));
     private final JCheckBox sourceBounds = new JCheckBox(tr("Draw boundaries of downloaded data"));
     private final JCheckBox virtualNodes = new JCheckBox(tr("Draw virtual nodes in select mode"));
     private final JCheckBox inactive = new JCheckBox(tr("Draw inactive layers in other color"));
@@ -91 +92 @@
         // segment order number
         segmentOrderNumber.setToolTipText(tr("Draw the order numbers of all segments within their way."));
         segmentOrderNumber.setSelected(Main.pref.getBoolean("draw.segment.order_number", false));
+        segmentOrderNumberOnSelectedWay.setToolTipText(tr("Draw the order numbers of all segments within their way."));
+        segmentOrderNumberOnSelectedWay.setSelected(Main.pref.getBoolean("draw.segment.order_number.on_selected", false));
 
         // downloaded area
         sourceBounds.setToolTipText(tr("Draw the boundaries of data loaded from the server."));
@@ -135 +138 @@
         panel.add(headArrow, GBC.eop().insets(40, 0, 0, 0));
         panel.add(onewayArrow, GBC.eop().insets(20, 0, 0, 0));
         panel.add(segmentOrderNumber, GBC.eop().insets(20, 0, 0, 0));
+        panel.add(segmentOrderNumberOnSelectedWay, GBC.eop().insets(20, 0, 0, 0));
 
         panel.add(new JLabel(tr("Select and draw mode options")),
                 GBC.eop().insets(5, 10, 0, 0));
@@ -175 +179 @@
         Main.pref.put("draw.segment.head_only", headArrow.isSelected());
         Main.pref.put("draw.oneway", onewayArrow.isSelected());
         Main.pref.put("draw.segment.order_number", segmentOrderNumber.isSelected());
+        Main.pref.put("draw.segment.order_number.on_selected", segmentOrderNumberOnSelectedWay.isSelected());
         Main.pref.put("draw.data.downloaded_area", sourceBounds.isSelected());
         Main.pref.put("draw.data.inactive_color", inactive.isSelected());
         Main.pref.put("mappaint.use-antialiasing", useAntialiasing.isSelected());