Changeset 26290 in osm for applications/editors/josm/plugins/reltoolbox/src/relcontext/ChosenRelation.java

Timestamp:

2011-07-10T08:55:51+02:00 (13 years ago)

Author:

zverik

Message:

implemented most TODO requests, fixed some bugs

File:

• applications/editors/josm/plugins/reltoolbox/src/relcontext/ChosenRelation.java (modified) (2 diffs)

applications/editors/josm/plugins/reltoolbox/src/relcontext/ChosenRelation.java

@@ -101 +101 @@
         // todo: dim chosen relation when changing layer
         // todo: check this WTF!
+        System.out.println("editLayerChanged() oldLayer=" + oldLayer + ", newLayer=" + newLayer);
         clear();
         if( newLayer != null && oldLayer == null ) {
@@ -114 +115 @@
         }
 
+        OsmDataLayer dataLayer = Main.map.mapView.getEditLayer();
+        float opacity = dataLayer == null ? 0.0f : !dataLayer.isVisible() ? 0.0f : (float)dataLayer.getOpacity();
+        if( opacity < 0.01 )
+            return;
+
         Stroke oldStroke = g.getStroke();
         Composite oldComposite = g.getComposite();
         g.setColor(Color.yellow);
         g.setStroke(new BasicStroke(9, BasicStroke.CAP_ROUND, BasicStroke.JOIN_ROUND));
-        g.setComposite(AlphaComposite.getInstance(AlphaComposite.SRC_OVER, 0.3f));
+        g.setComposite(AlphaComposite.getInstance(AlphaComposite.SRC_OVER, 0.3f * opacity));
         for( OsmPrimitive element : chosenRelation.getMemberPrimitives() ) {
             if( element.getType() == OsmPrimitiveType.NODE ) {