Changeset 6895 in josm for trunk/src/org

Timestamp:

2014-03-02T15:38:21+01:00 (11 years ago)

Author:

bastiK

Message:

applied #9228 - Set transparency of circle from HDOP value (by simon04; slightly extended)

Location:

trunk/src/org/openstreetmap/josm

Files:

• data/gpx/WayPoint.java (modified) (2 diffs)
• gui/layer/GpxLayer.java (modified) (3 diffs)

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

@@ -25 +25 @@
     public double time;
     public Color customColoring;
+    public Color customColoringTransparent;
     public boolean drawLine;
     public int dir;
@@ -36 +37 @@
         time = p.time;
         customColoring = p.customColoring;
+        customColoringTransparent = p.customColoringTransparent;
         drawLine = p.drawLine;
         dir = p.dir;

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

@@ -367 +367 @@
         for (int i = 0; i < colors.length; i++) {
             colors[i] = Color.getHSBColor(i / 300.0f, 1, 1);
+        }
+    }
+    /** Colors (with custom alpha channel, if given) for HDOP painting. */
+    private final Color[] hdopColors;
+    private 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;
         }
     }
@@ -556 +569 @@
                     }
                     trkPnt.customColoring = neutralColor;
-                    if(colored == colorModes.dilution && trkPnt.attr.get("hdop") != null) {
-                        float hdop = ((Float) trkPnt.attr.get("hdop")).floatValue();
-                        int hdoplvl =(int) Math.round(colorModeDynamic ? ((hdop-minval)*255/(maxval-minval))
-                                : (hdop <= 0 ? 0 : hdop * hdopfactor));
-                        // High hdop is bad, but high values in colors are green.
-                        // Therefore inverse the logic
-                        int hdopcolor = 255 - (hdoplvl > 255 ? 255 : hdoplvl);
-                        trkPnt.customColoring = colors[hdopcolor];
+                    if (trkPnt.attr.get("hdop") != null) {
+                        if (colored == colorModes.dilution) {
+                            float hdop = ((Float) trkPnt.attr.get("hdop")).floatValue();
+                            int hdoplvl =(int) Math.round(colorModeDynamic ? ((hdop-minval)*255/(maxval-minval))
+                                    : (hdop <= 0 ? 0 : hdop * hdopfactor));
+                            // High hdop is bad, but high values in colors are green.
+                            // Therefore inverse the logic
+                            int hdopcolor = 255 - (hdoplvl > 255 ? 255 : hdoplvl);
+                            trkPnt.customColoring = colors[hdopcolor];
+                            trkPnt.customColoringTransparent = hdopColors[hdopcolor];
+                        } else {
+                            trkPnt.customColoringTransparent = new Color(
+                                    neutralColor.getRed(), neutralColor.getGreen(), neutralColor.getBlue(), hdopAlpha & 0xFF);
+                        }
                     }
                     if (oldWp != null) {
@@ -740 +759 @@
                 }
                 Point screen = mv.getPoint(trkPnt.getEastNorth());
-                g.setColor(trkPnt.customColoring);
+                g.setColor(trkPnt.customColoringTransparent);
                 if (hdopcircle && trkPnt.attr.get("hdop") != null) {
                     // hdop value