Changeset 4270 in josm

Timestamp:

2011-07-27T20:41:25+02:00 (13 years ago)

Author:

stoecker

Message:

fix #6629 - patch by akks fixed by me - improve settings handling for individual GPX tracks

Location:

trunk/src/org/openstreetmap/josm/gui

Files:

• layer/CustomizeColor.java (modified) (1 diff)
• layer/GpxLayer.java (modified) (20 diffs)
• preferences/DrawingPreference.java (modified) (4 diffs)
• preferences/GPXSettingsPanel.java (added)

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

@@ -63 +63 @@
     @Override
     public void actionPerformed(ActionEvent e) {
-        JColorChooser c = new JColorChooser(layers.get(0).getColor(false));
+        Color cl=layers.get(0).getColor(false); if (cl==null) cl=Color.gray;
+        JColorChooser c = new JColorChooser(cl);
         Object[] options = new Object[]{tr("OK"), tr("Cancel"), tr("Default")};
         int answer = JOptionPane.showOptionDialog(

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

@@ -26 +26 @@
 import java.util.Collections;
 import java.util.Comparator;
+import java.util.Date;
+import java.util.HashMap;
 import java.util.LinkedList;
 import java.util.List;
+import java.util.Map;
 import java.util.concurrent.Future;
 
@@ -34 +37 @@
 import javax.swing.Box;
 import javax.swing.ButtonGroup;
+import javax.swing.ButtonModel;
 import javax.swing.Icon;
 import javax.swing.JFileChooser;
@@ -70 +74 @@
 import org.openstreetmap.josm.gui.layer.markerlayer.AudioMarker;
 import org.openstreetmap.josm.gui.layer.markerlayer.MarkerLayer;
+import org.openstreetmap.josm.gui.preferences.GPXSettingsPanel;
 import org.openstreetmap.josm.gui.progress.NullProgressMonitor;
 import org.openstreetmap.josm.gui.progress.PleaseWaitProgressMonitor;
@@ -230 +235 @@
     public colorModes getColorMode() {
         try {
-            return colorModes.values()[Main.pref.getInteger("draw.rawgps.colors", "layer "+getName(), 0)];
+            int i=Main.pref.getInteger("draw.rawgps.colors", "layer " + getName(), 0);
+            return colorModes.values()[i];
         } catch (Exception e) {
         }
@@ -249 +255 @@
                 SeparatorLayerAction.INSTANCE,
                 new CustomizeColor(this),
-                new CustomizeLineDrawing(this),
+                new CustomizeDrawing(this),
                 new ConvertToDataLayerAction(),
                 SeparatorLayerAction.INSTANCE,
@@ -262 +268 @@
                 new LayerSaveAsAction(this),
                 new CustomizeColor(this),
-                new CustomizeLineDrawing(this),
+                new CustomizeDrawing(this),
                 new ImportImages(),
                 new ImportAudio(),
@@ -376 +382 @@
     // the different color modes
     enum colorModes {
-        none, velocity, dilution, direction
+        none, velocity, dilution, direction, time
     }
 
@@ -394 +400 @@
         // Long startTime = System.currentTimeMillis();
         Color neutralColor = getColor(true);
+        String spec="layer "+getName();
+
         // also draw lines between points belonging to different segments
-        boolean forceLines = Main.pref.getBoolean("draw.rawgps.lines.force", "layer "+getName(), false);
+        boolean forceLines = Main.pref.getBoolean("draw.rawgps.lines.force", spec, false);
         // draw direction arrows on the lines
-        boolean direction = Main.pref.getBoolean("draw.rawgps.direction", "layer "+getName(), false);
+        boolean direction = Main.pref.getBoolean("draw.rawgps.direction", spec, false);
         // don't draw lines if longer than x meters
-        int lineWidth = Main.pref.getInteger("draw.rawgps.linewidth", "layer "+getName(), 0);
+        int lineWidth = Main.pref.getInteger("draw.rawgps.linewidth", spec, 0);
 
         int maxLineLength;
         boolean lines;
         if (this.isLocalFile) {
-            maxLineLength = Main.pref.getInteger("draw.rawgps.max-line-length.local", "layer "+getName(), -1);
-            lines = Main.pref.getBoolean("draw.rawgps.lines.local", "layer "+getName(), true);
+            maxLineLength = Main.pref.getInteger("draw.rawgps.max-line-length.local", spec, -1);
+            lines = Main.pref.getBoolean("draw.rawgps.lines.local", spec, true);
         } else {
-            maxLineLength = Main.pref.getInteger("draw.rawgps.max-line-length", "layer "+getName(), 200);
-            lines = Main.pref.getBoolean("draw.rawgps.lines", "layer "+getName(), true);
+            maxLineLength = Main.pref.getInteger("draw.rawgps.max-line-length", spec, 200);
+            lines = Main.pref.getBoolean("draw.rawgps.lines", spec, true);
         }
         // paint large dots for points
-        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);
+        boolean large = Main.pref.getBoolean("draw.rawgps.large", spec, false);
+        int largesize = Main.pref.getInteger("draw.rawgps.large.size", spec, 3);
+        boolean hdopcircle = Main.pref.getBoolean("draw.rawgps.hdopcircle", spec, false);
         // color the lines
         colorModes colored = getColorMode();
         // paint direction arrow with alternate math. may be faster
-        boolean alternatedirection = Main.pref.getBoolean("draw.rawgps.alternatedirection", "layer "+getName(), false);
+        boolean alternatedirection = Main.pref.getBoolean("draw.rawgps.alternatedirection", spec, false);
         // don't draw arrows nearer to each other than this
-        int delta = Main.pref.getInteger("draw.rawgps.min-arrow-distance", "layer "+getName(), 40);
+        int delta = Main.pref.getInteger("draw.rawgps.min-arrow-distance", spec, 40);
         // allows to tweak line coloring for different speed levels.
-        int colorTracksTune = Main.pref.getInteger("draw.rawgps.colorTracksTune", "layer "+getName(), 45);
-        boolean colorModeDynamic = Main.pref.getBoolean("draw.rawgps.colors.dynamic", "layer "+getName(), false);
+        int colorTracksTune = Main.pref.getInteger("draw.rawgps.colorTracksTune", spec, 45);
+        boolean colorModeDynamic = Main.pref.getBoolean("draw.rawgps.colors.dynamic", spec, false);
         int hdopfactor = Main.pref.getInteger("hdop.factor", 25);
 
@@ -448 +456 @@
          ****************************************************************/
         if (!computeCacheInSync) { // don't compute if the cache is good
-            Float minval = null;
-            Float maxval = null;
+            double minval = +1e10;
+            double maxval = -1e10;
             WayPoint oldWp = null;
             if (colorModeDynamic) {
@@ -462 +470 @@
                                 }
                                 if (oldWp != null && trkPnt.time > oldWp.time) {
-                                    Float vel = new Float(c.greatCircleDistance(oldWp.getCoor()) / (trkPnt.time - oldWp.time));
-                                    if(maxval == null || vel > maxval) maxval = vel;
-                                    if(minval == null || vel < minval) minval = vel;
+                                    double vel = c.greatCircleDistance(oldWp.getCoor())
+                                            / (trkPnt.time - oldWp.time);
+                                    if(vel > maxval) maxval = vel;
+                                    if(vel < minval) minval = vel;
                                 }
                                 oldWp = trkPnt;
@@ -476 +485 @@
                                 Object val = trkPnt.attr.get("hdop");
                                 if (val != null) {
-                                    Float hdop = (Float) val;
-                                    if(maxval == null || hdop > maxval) maxval = hdop;
-                                    if(minval == null || hdop < minval) minval = hdop;
+                                    double hdop = ((Float) val).doubleValue();
+                                    if(hdop > maxval) maxval = hdop;
+                                    if(hdop < minval) minval = hdop;
                                 }
                             }
@@ -486 +495 @@
                 oldWp = null;
             }
+            if (colored == colorModes.time) {
+                    for (GpxTrack trk : data.tracks) {
+                        for (GpxTrackSegment segment : trk.getSegments()) {
+                            for (WayPoint trkPnt : segment.getWayPoints()) {
+                               double t=trkPnt.time;
+                               if (t==0) continue; // skip non-dated trackpoints
+                               if(t > maxval) maxval = t;
+                               if(t < minval) minval = t;
+                            }
+                        }
+                    }
+                }
+            
             for (GpxTrack trk : data.tracks) {
                 for (GpxTrackSegment segment : trk.getSegments()) {
@@ -499 +521 @@
                         if(colored == colorModes.dilution && trkPnt.attr.get("hdop") != null) {
                             float hdop = ((Float) trkPnt.attr.get("hdop")).floatValue();
-                            int hdoplvl = Math.round(colorModeDynamic ? ((hdop-minval)*255/(maxval-minval))
+                            int hdoplvl =(int) Math.round(colorModeDynamic ? ((hdop-minval)*255/(maxval-minval))
                             : (hdop <= 0 ? 0 : hdop * hdopfactor));
                             // High hdop is bad, but high values in colors are green.
@@ -508 +530 @@
                         if (oldWp != null) {
                             double dist = c.greatCircleDistance(oldWp.getCoor());
-
+                            boolean noDraw=false;
                             switch (colored) {
                             case velocity:
@@ -514 +536 @@
                                 if(dtime > 0) {
                                     float vel = (float) (dist / dtime);
-                                    int velColor = Math.round(colorModeDynamic ? ((vel-minval)*255/(maxval-minval))
+                                    int velColor =(int) Math.round(colorModeDynamic ? ((vel-minval)*255/(maxval-minval))
                                     : (vel <= 0 ? 0 : vel / colorTracksTune * 255));
                                     trkPnt.customColoring = colors[velColor > 255 ? 255 : velColor];
@@ -530 +552 @@
                                 }
                                 break;
+                            case time:
+                                if (trkPnt.time>0){
+                                    int tColor = (int) Math.round((trkPnt.time-minval)*255/(maxval-minval));
+                                    trkPnt.customColoring = colors[tColor];
+                                } else {
+                                    trkPnt.customColoring = neutralColor;
+                                }
+                                break;
                             }
-
-                            if (maxLineLength == -1 || dist <= maxLineLength) {
+                            
+                            if (!noDraw && (maxLineLength == -1 || dist <= maxLineLength)) {
                                 trkPnt.drawLine = true;
                                 trkPnt.dir = (int) oldWp.getCoor().heading(trkPnt.getCoor());
@@ -1338 +1368 @@
     }
 
-    private class CustomizeLineDrawing extends AbstractAction implements LayerAction, MultiLayerAction {
+    private class CustomizeDrawing extends AbstractAction implements LayerAction, MultiLayerAction {
         List<Layer> layers;
 
-        public CustomizeLineDrawing(List<Layer> l) {
+        public CustomizeDrawing(List<Layer> l) {
             this();
             layers = l;
         }
 
-        public CustomizeLineDrawing(Layer l) {
+        public CustomizeDrawing(Layer l) {
             this();
             layers = new LinkedList<Layer>();
@@ -1352 +1382 @@
         }
 
-        private CustomizeLineDrawing() {
-            super(tr("Customize line drawing"), ImageProvider.get("mapmode/addsegment"));
+        private CustomizeDrawing() {
+            super(tr("Customize track drawing"), ImageProvider.get("mapmode/addsegment"));
         }
 
@@ -1372 +1402 @@
         @Override
         public Action getMultiLayerAction(List<Layer> layers) {
-            return new CustomizeLineDrawing(layers);
+            return new CustomizeDrawing(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."));
-            r[1] = new JRadioButton(tr("Draw lines between points for this layer."));
-            r[2] = new JRadioButton(tr("Do not draw lines between points for this layer."));
-            ButtonGroup group = new ButtonGroup();
-            Box panel = Box.createVerticalBox();
-            for (JRadioButton b : r) {
-                group.add(b);
-                panel.add(b);
-            }
-            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);
-            } else {
-                group.setSelected(r[0].getModel(), true);
-            }
+            GPXSettingsPanel panel=new GPXSettingsPanel(getName());
             int answer = JOptionPane.showConfirmDialog(Main.parent, panel,
-                    tr("Select line drawing options"), JOptionPane.OK_CANCEL_OPTION, JOptionPane.QUESTION_MESSAGE);
-            switch (answer) {
-            case JOptionPane.CANCEL_OPTION:
-            case JOptionPane.CLOSED_OPTION:
-                return;
-            default:
-                // continue
-            }
+                    tr("Customize track drawing"), JOptionPane.OK_CANCEL_OPTION, JOptionPane.QUESTION_MESSAGE);
+            if (answer == JOptionPane.CANCEL_OPTION || answer == JOptionPane.CLOSED_OPTION) return;
             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());
-                }
+                // save preferences for all layers
+                panel.savePreferences(layer.getName());
             }
             Main.map.repaint();
@@ -1418 +1419 @@
     }
 
-    private class MarkersFromNamedPoins extends AbstractAction {
+      private class MarkersFromNamedPoins extends AbstractAction {
 
         public MarkersFromNamedPoins() {

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

@@ -34 +34 @@
     }
 
-    private JRadioButton drawRawGpsLinesAll = new JRadioButton(tr("All"));
-    private JRadioButton drawRawGpsLinesLocal = new JRadioButton(tr("Local files"));
-    private JRadioButton drawRawGpsLinesNone = new JRadioButton(tr("None"));
-    private ActionListener drawRawGpsLinesActionListener;
-    private JTextField drawRawGpsMaxLineLength = new JTextField(8);
-    private JTextField drawRawGpsMaxLineLengthLocal = new JTextField(8);
-    private JCheckBox forceRawGpsLines = new JCheckBox(tr("Force lines if no segments imported."));
-    private JCheckBox largeGpsPoints = new JCheckBox(tr("Draw large GPS points."));
-    private JCheckBox hdopCircleGpsPoints = new JCheckBox(tr("Draw a circle form HDOP value."));
-    private ButtonGroup colorGroup;
-    private JRadioButton colorTypeVelocity = new JRadioButton(tr("Velocity (red = slow, green = fast)"));
-    private JRadioButton colorTypeDirection = new JRadioButton(tr("Direction (red = west, yellow = north, green = east, blue = south)"));
-    private JRadioButton colorTypeDilution = new JRadioButton(tr("Dilution of Position (red = high, green = low, if available)"));
-    private JRadioButton colorTypeNone = new JRadioButton(tr("Single Color (can be customized for named layers)"));
-    private JComboBox colorTypeVelocityTune = new JComboBox(new String[] {tr("Car"), tr("Bicycle"), tr("Foot")});
+    private GPXSettingsPanel gpxPanel;
     private JCheckBox directionHint = new JCheckBox(tr("Draw Direction Arrows"));
-    private JCheckBox drawGpsArrows = new JCheckBox(tr("Draw Direction Arrows"));
-    private JCheckBox drawGpsArrowsFast = new JCheckBox(tr("Fast drawing (looks uglier)"));
-    private JTextField drawGpsArrowsMinDist = new JTextField(8);
     private JCheckBox headArrow = new JCheckBox(tr("Only on the head of a way."));
     private JCheckBox onewayArrow = new JCheckBox(tr("Draw oneway arrows."));
@@ -60 +43 @@
     private JCheckBox inactive = new JCheckBox(tr("Draw inactive layers in other color"));
     private JCheckBox useAntialiasing = new JCheckBox(tr("Smooth map graphics (antialiasing)"));
-    private JCheckBox makeAutoMarkers = new JCheckBox(tr("Create markers when reading GPX."));
     private JCheckBox outlineOnly = new JCheckBox(tr("Draw only outlines of areas"));
-    private JCheckBox colorDynamic = new JCheckBox(tr("Dynamic color range based on data limits"));
-    private JComboBox waypointLabel = new JComboBox(new String[] {tr("Auto"), /* gpx data field name */ trc("gpx_field", "Name"),
-            /* gpx data field name */ trc("gpx_field", "Desc(ription)"), tr("Both"), tr("None")});
 
     public void addGui(PreferenceTabbedPane gui) {
         gui.display.setPreferredSize(new Dimension(400,600));
-        JPanel panel = new JPanel(new GridBagLayout());
-        panel.setBorder(BorderFactory.createEmptyBorder(5,5,5,5));
-
-        // makeAutoMarkers
-        makeAutoMarkers.setSelected(Main.pref.getBoolean("marker.makeautomarkers", true));
-        makeAutoMarkers.setToolTipText(tr("Automatically make a marker layer from any waypoints when opening a GPX layer."));
-        panel.add(makeAutoMarkers, GBC.eol().insets(20,0,0,5));
-
-        // drawRawGpsLines
-        ButtonGroup gpsLinesGroup = new ButtonGroup();
-        gpsLinesGroup.add(drawRawGpsLinesNone);
-        gpsLinesGroup.add(drawRawGpsLinesLocal);
-        gpsLinesGroup.add(drawRawGpsLinesAll);
-
-
-        /* ensure that default is in data base */
-        Boolean lf = Main.pref.getBoolean("draw.rawgps.lines.local", true);
-        if(Main.pref.getBoolean("draw.rawgps.lines", true)) {
-            drawRawGpsLinesAll.setSelected(true);
-        } else if (lf) {
-            drawRawGpsLinesLocal.setSelected(true);
-        } else {
-            drawRawGpsLinesNone.setSelected(true);
-        }
-
-        panel.add(new JLabel(tr("Draw lines between raw GPS points")), GBC.eol().insets(20,0,0,0));
-        panel.add(drawRawGpsLinesNone, GBC.eol().insets(40,0,0,0));
-        panel.add(drawRawGpsLinesLocal, GBC.eol().insets(40,0,0,0));
-        panel.add(drawRawGpsLinesAll, GBC.eol().insets(40,0,0,0));
-
-        drawRawGpsLinesActionListener = new ActionListener(){
-            public void actionPerformed(ActionEvent e) {
-                forceRawGpsLines.setEnabled(!drawRawGpsLinesNone.isSelected());
-                drawRawGpsMaxLineLength.setEnabled(!(drawRawGpsLinesNone.isSelected() || drawRawGpsLinesLocal.isSelected()));
-                drawRawGpsMaxLineLengthLocal.setEnabled(!drawRawGpsLinesNone.isSelected());
-                drawGpsArrows.setEnabled(!drawRawGpsLinesNone.isSelected() );
-                drawGpsArrowsFast.setEnabled(drawGpsArrows.isSelected() && drawGpsArrows.isEnabled());
-                drawGpsArrowsMinDist.setEnabled(drawGpsArrows.isSelected() && drawGpsArrows.isEnabled());
-            }
-        };
-
-        drawRawGpsLinesNone.addActionListener(drawRawGpsLinesActionListener);
-        drawRawGpsLinesLocal.addActionListener(drawRawGpsLinesActionListener);
-        drawRawGpsLinesAll.addActionListener(drawRawGpsLinesActionListener);
-
-        // drawRawGpsMaxLineLengthLocal
-        drawRawGpsMaxLineLengthLocal.setText(Integer.toString(Main.pref.getInteger("draw.rawgps.max-line-length.local", -1)));
-        drawRawGpsMaxLineLengthLocal.setToolTipText(tr("Maximum length (in meters) to draw lines for local files. Set to ''-1'' to draw all lines."));
-        drawRawGpsMaxLineLengthLocal.setEnabled(!drawRawGpsLinesNone.isSelected());
-        panel.add(new JLabel(tr("Maximum length for local files (meters)")), GBC.std().insets(40,0,0,0));
-        panel.add(drawRawGpsMaxLineLengthLocal, GBC.eol().fill(GBC.HORIZONTAL).insets(5,0,0,5));
-
-        // drawRawGpsMaxLineLength
-        drawRawGpsMaxLineLength.setText(Integer.toString(Main.pref.getInteger("draw.rawgps.max-line-length", 200)));
-        drawRawGpsMaxLineLength.setToolTipText(tr("Maximum length (in meters) to draw lines. Set to ''-1'' to draw all lines."));
-        drawRawGpsMaxLineLength.setEnabled(!drawRawGpsLinesNone.isSelected());
-        panel.add(new JLabel(tr("Maximum length (meters)")), GBC.std().insets(40,0,0,0));
-        panel.add(drawRawGpsMaxLineLength, GBC.eol().fill(GBC.HORIZONTAL).insets(5,0,0,5));
-
-        // forceRawGpsLines
-        forceRawGpsLines.setToolTipText(tr("Force drawing of lines if the imported data contain no line information."));
-        forceRawGpsLines.setSelected(Main.pref.getBoolean("draw.rawgps.lines.force", false));
-        forceRawGpsLines.setEnabled(!drawRawGpsLinesNone.isSelected());
-        panel.add(forceRawGpsLines, GBC.eop().insets(40,0,0,0));
-
-        // drawGpsArrows
-        drawGpsArrows.addActionListener(new ActionListener(){
-            public void actionPerformed(ActionEvent e) {
-                drawGpsArrowsFast.setEnabled(drawGpsArrows.isSelected() && drawGpsArrows.isEnabled());
-                drawGpsArrowsMinDist.setEnabled(drawGpsArrows.isSelected() && drawGpsArrows.isEnabled());
-            }
-        });
-        drawGpsArrows.setToolTipText(tr("Draw direction arrows for lines, connecting GPS points."));
-        drawGpsArrows.setSelected(Main.pref.getBoolean("draw.rawgps.direction", false));
-        drawGpsArrows.setEnabled(!drawRawGpsLinesNone.isSelected());
-        panel.add(drawGpsArrows, GBC.eop().insets(40,0,0,0));
-
-        // drawGpsArrowsFast
-        drawGpsArrowsFast.setToolTipText(tr("Draw the direction arrows using table lookups instead of complex math."));
-        drawGpsArrowsFast.setSelected(Main.pref.getBoolean("draw.rawgps.alternatedirection", false));
-        drawGpsArrowsFast.setEnabled(drawGpsArrows.isSelected() && drawGpsArrows.isEnabled());
-        panel.add(drawGpsArrowsFast, GBC.eop().insets(60,0,0,0));
-
-        // drawGpsArrowsMinDist
-        drawGpsArrowsMinDist.setToolTipText(tr("Do not draw arrows if they are not at least this distance away from the last one."));
-        drawGpsArrowsMinDist.setText(Integer.toString(Main.pref.getInteger("draw.rawgps.min-arrow-distance", 40)));
-        drawGpsArrowsMinDist.setEnabled(drawGpsArrows.isSelected() && drawGpsArrows.isEnabled());
-        panel.add(new JLabel(tr("Minimum distance (pixels)")), GBC.std().insets(60,0,0,0));
-        panel.add(drawGpsArrowsMinDist, GBC.eol().fill(GBC.HORIZONTAL).insets(5,0,0,5));
-
-        // hdopCircleGpsPoints
-        hdopCircleGpsPoints.setSelected(Main.pref.getBoolean("draw.rawgps.hdopcircle", false));
-        hdopCircleGpsPoints.setToolTipText(tr("Draw a circle form HDOP value."));
-        panel.add(hdopCircleGpsPoints, GBC.eop().insets(20,0,0,0));
-
-        // largeGpsPoints
-        largeGpsPoints.setSelected(Main.pref.getBoolean("draw.rawgps.large", false));
-        largeGpsPoints.setToolTipText(tr("Draw larger dots for the GPS points."));
-        panel.add(largeGpsPoints, GBC.eop().insets(20,0,0,0));
-
-        // colorTracks
-        colorGroup = new ButtonGroup();
-        colorGroup.add(colorTypeNone);
-        colorGroup.add(colorTypeVelocity);
-        colorGroup.add(colorTypeDirection);
-        colorGroup.add(colorTypeDilution);
-
-        colorTypeVelocity.addChangeListener(new ChangeListener(){
-            public void stateChanged(ChangeEvent e) {
-                colorTypeVelocityTune.setEnabled(colorTypeVelocity.isSelected());
-                colorDynamic.setEnabled(colorTypeVelocity.isSelected() || colorTypeDilution.isSelected());
-            }
-        });
-        colorTypeDilution.addChangeListener(new ChangeListener(){
-            public void stateChanged(ChangeEvent e) {
-                colorDynamic.setEnabled(colorTypeVelocity.isSelected() || colorTypeDilution.isSelected());
-            }
-        });
-
-        switch(Main.pref.getInteger("draw.rawgps.colors", 0)) {
-        case 0:
-            colorTypeNone.setSelected(true);
-            break;
-        case 1:
-            colorTypeVelocity.setSelected(true);
-            break;
-        case 2:
-            colorTypeDilution.setSelected(true);
-            break;
-        case 3:
-            colorTypeDirection.setSelected(true);
-            break;
-        }
-
-        colorTypeNone.setToolTipText(tr("All points and track segments will have the same color. Can be customized in Layer Manager."));
-        colorTypeVelocity.setToolTipText(tr("Colors points and track segments by velocity."));
-        colorTypeDirection.setToolTipText(tr("Colors points and track segments by direction."));
-        colorTypeDilution.setToolTipText(tr("Colors points and track segments by dilution of position (HDOP). Your capture device needs to log that information."));
-
-        // color Tracks by Velocity Tune
-        int ccts = Main.pref.getInteger("draw.rawgps.colorTracksTune", 45);
-        colorTypeVelocityTune.setSelectedIndex(ccts==10 ? 2 : (ccts==20 ? 1 : 0));
-        colorTypeVelocityTune.setToolTipText(tr("Allows to tune the track coloring for different average speeds."));
-        colorTypeVelocityTune.setEnabled(colorTypeVelocity.isSelected() && colorTypeVelocity.isEnabled());
-
-        panel.add(Box.createVerticalGlue(), GBC.eol().insets(0, 20, 0, 0));
-
-        panel.add(new JLabel(tr("Track and Point Coloring")), GBC.eol().insets(20,0,0,0));
-        panel.add(colorTypeNone, GBC.eol().insets(40,0,0,0));
-        panel.add(colorTypeVelocity, GBC.std().insets(40,0,0,0));
-        panel.add(colorTypeVelocityTune, GBC.eop().insets(5,0,0,5));
-        panel.add(colorTypeDirection, GBC.eol().insets(40,0,0,0));
-        panel.add(colorTypeDilution, GBC.eol().insets(40,0,0,0));
-        colorDynamic.setToolTipText(tr("Colors points and track segments by data limits."));
-        colorDynamic.setSelected(Main.pref.getBoolean("draw.rawgps.colors.dynamic", false));
-        colorDynamic.setEnabled(colorTypeVelocity.isSelected() || colorTypeDilution.isSelected());
-        panel.add(colorDynamic, GBC.eop().insets(40,0,0,0));
-
-        // waypointLabel
-        panel.add(Box.createVerticalGlue(), GBC.eol().insets(0, 20, 0, 0));
-
-        waypointLabel.setSelectedIndex(Main.pref.getInteger("draw.rawgps.layer.wpt", 0 ));
-        panel.add(new JLabel(tr("Waypoint labelling")), GBC.std().insets(20,0,0,0));
-        panel.add(waypointLabel, GBC.eol().fill(GBC.HORIZONTAL).insets(5,0,0,5));
-
-        panel.add(Box.createVerticalGlue(), GBC.eol().fill(GBC.BOTH));
+        gpxPanel = new GPXSettingsPanel();
+        JPanel panel = gpxPanel;
+        
         JScrollPane scrollpane = new JScrollPane(panel);
         scrollpane.setBorder(BorderFactory.createEmptyBorder( 0, 0, 0, 0 ));
@@ -303 +119 @@
 
     public boolean ok() {
-        Main.pref.put("marker.makeautomarkers", makeAutoMarkers.isSelected());
+        gpxPanel.savePreferences();
         Main.pref.put("draw.data.area_outline_only", outlineOnly.isSelected());
-        Main.pref.put("draw.rawgps.lines", drawRawGpsLinesAll.isSelected());
-        Main.pref.put("draw.rawgps.lines.local", drawRawGpsLinesAll.isSelected() || drawRawGpsLinesLocal.isSelected());
-        Main.pref.put("draw.rawgps.max-line-length", drawRawGpsMaxLineLength.getText());
-        Main.pref.put("draw.rawgps.max-line-length.local", drawRawGpsMaxLineLengthLocal.getText());
-        Main.pref.put("draw.rawgps.lines.force", forceRawGpsLines.isSelected());
-        Main.pref.put("draw.rawgps.direction", drawGpsArrows.isSelected());
-        Main.pref.put("draw.rawgps.alternatedirection", drawGpsArrowsFast.isSelected());
-        Main.pref.put("draw.rawgps.min-arrow-distance", drawGpsArrowsMinDist.getText());
-        Main.pref.put("draw.rawgps.colors.dynamic", colorDynamic.isSelected());
-        if(colorTypeVelocity.isSelected()) {
-            Main.pref.putInteger("draw.rawgps.colors", 1);
-        } else if(colorTypeDilution.isSelected()) {
-            Main.pref.putInteger("draw.rawgps.colors", 2);
-        } else if(colorTypeDirection.isSelected()) {
-            Main.pref.putInteger("draw.rawgps.colors", 3);
-        } else {
-            Main.pref.putInteger("draw.rawgps.colors", 0);
-        }
-        int ccti=colorTypeVelocityTune.getSelectedIndex();
-        Main.pref.putInteger("draw.rawgps.colorTracksTune", ccti==2 ? 10 : (ccti==1 ? 20 : 45));
-        Main.pref.put("draw.rawgps.hdopcircle", hdopCircleGpsPoints.isSelected());
-        Main.pref.put("draw.rawgps.large", largeGpsPoints.isSelected());
         Main.pref.put("draw.segment.direction", directionHint.isSelected());
         Main.pref.put("draw.segment.head_only", headArrow.isSelected());
@@ -344 +138 @@
         }
         Main.pref.putInteger("mappaint.node.virtual-size", vn);
-        Main.pref.putInteger("draw.rawgps.layer.wpt", waypointLabel.getSelectedIndex());
         return false;
     }