Changeset 10009 in josm for trunk/src/org/openstreetmap

Timestamp:

2016-03-18T01:12:00+01:00 (8 years ago)

Author:

Don-vip

Message:

fix #12634 - Make filled area of validation layer transparent (patch by michael2402)

File:

• trunk/src/org/openstreetmap/josm/data/validation/PaintVisitor.java (modified) (5 diffs)

trunk/src/org/openstreetmap/josm/data/validation/PaintVisitor.java

@@ -121 +121 @@
         if (!paintedPoints.contains(pp)) {
             Point p = mv.getPoint(n);
+
+            if (selected) {
+                g.setColor(getHighlightColor());
+                g.fillOval(p.x - 5, p.y - 5, 10, 10);
+            }
             g.setColor(color);
-
-            if (selected) {
-                g.fillOval(p.x - 5, p.y - 5, 10, 10);
-            } else {
-                g.drawOval(p.x - 5, p.y - 5, 10, 10);
-            }
+            g.drawOval(p.x - 5, p.y - 5, 10, 10);
             paintedPoints.add(pp);
         }
@@ -140 +140 @@
      */
     protected void drawSegment(Point p1, Point p2, Color color) {
-        g.setColor(color);
 
         double t = Math.atan2(p2.x - p1.x, p2.y - p1.y);
@@ -147 +146 @@
         int deg = (int) Math.toDegrees(t);
         if (selected) {
+            g.setColor(getHighlightColor());
             int[] x = new int[] {(int) (p1.x + cosT), (int) (p2.x + cosT),
                                  (int) (p2.x - cosT), (int) (p1.x - cosT)};
@@ -154 +154 @@
             g.fillArc(p1.x - 5, p1.y - 5, 10, 10, deg,  180);
             g.fillArc(p2.x - 5, p2.y - 5, 10, 10, deg, -180);
-        } else {
-            g.drawLine((int) (p1.x + cosT), (int) (p1.y - sinT),
-                       (int) (p2.x + cosT), (int) (p2.y - sinT));
-            g.drawLine((int) (p1.x - cosT), (int) (p1.y + sinT),
-                       (int) (p2.x - cosT), (int) (p2.y + sinT));
-            g.drawArc(p1.x - 5, p1.y - 5, 10, 10, deg,  180);
-            g.drawArc(p2.x - 5, p2.y - 5, 10, 10, deg, -180);
-        }
+        }
+        g.setColor(color);
+        g.drawLine((int) (p1.x + cosT), (int) (p1.y - sinT),
+                (int) (p2.x + cosT), (int) (p2.y - sinT));
+        g.drawLine((int) (p1.x - cosT), (int) (p1.y + sinT),
+                (int) (p2.x - cosT), (int) (p2.y + sinT));
+        g.drawArc(p1.x - 5, p1.y - 5, 10, 10, deg,  180);
+        g.drawArc(p2.x - 5, p2.y - 5, 10, 10, deg, -180);
     }
 
@@ -259 +259 @@
 
     /**
+     * Gets the color to draw highlight markers with.
+     * @return The color.
+     */
+    private Color getHighlightColor() {
+        return new Color(color.getRed(), color.getGreen(), color.getBlue(), (int) (color.getAlpha() * .4));
+    }
+
+    /**
      * Clears the internal painted objects collections.
      */