Changeset 16879 in josm for trunk

Timestamp:

2020-08-12T20:42:35+02:00 (4 years ago)

Author:

simon04

Message:

fix #8227 - MarkerLayer: allow to customize marker size/stroke

Advanced preference keys draw.rawgps.markers.size, draw.rawgps.markers.stroke

Location:

trunk/src/org/openstreetmap/josm/gui/layer/markerlayer

Files:

• ButtonMarker.java (modified) (2 diffs)
• Marker.java (modified) (2 diffs)
• MarkerLayer.java (modified) (3 diffs)

trunk/src/org/openstreetmap/josm/gui/layer/markerlayer/ButtonMarker.java

@@ -2 +2 @@
 package org.openstreetmap.josm.gui.layer.markerlayer;
 
-import java.awt.Graphics;
+import java.awt.Graphics2D;
 import java.awt.Insets;
 import java.awt.Point;
@@ -44 +44 @@
     }
 
-    @Override public void paint(Graphics g, MapView mv, boolean mousePressed, boolean showTextOrIcon) {
+    @Override public void paint(Graphics2D g, MapView mv, boolean mousePressed, boolean showTextOrIcon) {
         if (!showTextOrIcon) {
             super.paint(g, mv, mousePressed, showTextOrIcon);

trunk/src/org/openstreetmap/josm/gui/layer/markerlayer/Marker.java

@@ -7 +7 @@
 import java.awt.Graphics2D;
 import java.awt.Point;
+import java.awt.Stroke;
 import java.awt.event.ActionEvent;
 import java.awt.image.BufferedImage;
@@ -268 +269 @@
      * @param showTextOrIcon true if text and icon shall be drawn
      */
-    public void paint(Graphics g, MapView mv, boolean mousePressed, boolean showTextOrIcon) {
+    public void paint(Graphics2D g, MapView mv, boolean mousePressed, boolean showTextOrIcon) {
         Point screen = mv.getPoint(this);
+        int size2 = parentLayer.markerSize / 2;
+
         if (symbol != null && showTextOrIcon) {
             paintIcon(mv, g, screen.x-symbol.getIconWidth()/2, screen.y-symbol.getIconHeight()/2);
         } else {
-            g.drawLine(screen.x-2, screen.y-2, screen.x+2, screen.y+2);
-            g.drawLine(screen.x+2, screen.y-2, screen.x-2, screen.y+2);
+            Stroke stroke = g.getStroke();
+            g.setStroke(parentLayer.markerStroke);
+            g.drawLine(screen.x - size2, screen.y - size2, screen.x + size2, screen.y + size2);
+            g.drawLine(screen.x + size2, screen.y - size2, screen.x - size2, screen.y + size2);
+            g.setStroke(stroke);
         }
 
         String labelText = getText();
         if (!labelText.isEmpty() && showTextOrIcon) {
-            g.drawString(labelText, screen.x+4, screen.y+2);
+            g.drawString(labelText, screen.x + size2 + 2, screen.y + size2);
         }
     }

trunk/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java

@@ -7 +7 @@
 import static org.openstreetmap.josm.tools.I18n.trn;
 
+import java.awt.BasicStroke;
 import java.awt.Color;
 import java.awt.Component;
@@ -38 +39 @@
 import org.openstreetmap.josm.data.gpx.WayPoint;
 import org.openstreetmap.josm.data.osm.visitor.BoundingXYVisitor;
+import org.openstreetmap.josm.data.preferences.IntegerProperty;
 import org.openstreetmap.josm.data.preferences.NamedColorProperty;
+import org.openstreetmap.josm.data.preferences.StrokeProperty;
 import org.openstreetmap.josm.gui.MainApplication;
 import org.openstreetmap.josm.gui.MapView;
@@ -79 +82 @@
     public AudioMarker syncAudioMarker;
     private Color color, realcolor;
+    final int markerSize = new IntegerProperty("draw.rawgps.markers.size", 4).get();
+    final BasicStroke markerStroke = new StrokeProperty("draw.rawgps.markers.stroke", "1").get();
 
     /**