Changeset 5739 in josm for trunk/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java

Timestamp:

2013-02-21T19:11:14+01:00 (11 years ago)

Author:

akks

Message:

see #8447: advanced preferences to customize helper lines color and stroke

File:

• trunk/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java (modified) (7 diffs)

trunk/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java

@@ -69 +69 @@
 import org.openstreetmap.josm.gui.layer.MapViewPaintable;
 import org.openstreetmap.josm.gui.layer.OsmDataLayer;
+import org.openstreetmap.josm.gui.util.GuiHelper;
 import org.openstreetmap.josm.gui.widgets.PopupMenuLauncher;
 import org.openstreetmap.josm.tools.Geometry;
@@ -116 +117 @@
     private final JCheckBoxMenuItem snapCheckboxMenuItem;
     private boolean useRepeatedShortcut;
-
+    private Stroke rubberLineStroke;
+    private static final BasicStroke BASIC_STROKE = new BasicStroke(1);
+    
     public DrawAction(MapFrame mapFrame) {
         super(tr("Draw"), "node/autonode", tr("Draw nodes"),
@@ -199 +202 @@
             return;
         super.enterMode();
-        selectedColor =PaintColors.SELECTED.get();
+        
+        selectedColor = Main.pref.getColor(marktr("helper-line") ,PaintColors.SELECTED.get());
+        rubberLineStroke = GuiHelper.getCustomizedStroke(Main.pref.get("draw.stroke.helper-line","3"));
         drawHelperLine = Main.pref.getBoolean("draw.helper-line", true);
         drawTargetHighlight = Main.pref.getBoolean("draw.target-highlight", true);
@@ -1109 +1114 @@
         if (!snapHelper.isActive()) { // else use color and stoke from  snapHelper.draw
             g2.setColor(selectedColor);
-            g2.setStroke(new BasicStroke(3, BasicStroke.CAP_ROUND, BasicStroke.JOIN_ROUND));
+            g2.setStroke(rubberLineStroke);
         } else if (!snapHelper.drawConstructionGeometry)
             return;
@@ -1127 +1132 @@
 
         g2.draw(b);
-        g2.setStroke(new BasicStroke(1));
+        g2.setStroke(BASIC_STROKE);
     }
 
@@ -1310 +1315 @@
 
         JCheckBoxMenuItem checkBox;
-
+        public final Color ORANGE_TRANSPARENT = new Color(Color.ORANGE.getRed(),Color.ORANGE.getGreen(),Color.ORANGE.getBlue(),128);
+    
         public void init() {
             snapOn=false;
@@ -1339 +1345 @@
             useRepeatedShortcut = Main.pref.getBoolean("draw.anglesnap.toggleOnRepeatedA", true);
 
-            normalStroke = new BasicStroke(3, BasicStroke.CAP_ROUND, BasicStroke.JOIN_ROUND);
+            normalStroke = rubberLineStroke;
             snapHelperColor = Main.pref.getColor(marktr("draw angle snap"), Color.ORANGE);
 
-            highlightColor = Main.pref.getColor(marktr("draw angle snap highlight"),
-                    new Color(Color.ORANGE.getRed(),Color.ORANGE.getGreen(),Color.ORANGE.getBlue(),128));
-            highlightStroke = new BasicStroke(10, BasicStroke.CAP_ROUND, BasicStroke.JOIN_ROUND);
-
-            float dash1[] = { 4.0f };
-            helperStroke = new BasicStroke(1.0f, BasicStroke.CAP_BUTT,
-                    BasicStroke.JOIN_MITER, 10.0f, dash1, 0.0f);
+            highlightColor = Main.pref.getColor(marktr("draw angle snap highlight"), ORANGE_TRANSPARENT);
+            highlightStroke = GuiHelper.getCustomizedStroke(Main.pref.get("draw.anglesnap.stroke.highlight","10"));
+            helperStroke = GuiHelper.getCustomizedStroke(Main.pref.get("draw.anglesnap.stroke.helper","1 4"));
         }