Changeset 4230 in josm for trunk/src/org/openstreetmap/josm/gui/layer/GpxLayer.java

Timestamp:

2011-07-13T10:41:01+02:00 (13 years ago)

Author:

stoecker

Message:

allow to color the entries in layer list dialog according to assigned layer drawing color

File:

• trunk/src/org/openstreetmap/josm/gui/layer/GpxLayer.java (modified) (10 diffs)

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

@@ -10 +10 @@
 import java.awt.BasicStroke;
 import java.awt.Color;
+import java.awt.Component;
 import java.awt.Dimension;
 import java.awt.Graphics2D;
@@ -34 +35 @@
 import javax.swing.ButtonGroup;
 import javax.swing.Icon;
-import javax.swing.JColorChooser;
 import javax.swing.JFileChooser;
 import javax.swing.JLabel;
 import javax.swing.JList;
+import javax.swing.JMenuItem;
 import javax.swing.JOptionPane;
 import javax.swing.JPanel;
@@ -219 +220 @@
     }
 
-    static public Color getColor(String name) {
-        return Main.pref.getColor(marktr("gps point"), name != null ? "layer " + name : null, Color.gray);
+    @Override
+    public Color getColor(boolean ignoreCustom) {
+        Color c = Main.pref.getColor(marktr("gps point"), "layer " + getName(), Color.gray);
+
+        return ignoreCustom || getColorMode() == colorModes.none ? c : null;
+    }
+
+    public colorModes getColorMode() {
+        try {
+            return colorModes.values()[Main.pref.getInteger("draw.rawgps.colors", "layer "+getName(), 0)];
+        } catch (Exception e) {
+        }
+        return colorModes.none;
+    }
+
+    /* for preferences */
+    static public Color getGenericColor() {
+        return Main.pref.getColor(marktr("gps point"), Color.gray);
     }
 
@@ -230 +247 @@
                 LayerListDialog.getInstance().createDeleteLayerAction(),
                 SeparatorLayerAction.INSTANCE,
-                new CustomizeColor(),
-                new CustomizeLineDrawing(),
+                new CustomizeColor(this),
+                new CustomizeLineDrawing(this),
                 new ConvertToDataLayerAction(),
                 SeparatorLayerAction.INSTANCE,
@@ -243 +260 @@
                 new LayerSaveAction(this),
                 new LayerSaveAsAction(this),
-                new CustomizeColor(),
-                new CustomizeLineDrawing(),
+                new CustomizeColor(this),
+                new CustomizeLineDrawing(this),
                 new ImportImages(),
                 new ImportAudio(),
@@ -375 +392 @@
          ****************************************************************/
         // Long startTime = System.currentTimeMillis();
-        Color neutralColor = getColor(getName());
+        Color neutralColor = getColor(true);
         // also draw lines between points belonging to different segments
-        boolean forceLines = Main.pref.getBoolean("draw.rawgps.lines.force");
+        boolean forceLines = Main.pref.getBoolean("draw.rawgps.lines.force", "layer "+getName(), false);
         // draw direction arrows on the lines
-        boolean direction = Main.pref.getBoolean("draw.rawgps.direction");
+        boolean direction = Main.pref.getBoolean("draw.rawgps.direction", "layer "+getName(), false);
         // don't draw lines if longer than x meters
-        int lineWidth = Main.pref.getInteger("draw.rawgps.linewidth",0);
+        int lineWidth = Main.pref.getInteger("draw.rawgps.linewidth", "layer "+getName(), 0);
 
         int maxLineLength;
+        boolean lines;
         if (this.isLocalFile) {
-            maxLineLength = Main.pref.getInteger("draw.rawgps.max-line-length.local", -1);
+            maxLineLength = Main.pref.getInteger("draw.rawgps.max-line-length.local", "layer "+getName(), -1);
+            lines = Main.pref.getBoolean("draw.rawgps.lines.local", "layer "+getName(), true);
         } else {
-            maxLineLength = Main.pref.getInteger("draw.rawgps.max-line-length", 200);
-        }
-        // draw line between points, global setting
-        boolean lines = (Main.pref.getBoolean("draw.rawgps.lines", true) || (Main.pref
-                .getBoolean("draw.rawgps.lines.localfiles") && this.isLocalFile));
-        String linesKey = "draw.rawgps.lines.layer " + getName();
-        // draw lines, per-layer setting
-        if (Main.pref.hasKey(linesKey)) {
-            lines = Main.pref.getBoolean(linesKey);
+            maxLineLength = Main.pref.getInteger("draw.rawgps.max-line-length", "layer "+getName(), 200);
+            lines = Main.pref.getBoolean("draw.rawgps.lines", "layer "+getName(), true);
         }
         // paint large dots for points
-        boolean large = Main.pref.getBoolean("draw.rawgps.large");
-        boolean hdopcircle = Main.pref.getBoolean("draw.rawgps.hdopcircle", true);
+        boolean large = Main.pref.getBoolean("draw.rawgps.large", "layer "+getName(), false);
+        int largesize = Main.pref.getInteger("draw.rawgps.large.size", "layer "+getName(), 3);
+        boolean hdopcircle = Main.pref.getBoolean("draw.rawgps.hdopcircle", "layer "+getName(), false);
         // color the lines
-        colorModes colored = colorModes.none;
-        try {
-            colored = colorModes.values()[Main.pref.getInteger("draw.rawgps.colors", 0)];
-        } catch (Exception e) {
-        }
+        colorModes colored = getColorMode();
         // paint direction arrow with alternate math. may be faster
-        boolean alternatedirection = Main.pref.getBoolean("draw.rawgps.alternatedirection");
+        boolean alternatedirection = Main.pref.getBoolean("draw.rawgps.alternatedirection", "layer "+getName(), false);
         // don't draw arrows nearer to each other than this
-        int delta = Main.pref.getInteger("draw.rawgps.min-arrow-distance", 40);
+        int delta = Main.pref.getInteger("draw.rawgps.min-arrow-distance", "layer "+getName(), 40);
         // allows to tweak line coloring for different speed levels.
-        int colorTracksTune = Main.pref.getInteger("draw.rawgps.colorTracksTune", 45);
+        int colorTracksTune = Main.pref.getInteger("draw.rawgps.colorTracksTune", "layer "+getName(), 45);
 
         if(lineWidth != 0)
@@ -640 +649 @@
                 }
                 if (large) {
-                    g.fillRect(screen.x-1, screen.y-1, 3, 3);
+                    g.fillRect(screen.x-1, screen.y-1, largesize, largesize);
                 }
             } // end for trkpnt
@@ -1296 +1305 @@
     }
 
-    private class CustomizeLineDrawing extends AbstractAction {
-
-        CustomizeLineDrawing() {
+    private class CustomizeLineDrawing extends AbstractAction implements LayerAction, MultiLayerAction {
+        List<Layer> layers;
+
+        public CustomizeLineDrawing(List<Layer> l) {
+            this();
+            layers = l;
+        }
+
+        public CustomizeLineDrawing(Layer l) {
+            this();
+            layers = new LinkedList<Layer>();
+            layers.add(l); 
+        }
+
+        private CustomizeLineDrawing() {
             super(tr("Customize line drawing"), ImageProvider.get("mapmode/addsegment"));
+        }
+
+        @Override
+        public boolean supportLayers(List<Layer> layers) {
+            for(Layer layer: layers) {
+                if(!(layer instanceof GpxLayer))
+                    return false;
+            }
+            return true;
+        }
+
+        @Override
+        public Component createMenuComponent() {
+            return new JMenuItem(this);
+        }
+
+        @Override
+        public Action getMultiLayerAction(List<Layer> layers) {
+            return new CustomizeLineDrawing(layers);
         }
 
         @Override
         public void actionPerformed(ActionEvent e) {
+            /* FIXME: Add all the other GPX settings here as well. Unify with DrawingPreferences
+               Each option should be able to "use global settings". Attention with the handling
+               of local layer for the two local layer options! */
             JRadioButton[] r = new JRadioButton[3];
             r[0] = new JRadioButton(tr("Use global settings."));
@@ -1314 +1357 @@
                 panel.add(b);
             }
-            String propName = "draw.rawgps.lines.layer " + getName();
+            String propbase = isLocalFile ? "draw.rawgps.lines.local" : "draw.rawgps.lines";
+            String propName = propbase + ".layer " + layers.get(0).getName();
             if (Main.pref.hasKey(propName)) {
                 group.setSelected(r[Main.pref.getBoolean(propName) ? 1 : 2].getModel(), true);
@@ -1329 +1373 @@
                 // continue
             }
-            if (group.getSelection() == r[0].getModel()) {
-                Main.pref.put(propName, null);
-            } else {
-                Main.pref.put(propName, group.getSelection() == r[1].getModel());
+            for(Layer layer : layers) {
+                propName = propbase + ".layer " + layer.getName();
+                if (group.getSelection() == r[0].getModel()) {
+                    Main.pref.put(propName, null);
+                } else {
+                    Main.pref.put(propName, group.getSelection() == r[1].getModel());
+                }
             }
             Main.map.repaint();
         }
-    }
-
-    private class CustomizeColor extends AbstractAction {
-
-        public CustomizeColor() {
-            super(tr("Customize Color"), ImageProvider.get("colorchooser"));
-            putValue("help", ht("/Action/LayerCustomizeColor"));
-        }
-
-        @Override
-        public void actionPerformed(ActionEvent e) {
-            JColorChooser c = new JColorChooser(getColor(getName()));
-            Object[] options = new Object[] { tr("OK"), tr("Cancel"), tr("Default") };
-            int answer = JOptionPane.showOptionDialog(
-                    Main.parent,
-                    c,
-                    tr("Choose a color"),
-                    JOptionPane.OK_CANCEL_OPTION,
-                    JOptionPane.PLAIN_MESSAGE,
-                    null,
-                    options, options[0]
-            );
-            switch (answer) {
-            case 0:
-                Main.pref.putColor("layer " + getName(), c.getColor());
-                break;
-            case 1:
-                return;
-            case 2:
-                Main.pref.putColor("layer " + getName(), null);
-                break;
-            }
-            Main.map.repaint();
-        }
-
     }