Ticket #9228: 9228_v2.patch

src/org/openstreetmap/josm/data/gpx/WayPoint.java

@@ -24 +24 @@
 
     public double time;
     public Color customColoring;
+    public Color customColoringTransparent;
     public boolean drawLine;
     public int dir;
 
@@ -35 +36 @@
         north = p.north;
         time = p.time;
         customColoring = p.customColoring;
+        customColoringTransparent = p.customColoringTransparent;
         drawLine = p.drawLine;
         dir = p.dir;
     }

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

@@ -363 +363 @@
     }
 
     private final static Color[] colors = new Color[256];
+    /** Colors (with custom alpha channel, if given) for HDOP painting. */
+    private final static Color[] hdopColors;
     static {
         for (int i = 0; i < colors.length; i++) {
             colors[i] = Color.getHSBColor(i / 300.0f, 1, 1);
         }
+        final int hdopAlpha = Main.pref.getInteger("hdop.color.alpha", -1);
+        if (hdopAlpha >= 0) {
+            hdopColors = new Color[256];
+            for (int i = 0; i < hdopColors.length; i++) {
+                hdopColors[i] = new Color((colors[i].getRGB() & 0xFFFFFF) | ((hdopAlpha & 0xFF) << 24), true);
+            }
+        } else {
+            hdopColors = colors;
+        }
     }
 
     private final static Color[] colors_cyclic = new Color[256];
@@ -563 +574 @@
                         // Therefore inverse the logic
                         int hdopcolor = 255 - (hdoplvl > 255 ? 255 : hdoplvl);
                         trkPnt.customColoring = colors[hdopcolor];
+                        trkPnt.customColoringTransparent = hdopColors[hdopcolor];
                     }
                     if (oldWp != null) {
                         double dist = c.greatCircleDistance(oldWp.getCoor());
@@ -738 +750 @@
                     continue;
                 }
                 Point screen = mv.getPoint(trkPnt.getEastNorth());
-                g.setColor(trkPnt.customColoring);
+                g.setColor(trkPnt.customColoringTransparent);
                 if (hdopcircle && trkPnt.attr.get("hdop") != null) {
                     // hdop value
                     float hdop = ((Float)trkPnt.attr.get("hdop")).floatValue();