Changeset 13921 in osm for applications

Timestamp:

2009-02-28T01:56:46+01:00 (15 years ago)

Author:

lvarga

Message:

Added "fade background" feature.

Location:

applications/editors/josm/plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap

Files:

• SlippyMapLayer.java (modified) (5 diffs)
• SlippyMapPreferenceSetting.java (modified) (5 diffs)
• SlippyMapPreferences.java (modified) (2 diffs)

applications/editors/josm/plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java

@@ -12 +12 @@
 import java.awt.event.MouseEvent;
 import java.awt.image.ImageObserver;
-import java.util.ArrayList;
 import java.util.HashMap;
 
@@ -322 +321 @@
         g.setColor(Color.DARK_GRAY);
 
+        float fadeBackground = SlippyMapPreferences.getFadeBackground();
+        
         for (int x = z12x0 - 1; x <= z12x1; x++)
         {
@@ -351 +352 @@
                     Point p2 = pixelpos[x - z12x0 + 2][y - z12y0 + 2];
                     g.drawImage(img, p.x, p.y, p2.x - p.x, p2.y - p.y, this);
-                }
-            }
-        }
+                    
+                    if(fadeBackground != 0f) {
+                            //dimm by painting opaque rect...
+                            g.setColor(new Color(1f,1f,1f,fadeBackground));
+                            g.fillRect(p.x, p.y, p2.x - p.x, p2.y - p.y);
+                    }//end of if dim != 0
+                }//end of if img != null
+            }//end of for
+        }//end of for
 
         for (int x = z12x0 - 1; x <= z12x1; x++)
@@ -374 +381 @@
                 int texty = p.y + 2 + fontHeight;
                 SlippyMapTile tile = tileStorage[currentZoomLevel].get(key);
+                if(tile == null) {
+                        continue;
+                }
                 p = pixelpos[x - z12x0 + 1][y - z12y0 + 2];
                 g.drawString("x=" + x + " y=" + y + " z=" + currentZoomLevel + "", p.x + 2, texty);
@@ -408 +418 @@
                     }
                 }
-            }
+            } //end of for
         }
 

applications/editors/josm/plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java

@@ -8 +8 @@
 import javax.swing.JLabel;
 import javax.swing.JPanel;
+import javax.swing.JSlider;
 import javax.swing.JSpinner;
 
@@ -29 +30 @@
     private JCheckBox autoloadTiles = new JCheckBox(tr("autoload tiles"));
     private JSpinner maxZoomLvl = new JSpinner();
+    private JSlider fadeBackground = new JSlider(0, 100);
 
     public void addGui(PreferenceDialog gui)
@@ -60 +62 @@
         maxZoomLvlPanel.add(this.maxZoomLvl, GBC.eol().fill(GBC.HORIZONTAL));
         
+        JPanel fadeBackgroundPanel = new JPanel();
+        fadeBackgroundPanel.add(new JLabel(tr("Fade background: ")), GBC.std());
+        fadeBackgroundPanel.add(GBC.glue(5, 0), GBC.std().fill(GBC.HORIZONTAL));
+        fadeBackgroundPanel.add(this.fadeBackground, GBC.eol().fill(GBC.HORIZONTAL));
+        
         slippymapTab.add(mapUrlPanel, GBC.eol().fill(GBC.HORIZONTAL));
         slippymapTab.add(autozoomPanel, GBC.eol().fill(GBC.HORIZONTAL));
         slippymapTab.add(autoloadPanel, GBC.eol().fill(GBC.HORIZONTAL));
         slippymapTab.add(maxZoomLvlPanel, GBC.eol().fill(GBC.HORIZONTAL));
+        slippymapTab.add(fadeBackgroundPanel, GBC.eol().fill(GBC.HORIZONTAL));
         slippymapTab.add(Box.createVerticalGlue(), GBC.eol().fill(GBC.VERTICAL));
         
@@ -84 +92 @@
         this.autoloadTiles.setSelected(SlippyMapPreferences.getAutoloadTiles());
         this.maxZoomLvl.setValue(SlippyMapPreferences.getMaxZoomLvl());
+        this.fadeBackground.setValue(Math.round(SlippyMapPreferences.getFadeBackground()*100f));
     }
     
@@ -100 +109 @@
         SlippyMapPreferences.setAutoloadTiles(this.autoloadTiles.isSelected());
         SlippyMapPreferences.setMaxZoomLvl((Integer)this.maxZoomLvl.getValue());
+        SlippyMapPreferences.setFadeBackground(this.fadeBackground.getValue()/100f);
         //restart isn't required
         return false;

applications/editors/josm/plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferences.java

@@ -18 +18 @@
     private static final String PREFERENCE_AUTOLOADTILES = PREFERENCE_PREFIX + ".autoload_tiles";
     private static final String PREFERENCE_MAX_ZOOM_LVL = PREFERENCE_PREFIX + ".max_zoom_lvl";
+    private static final String PREFERENCE_FADE_BACKGROUND = PREFERENCE_PREFIX + ".fade_background";
     
     public static String getMapUrl()
@@ -66 +67 @@
     }
     
+    public static void setFadeBackground(float fadeBackground) {
+        Main.pref.put(SlippyMapPreferences.PREFERENCE_FADE_BACKGROUND, fadeBackground + "");
+    }
+
+    /**
+     * 
+     * @return  number between 0 and 1, inclusive
+     */
+    public static float getFadeBackground() {
+        String fadeBackground = Main.pref.get(PREFERENCE_FADE_BACKGROUND);
+
+        if (fadeBackground == null || "".equals(fadeBackground))
+        {
+                fadeBackground = "0.0";
+            Main.pref.put(PREFERENCE_FADE_BACKGROUND, fadeBackground);
+        }
+        
+        float parsed;
+        try {
+                parsed = Float.parseFloat(fadeBackground);
+        } catch (Exception ex) {
+                setFadeBackground(0.1f);
+                System.out.println("Error while parsing setting fade background to float! returning 0.1, because of error:");
+                ex.printStackTrace(System.out);
+                return 0.1f;
+        }
+        if(parsed < 0f) {
+                parsed = 0f;
+        } else {
+                if(parsed > 1f) {
+                parsed = 1f;
+            }
+        }
+        return parsed;
+    }
+    
     public static void setAutoloadTiles(boolean autoloadTiles) {
         Main.pref.put(SlippyMapPreferences.PREFERENCE_AUTOLOADTILES, autoloadTiles);
     }
-
+    
     public static int getMaxZoomLvl()
     {