Changeset 116 in josm for src/org/openstreetmap

Timestamp:

2006-07-20T00:43:51+02:00 (19 years ago)

Author:

imi

Message:

• added color for scale bar
• fixed scale bar in EPSG:4236 projection
• added annotation preset system

Location:

src/org/openstreetmap/josm

Files:

• Main.java (modified) (2 diffs)
• actions/AboutAction.java (modified) (3 diffs)
• data/Preferences.java (modified) (3 diffs)
• data/projection/Epsg4326.java (modified) (1 diff)
• data/projection/Mercator.java (modified) (1 diff)
• data/projection/Projection.java (modified) (1 diff)
• gui/MapScaler.java (modified) (2 diffs)
• gui/MapView.java (modified) (1 diff)
• gui/PreferenceDialog.java (modified) (9 diffs)
• gui/WorldChooser.java (modified) (1 diff)
• gui/dialogs/AnnotationPreset.java (added)
• gui/dialogs/PropertiesDialog.java (modified) (5 diffs)

src/org/openstreetmap/josm/Main.java

@@ -268 +268 @@
                         if (args.containsKey("reset-preferences")) {
                                 Main.pref.resetToDefault();
-                        } else
+                        } else {
                                 Main.pref.load();
+                        }
                 } catch (final IOException e1) {
                         e1.printStackTrace();
@@ -276 +277 @@
                         Main.pref.resetToDefault();
                 }
+
+                try {
+                Main.pref.upgrade(Integer.parseInt(AboutAction.version));
+        } catch (NumberFormatException e1) {
+        }
+
+                
                 if (errMsg != null)
                         JOptionPane.showMessageDialog(null, errMsg);

src/org/openstreetmap/josm/actions/AboutAction.java

@@ -37 +37 @@
 public class AboutAction extends JosmAction {
 
+        public static final String version;
+        
+        private static JTextArea revision;
+        private static String time;
+
+        static {
+                JTextArea revision = loadFile(Main.class.getResource("/REVISION"));
+
+                Pattern versionPattern = Pattern.compile(".*?Revision: ([0-9]*).*", Pattern.CASE_INSENSITIVE|Pattern.DOTALL);
+                Matcher match = versionPattern.matcher(revision.getText());
+                version = match.matches() ? match.group(1) : "UNKNOWN";
+                
+                Pattern timePattern = Pattern.compile(".*?Last Changed Date: ([^\n]*).*", Pattern.CASE_INSENSITIVE|Pattern.DOTALL);
+                match = timePattern.matcher(revision.getText());
+                time = match.matches() ? match.group(1) : "UNKNOWN";
+        }
+        
         public AboutAction() {
                 super(tr("About"), "about",tr("Display the about screen."), KeyEvent.VK_A);
@@ -45 +62 @@
                 
                 JTextArea readme = loadFile(Main.class.getResource("/README"));
-                JTextArea revision = loadFile(Main.class.getResource("/REVISION"));
-                
-                Pattern versionPattern = Pattern.compile(".*?Revision: ([0-9]*).*", Pattern.CASE_INSENSITIVE|Pattern.DOTALL);
-                Pattern timePattern = Pattern.compile(".*?Last Changed Date: ([^\n]*).*", Pattern.CASE_INSENSITIVE|Pattern.DOTALL);
 
-                Matcher match = versionPattern.matcher(revision.getText());
-                String version = match.matches() ? match.group(1) : "UNKNOWN";
-                match = timePattern.matcher(revision.getText());
-                String time = match.matches() ? match.group(1) : "UNKNOWN";
-                
                 JPanel info = new JPanel(new GridBagLayout());
                 info.add(new JLabel(tr("Java OpenStreetMap Editor Version {0}",version)), GBC.eop());
@@ -80 +88 @@
          * @return      An read-only text area with the content of "resource"
          */
-        private JTextArea loadFile(URL resource) {
+        private static JTextArea loadFile(URL resource) {
                 JTextArea area = new JTextArea(tr("File could not be found."));
                 area.setEditable(false);

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

@@ -32 +32 @@
                 void preferenceChanged(String key, String newValue);
         }
-        
+
         public final ArrayList<PreferenceChangedListener> listener = new ArrayList<PreferenceChangedListener>();
-        
+
         /**
          * Map the property name to the property object.
          */
         private final SortedMap<String, String> properties = new TreeMap<String, String>();
-        
+
         /**
          * Return the location of the preferences file
@@ -112 +112 @@
         }
 
-
         public void load() throws IOException {
                 properties.clear();
@@ -138 +137 @@
                 properties.put("color."+marktr("gps point"), ColorHelper.color2html(Color.gray));
                 properties.put("color."+marktr("conflict"), ColorHelper.color2html(Color.gray));
+                properties.put("color."+marktr("scale"), ColorHelper.color2html(Color.white));
                 save();
         }
+
+        public final void upgrade(int oldVersion) {
+                if (oldVersion > 115) return;
+                properties.put("color.scale", ColorHelper.color2html(Color.white));
+        }
 }

src/org/openstreetmap/josm/data/projection/Epsg4326.java

@@ -26 +26 @@
         return "epsg4326";
     }
+
+        public double scaleFactor() {
+            return 1.0/360;
+    }
 }

src/org/openstreetmap/josm/data/projection/Mercator.java

@@ -34 +34 @@
         return "mercator";
     }
+
+        public double scaleFactor() {
+            return 1/Math.PI/2;
+    }
 }

src/org/openstreetmap/josm/data/projection/Projection.java

@@ -47 +47 @@
      */
     String getCacheDirectoryName();
+    
+    /**
+     * The factor to multiply with an easting coordinate to get from "easting 
+     * units per pixel" to "meters per pixel"
+     */
+    double scaleFactor();
 }

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

@@ -1 +1 @@
 package org.openstreetmap.josm.gui;
 
-import java.awt.Color;
 import java.awt.Graphics;
 import java.awt.geom.Rectangle2D;
 
 import javax.swing.JComponent;
+
+import org.openstreetmap.josm.Main;
+import org.openstreetmap.josm.tools.ColorHelper;
 
 public class MapScaler extends JComponent {
@@ -18 +20 @@
 
         @Override public void paint(Graphics g) {
-                double circum = mv.getScale()*100/Math.PI/2*40041455; // circumference of the earth in meter
+                double circum = mv.getScale()*100*Main.proj.scaleFactor()*40041455; // circumference of the earth in meter
                 String text = circum > 1000 ? (Math.round(circum/100)/10.0)+"km" : Math.round(circum)+"m";
-                g.setColor(Color.white);
+                g.setColor(ColorHelper.html2color(Main.pref.get("color.scale", "#ffffff")));
                 g.drawLine(0, 5, 99, 5);
                 g.drawLine(0, 0, 0, 10);

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

@@ -98 +98 @@
                 MapSlider zoomSlider = new MapSlider(this);
                 add(zoomSlider);
-                zoomSlider.setBounds(0,0, 100, 30);
+                zoomSlider.setBounds(3, 0, 114, 30);
                 
                 MapScaler scaler = new MapScaler(this);

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

@@ -11 +11 @@
 import java.awt.event.ActionListener;
 import java.util.Map;
+import java.util.StringTokenizer;
 import java.util.TreeMap;
 import java.util.Vector;
@@ -19 +20 @@
 import javax.swing.Box;
 import javax.swing.DefaultListCellRenderer;
+import javax.swing.DefaultListModel;
 import javax.swing.JButton;
 import javax.swing.JCheckBox;
@@ -81 +83 @@
                         Main.pref.put("draw.segment.direction", directionHint.isSelected());
 
+                        if (annotationSources.getModel().getSize() > 0) {
+                                StringBuilder sb = new StringBuilder();
+                                for (int i = 0; i < annotationSources.getModel().getSize(); ++i)
+                                        sb.append(";"+annotationSources.getModel().getElementAt(i));
+                                Main.pref.put("annotation.sources", sb.toString().substring(1));
+                        }
+
                         for (int i = 0; i < colors.getRowCount(); ++i) {
                                 String name = (String)colors.getValueAt(i, 0);
@@ -121 +130 @@
         private JComboBox lafCombo = new JComboBox(UIManager.getInstalledLookAndFeels());
         /**
-         * Combobox with all projections available
-         */
-        private JComboBox projectionCombo = new JComboBox(Projection.allProjections);
-        /**
          * The main tab panel.
          */
@@ -161 +166 @@
         private JCheckBox directionHint = new JCheckBox(tr("Draw Direction Arrows"));
         private JTable colors;
+
+        /**
+         * Combobox with all projections available
+         */
+        private JComboBox projectionCombo = new JComboBox(Projection.allProjections);
+        private JList annotationSources = new JList(new DefaultListModel());
 
 
@@ -227 +238 @@
                 directionHint.setSelected(Main.pref.getBoolean("draw.segment.direction"));
 
+                String annos = Main.pref.get("annotation.sources");
+                StringTokenizer st = new StringTokenizer(annos, ";");
+                while (st.hasMoreTokens())
+                        ((DefaultListModel)annotationSources.getModel()).addElement(st.nextToken());
 
 
@@ -275 +290 @@
                         }
                 });
+
+                // Annotation source panels
+                JPanel annoButton = new JPanel(new GridBagLayout());
+                JButton addAnno = new JButton(tr("Add"));
+                addAnno.addActionListener(new ActionListener(){
+                        public void actionPerformed(ActionEvent e) {
+                                String source = JOptionPane.showInputDialog(Main.parent, tr("Annotation preset source"));
+                                if (source == null)
+                                        return;
+                                ((DefaultListModel)annotationSources.getModel()).addElement(source);
+                                requiresRestart = true;
+                        }
+                });
+                GBC g = GBC.eol().fill(GBC.HORIZONTAL);
+                g.weightx = 0;
+                annoButton.add(addAnno,g);
+
+                JButton editAnno = new JButton(tr("Edit"));
+                editAnno.addActionListener(new ActionListener(){
+                        public void actionPerformed(ActionEvent e) {
+                                if (annotationSources.getSelectedIndex() == -1)
+                                        JOptionPane.showMessageDialog(Main.parent, tr("Please select the row to edit."));
+                                else {
+                                        String source = JOptionPane.showInputDialog(Main.parent, tr("Annotation preset source"), annotationSources.getSelectedValue());
+                                        if (source == null)
+                                                return;
+                                        ((DefaultListModel)annotationSources.getModel()).setElementAt(source, annotationSources.getSelectedIndex());
+                                        requiresRestart = true;
+                                }
+                        }
+                });
+                annoButton.add(GBC.glue(0, 2), GBC.eol());
+                annoButton.add(editAnno,g);
+
+                JButton deleteAnno = new JButton(tr("Delete"));
+                deleteAnno.addActionListener(new ActionListener(){
+                        public void actionPerformed(ActionEvent e) {
+                                if (annotationSources.getSelectedIndex() == -1)
+                                        JOptionPane.showMessageDialog(Main.parent, tr("Please select the row to delete."));
+                                else {
+                                        ((DefaultListModel)annotationSources.getModel()).remove(annotationSources.getSelectedIndex());
+                                        requiresRestart = true;
+                                }
+                        }
+                });
+                annoButton.add(GBC.glue(0, 2), GBC.eol());
+                annoButton.add(deleteAnno,g);
+                annotationSources.setVisibleRowCount(5);
+
+
 
                 // setting tooltips
@@ -290 +355 @@
                 drawRawGpsLines.setToolTipText(tr("If your gps device draw to few lines, select this to draw lines along your way."));
                 colors.setToolTipText(tr("Colors used by different objects in JOSM."));
+                annotationSources.setToolTipText(tr("The sources (url or filename) of annotation preset definition files. See http://josm.eigenheimstrasse.de/wiki/AnnotationPresets for help."));
+                addAnno.setToolTipText(tr("Add a new annotation preset source to the list."));
+                deleteAnno.setToolTipText(tr("Delete the selected source from the list."));
 
                 // creating the gui
@@ -333 +401 @@
                 map.add(new JLabel(tr("Projection method")), GBC.std());
                 map.add(GBC.glue(5,0), GBC.std().fill(GBC.HORIZONTAL));
-                map.add(projectionCombo, GBC.eol().fill(GBC.HORIZONTAL).insets(0,0,0,5));
+                map.add(projectionCombo, GBC.eop().fill(GBC.HORIZONTAL).insets(0,0,0,5));
+                map.add(new JLabel(tr("Annotation preset sources")), GBC.eol());
+                map.add(new JScrollPane(annotationSources), GBC.std().fill(GBC.HORIZONTAL).insets(10,0,10,0));
+                map.add(annoButton, GBC.eol());
+
                 map.add(Box.createVerticalGlue(), GBC.eol().fill(GBC.VERTICAL));
 

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

@@ -77 +77 @@
             public String getCacheDirectoryName() {
                 throw new UnsupportedOperationException();
+            }
+                        public double scaleFactor() {
+                    return 1;
             }
                 };

src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java

@@ -15 +15 @@
 import java.awt.event.MouseAdapter;
 import java.awt.event.MouseEvent;
+import java.io.FileInputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.net.URL;
 import java.util.Collection;
 import java.util.HashMap;
 import java.util.Map;
+import java.util.StringTokenizer;
 import java.util.TreeMap;
 import java.util.TreeSet;
@@ -23 +28 @@
 import java.util.Map.Entry;
 
+import javax.swing.DefaultComboBoxModel;
 import javax.swing.JButton;
 import javax.swing.JComboBox;
@@ -42 +48 @@
 import org.openstreetmap.josm.gui.MapFrame;
 import org.openstreetmap.josm.tools.ImageProvider;
+import org.xml.sax.SAXException;
 
 /**
@@ -196 +203 @@
          */
         private final JTable propertyTable = new JTable(data);
+        private JComboBox annotationPresets = new JComboBox();
 
         /**
@@ -202 +210 @@
         public PropertiesDialog(MapFrame mapFrame) {
                 super(tr("Properties"), "propertiesdialog", tr("Property for selected objects."), KeyEvent.VK_P);
-
                 setPreferredSize(new Dimension(320,150));
+                
+                Vector<AnnotationPreset> allPresets = new Vector<AnnotationPreset>();
+                String allAnnotations = Main.pref.get("annotation.sources");
+                StringTokenizer st = new StringTokenizer(allAnnotations, ";");
+                while (st.hasMoreTokens()) {
+                        InputStream in = null;
+                        String source = st.nextToken();
+                        try {
+                    if (source.startsWith("http") || source.startsWith("ftp") || source.startsWith("file"))
+                        in = new URL(source).openStream();
+                    else if (source.startsWith("resource://"))
+                        in = Main.class.getResourceAsStream(source.substring("resource:/".length()));
+                    else
+                        in = new FileInputStream(source);
+                    allPresets.addAll(AnnotationPreset.readAll(in));
+            } catch (IOException e) {
+                    e.printStackTrace();
+                    JOptionPane.showMessageDialog(Main.parent, tr("Could not read annotation preset source: {0}",source));
+            } catch (SAXException e) {
+                    e.printStackTrace();
+                    JOptionPane.showMessageDialog(Main.parent, tr("Error parsing {0}: ", source)+e.getMessage());
+            }
+                }
+                if (allPresets.size() > 0) {
+                        allPresets.add(0, new AnnotationPreset());
+                        annotationPresets.setModel(new DefaultComboBoxModel(allPresets));
+                        add(annotationPresets, BorderLayout.NORTH);
+                }
+                annotationPresets.addActionListener(new ActionListener(){
+                        public void actionPerformed(ActionEvent e) {
+                                Collection<OsmPrimitive> sel = Main.ds.getSelected();
+                                AnnotationPreset preset = (AnnotationPreset)annotationPresets.getSelectedItem();
+                                JPanel p = preset.createPanel();
+                                if (p == null)
+                                        return;
+                                int answer;
+                                if (p.getComponentCount() == 0)
+                                        answer = JOptionPane.OK_OPTION;
+                                else
+                                        answer = JOptionPane.showConfirmDialog(Main.parent, p, trn("Change {0} object", "Change {0} objects", sel.size(), sel.size()), JOptionPane.OK_CANCEL_OPTION);
+                                if (answer == JOptionPane.OK_OPTION) {
+                                        Main.main.editLayer().add(preset.createCommand(sel));
+                                        selectionChanged(sel); // update whole table
+                                }
+                                annotationPresets.setSelectedIndex(0);
+            }
+                });
 
                 data.setColumnIdentifiers(new String[]{tr("Key"),tr("Value")});