Changeset 13150 in josm for trunk/src/org

Timestamp:

2017-11-23T03:14:45+01:00 (6 years ago)

Author:

Don-vip

Message:

fix #14778 - stroke not reset after drawing of large areas produced graphics artifacts when painting world bounds and selection rectangles, bug seen when filtering ways only, as way rendering reset the stroke

Location:

trunk/src/org/openstreetmap/josm

Files:

• data/osm/FilterModel.java (modified) (2 diffs)
• data/osm/visitor/paint/StyledMapRenderer.java (modified) (1 diff)
• gui/dialogs/FilterDialog.java (modified) (1 diff)
• gui/layer/AbstractMapViewPaintable.java (modified) (1 diff)
• gui/layer/MainLayerManager.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/data/osm/FilterModel.java

@@ -21 +21 @@
 import org.openstreetmap.josm.data.osm.search.SearchParseError;
 import org.openstreetmap.josm.gui.MainApplication;
-import org.openstreetmap.josm.gui.layer.OsmDataLayer;
 import org.openstreetmap.josm.gui.widgets.OSDLabel;
 import org.openstreetmap.josm.spi.preferences.Config;
@@ -200 +199 @@
 
     private static void updateMap() {
-        OsmDataLayer editLayer = MainApplication.getLayerManager().getEditLayer();
-        if (editLayer != null) {
-            editLayer.invalidate();
-        }
+        MainApplication.getLayerManager().invalidateEditLayer();
     }
 

trunk/src/org/openstreetmap/josm/data/osm/visitor/paint/StyledMapRenderer.java

@@ -428 +428 @@
                     g.draw(area);
                     g.setClip(oldClip);
+                    g.setStroke(new BasicStroke());
                 }
             } else {

trunk/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java

@@ -91 +91 @@
         MapFrame.removeMapModeChangeListener(this);
         filterModel.model.clearFilterFlags();
-        MainApplication.getMap().mapView.repaint();
+        MainApplication.getLayerManager().invalidateEditLayer();
     }
 

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

@@ -85 +85 @@
      */
     public void invalidate() {
+        PaintableInvalidationEvent event = new PaintableInvalidationEvent(this);
         for (PaintableInvalidationListener l : invalidationListeners) {
-            l.paintableInvalidated(new PaintableInvalidationEvent(this));
+            l.paintableInvalidated(event);
         }
     }

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

@@ -397 +397 @@
     }
 
+    /**
+     * Invalidates current edit layer, if any. Does nothing of there is no edit layer.
+     * @since 13150
+     */
+    public void invalidateEditLayer() {
+        if (editLayer != null) {
+            editLayer.invalidate();
+        }
+    }
+
     @Override
     protected synchronized void realResetState() {