Changeset 11090 in josm

Timestamp:

2016-10-07T19:57:30+02:00 (8 years ago)

Author:

simon04

Message:

fix #13743 - Draw segment order numbers on selected way

Location:

trunk/src/org/openstreetmap/josm

Files:

• data/osm/visitor/paint/MapPaintSettings.java (modified) (3 diffs)
• data/osm/visitor/paint/WireframeMapRenderer.java (modified) (3 diffs)
• gui/mappaint/styleelement/LineElement.java (modified) (1 diff)
• gui/preferences/display/DrawingPreference.java (modified) (4 diffs)

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

@@ -26 +26 @@
     /** 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;
@@ -90 +92 @@
 
         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);
 
@@ -233 +236 @@
     public boolean isShowOrderNumber() {
         return showOrderNumber;
+    }
+
+    /**
+     * 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;
     }
 

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

@@ -60 +60 @@
     /** 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;
@@ -134 +136 @@
         showHeadArrowOnly = settings.isShowHeadArrowOnly();
         showOrderNumber = settings.isShowOrderNumber();
+        showOrderNumberOnSelectedWay = settings.isShowOrderNumberOnSelectedWay();
         selectedNodeSize = settings.getSelectedNodeSize();
         unselectedNodeSize = settings.getUnselectedNodeSize();
@@ -321 +324 @@
                     drawSegment(lastP, p, wayColor,
                             showOnlyHeadArrowOnly ? !it.hasNext() : showThisDirectionArrow);
-                    if (showOrderNumber && !isInactiveMode) {
+                    if ((showOrderNumber || (showOrderNumberOnSelectedWay && w.isSelected())) && !isInactiveMode) {
                         drawOrderNumber(lastP, p, orderNumber, g.getColor());
                     }

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

@@ -116 +116 @@
                 showOnlyHeadArrowOnly, showOneway, onewayReversed);
 
-        if (paintSettings.isShowOrderNumber() && !painter.isInactiveMode()) {
+        if ((paintSettings.isShowOrderNumber() || (paintSettings.isShowOrderNumberOnSelectedWay() && selected))
+                && !painter.isInactiveMode()) {
             int orderNumber = 0;
             lastN = null;

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

@@ -43 +43 @@
     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"));
@@ -92 +93 @@
         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
@@ -136 +139 @@
         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")),
@@ -176 +180 @@
         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());