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

Timestamp:

2008-11-18T08:40:49+01:00 (16 years ago)

Author:

framm

Message:

• some changes regarding the "hatched download area": now also works for areas where server returns no data; colour preference is now called "outside downloaded area", not "downloaded Area"; changing the colour now invalidates the prepared pattern so that restart is not required; pattern is now transparent (patch from Stephan Knauss) so WMS and other layers are visible below. Fixes #1762, #1754, partly #1756

Location:

trunk/src/org/openstreetmap/josm

Files:

• actions/downloadtasks/DownloadOsmTask.java (modified) (4 diffs)
• data/Preferences.java (modified) (1 diff)
• gui/MainApplication.java (modified) (1 diff)
• gui/layer/OsmDataLayer.java (modified) (3 diffs)
• gui/preferences/ColorPreference.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java

@@ -11 +11 @@
 import org.openstreetmap.josm.actions.DownloadAction;
 import org.openstreetmap.josm.data.osm.DataSet;
+import org.openstreetmap.josm.data.osm.DataSource;
 import org.openstreetmap.josm.gui.PleaseWaitRunnable;
 import org.openstreetmap.josm.gui.download.DownloadDialog.DownloadTask;
 import org.openstreetmap.josm.gui.layer.OsmDataLayer;
 import org.openstreetmap.josm.io.BoundingBoxDownloader;
+import org.openstreetmap.josm.data.Bounds;
+import org.openstreetmap.josm.data.coor.LatLon;
 import org.xml.sax.SAXException;
+
 
 /**
@@ -22 +26 @@
  */
 public class DownloadOsmTask implements DownloadTask {
+
+    private static Bounds currentBounds;
 
         private static class Task extends PleaseWaitRunnable {
@@ -41 +47 @@
                         if (dataSet == null)
                                 return; // user cancelled download or error occoured
-                        if (dataSet.allPrimitives().isEmpty())
+                        if (dataSet.allPrimitives().isEmpty()) {
                                 errorMessage = tr("No data imported.");
+                // need to synthesize a download bounds lest the visual indication of downloaded
+                // area doesn't work
+                dataSet.dataSources.add(new DataSource(currentBounds, "OpenStreetMap server"));
+            }
+
                         OsmDataLayer layer = new OsmDataLayer(dataSet, tr("Data Layer"), null);
                         if (newLayer)
@@ -69 +80 @@
     
                 Task task = new Task(action != null && (action.dialog == null || action.dialog.newLayer.isSelected()), new BoundingBoxDownloader(minlat, minlon, maxlat, maxlon));
+        currentBounds = new Bounds(new LatLon(minlat, minlon), new LatLon(maxlat, maxlon));
                 Main.worker.execute(task);
     }

trunk/src/org/openstreetmap/josm/data/Preferences.java

@@ -178 +178 @@
         }
 
-        synchronized public Map<String, String> getDefaults()
-        {
+        synchronized public Map<String, String> getDefaults() {
                 return defaults;
         }

trunk/src/org/openstreetmap/josm/gui/MainApplication.java

@@ -165 +165 @@
                         Main.pref.save();
                 }
-                
+
+        // TODO remove this in early 2009 - just here to weed out color setting we don't use any more
+        Main.pref.put("downloaded Area", null);
 
                 String localeName = null; //The locale to use

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

@@ -7 +7 @@
 import static org.openstreetmap.josm.tools.I18n.trn;
 
+import java.awt.AlphaComposite;
 import java.awt.Color;
 import java.awt.Component;
+import java.awt.Composite;
 import java.awt.Graphics;
 import java.awt.Graphics2D;
@@ -128 +130 @@
      * a paint texture for non-downloaded area
      */
-    private TexturePaint hatched;
+    private static TexturePaint hatched;
     
+    static {
+        createHatchTexture();
+    }
+
+    /**
+     * Initialize the hatch pattern used to paint the non-downloaded area
+     */
+    public static void createHatchTexture() {
+        BufferedImage bi = new BufferedImage(15, 15, BufferedImage.TYPE_INT_ARGB);
+        Graphics2D big = bi.createGraphics();
+        big.setColor(Main.pref.getColor(marktr("background"), Color.BLACK));
+        Composite comp = AlphaComposite.getInstance(AlphaComposite.SRC_OVER, 0.3f);
+        big.setComposite(comp);
+        big.fillRect(0,0,15,15);
+        big.setColor(Main.pref.getColor(marktr("outside downloaded area"), Color.YELLOW));
+        big.drawLine(0,15,15,0);
+        Rectangle r = new Rectangle(0, 0, 15,15);
+        hatched = new TexturePaint(bi, r);
+    }
+
     /**
      * Construct a OsmDataLayer.
@@ -137 +159 @@
         this.data = data;
         this.associatedFile = associatedFile;
-        
-        BufferedImage bi = new BufferedImage(15, 15, BufferedImage.TYPE_INT_RGB);
-        Graphics2D big = bi.createGraphics();
-        big.setColor(Main.pref.getColor(marktr("background"), Color.BLACK));
-        big.fillRect(0,0,15,15);
-        big.setColor(Main.pref.getColor(marktr("downloaded Area"), Color.YELLOW));
-        big.drawLine(0,15,15,0);
-        Rectangle r = new Rectangle(0, 0, 15,15);
-        hatched = new TexturePaint(bi, r);
     }
 

trunk/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java

@@ -30 +30 @@
 import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.data.osm.visitor.SimplePaintVisitor;
+import org.openstreetmap.josm.gui.layer.OsmDataLayer;
 import org.openstreetmap.josm.tools.ColorHelper;
 import org.openstreetmap.josm.tools.GBC;
@@ -172 +173 @@
                         Main.pref.put("color." + name, ColorHelper.color2html(col));
                 }
+        org.openstreetmap.josm.gui.layer.OsmDataLayer.createHatchTexture();
     }
 }