Changeset 7182 in josm for trunk/src

Timestamp:

2014-05-26T09:22:25+02:00 (10 years ago)

Author:

akks

Message:

see #10072: color large GPS points like the track segments
use draw.rawgps.large.alpha parameter for transparency
updated Netbeans project (JAXB)

File:

• trunk/src/org/openstreetmap/josm/gui/layer/GpxLayer.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/gui/layer/GpxLayer.java

@@ -463 +463 @@
         boolean colorModeDynamic = Main.pref.getBoolean("draw.rawgps.colors.dynamic", spec, false);
         int hdopfactor = Main.pref.getInteger("hdop.factor", 25);
+
+        int largePointAlpha = Main.pref.getInteger("draw.rawgps.large.alpha", -1) & 0xFF;
 
         Stroke storedStroke = g.getStroke();
@@ -746 +748 @@
                 }
                 Point screen = mv.getPoint(trkPnt.getEastNorth());
+                if (!hdopcircle) {
+                    // color the large GPS points like the gps lines
+                    trkPnt.customColoringTransparent = new Color(
+                        trkPnt.customColoring.getRed(), trkPnt.customColoring.getGreen(), trkPnt.customColoring.getBlue(), largePointAlpha);
+                }
                 g.setColor(trkPnt.customColoringTransparent);
                 if (hdopcircle && trkPnt.attr.get("hdop") != null) {