Changeset 99 in josm for src/org/openstreetmap/josm/gui/MapView.java

Timestamp:

2006-04-27T01:29:55+02:00 (18 years ago)

Author:

imi

Message:

• added GeoImage feature (showing images on a tracklog)
• added zoom slider
• added Escape cancels selection rectangle
• added "Save password" option to Auth-dialog
• fixed that redo/undo buttons were not enabled
• fixed hotkeys beeing inaccessible when no data is loaded

File:

• src/org/openstreetmap/josm/gui/MapView.java (modified) (5 diffs)

src/org/openstreetmap/josm/gui/MapView.java

@@ -6 +6 @@
 import java.awt.event.ComponentAdapter;
 import java.awt.event.ComponentEvent;
+import java.awt.event.MouseAdapter;
+import java.awt.event.MouseEvent;
+import java.beans.PropertyChangeEvent;
+import java.beans.PropertyChangeListener;
 import java.util.ArrayList;
 import java.util.Collection;
@@ -12 +16 @@
 
 import javax.swing.JOptionPane;
+import javax.swing.JSlider;
+import javax.swing.event.ChangeEvent;
+import javax.swing.event.ChangeListener;
 
 import org.openstreetmap.josm.Main;
@@ -76 +83 @@
         private final AutoScaleAction autoScaleAction;
 
+        
+        private final class Scaler extends JSlider implements PropertyChangeListener, ChangeListener {
+                boolean hovered = false;
+                public Scaler() {
+                        super(0, 20);
+                        addMouseListener(new MouseAdapter(){
+                                @Override public void mouseEntered(MouseEvent e) {
+                        hovered = true;
+                }
+                                @Override public void mouseExited(MouseEvent e) {
+                        hovered = false;
+                }
+                        });
+                        MapView.this.addPropertyChangeListener(this);
+                        addChangeListener(this);
+        }
+                public void propertyChange(PropertyChangeEvent evt) {
+                        if (evt.getPropertyName().equals("scale") && !getModel().getValueIsAdjusting())
+                                setValue(zoom());
+        }
+                public void stateChanged(ChangeEvent e) {
+                        if (!hovered)
+                                return;
+                        EastNorth pos = world;
+                        for (int zoom = 0; zoom < getValue(); ++zoom)
+                                pos = new EastNorth(pos.east()/2, pos.north()/2);
+                        if (MapView.this.getWidth() < MapView.this.getHeight())
+                                zoomTo(center, pos.east()*2/(MapView.this.getWidth()-20));
+                        else
+                                zoomTo(center, pos.north()*2/(MapView.this.getHeight()-20));
+        }
+        }
+        
         public MapView(AutoScaleAction autoScaleAction) {
                 this.autoScaleAction = autoScaleAction;
@@ -91 +131 @@
                         }
                 });
+                Scaler zoomScaler = new Scaler();
+                zoomScaler.setOpaque(false);
+                add(zoomScaler);
+                zoomScaler.setBounds(0,0, 100, 30);
         }
 
@@ -182 +226 @@
                 if (x1 > 0 || y1 > 0 || x2 < getWidth() || y2 < getHeight())
                         g.drawRect(x1, y1, x2-x1+1, y2-y1+1);
+                super.paint(g);
         }