Changeset 1165 in josm for trunk/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java

Timestamp:

2008-12-23T14:05:09+01:00 (15 years ago)

Author:

stoecker

Message:

fix bug #1607 and #1833

File:

• trunk/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java (modified) (14 diffs)

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

@@ -7 +7 @@
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
+import java.awt.GridBagLayout;
 
+import javax.swing.BorderFactory;
 import javax.swing.JCheckBox;
 import javax.swing.JLabel;
 import javax.swing.JTextField;
+import javax.swing.JScrollPane;
+import javax.swing.JPanel;
+import javax.swing.Box;
 
 import org.openstreetmap.josm.Main;
@@ -25 +30 @@
         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 interestingDirections = new JCheckBox(tr("Only interesting direction hints (e.g. with oneway tag)."));
         private JCheckBox segmentOrderNumber = new JCheckBox(tr("Draw segment order numbers"));
@@ -31 +37 @@
         private JCheckBox inactive = new JCheckBox(tr("Draw inactive layers in other color"));
         private JCheckBox useAntialiasing = new JCheckBox(tr("Smooth map graphics (antialiasing)"));
-        private JCheckBox showSplashScreen = new JCheckBox(tr("Show splash screen at startup"));
 
         public void addGui(PreferenceDialog gui) {
             gui.display.setPreferredSize(new Dimension(400,600));
+        JPanel panel = new JPanel(new GridBagLayout());
+        panel.setBorder(BorderFactory.createEmptyBorder(5,5,5,5));
+
             // drawRawGpsLines
                 drawRawGpsLines.addActionListener(new ActionListener(){
@@ -42 +50 @@
                             drawGpsArrows.setEnabled(drawRawGpsLines.isSelected());
                             drawGpsArrowsFast.setEnabled(drawGpsArrows.isSelected() && drawGpsArrows.isEnabled());
+                            drawGpsArrowsMinDist.setEnabled(drawGpsArrows.isSelected() && drawGpsArrows.isEnabled());
                             colorTracks.setEnabled(drawRawGpsLines.isSelected());
                         }
@@ -47 +56 @@
                 drawRawGpsLines.setSelected(Main.pref.getBoolean("draw.rawgps.lines"));
                 drawRawGpsLines.setToolTipText(tr("If your gps device draw too few lines, select this to draw lines along your way."));
-                gui.display.add(drawRawGpsLines, GBC.eol().insets(20,0,0,0));
+                panel.add(drawRawGpsLines, GBC.eol().insets(20,0,0,0));
 
                 // drawRawGpsMaxLineLength
-                drawRawGpsMaxLineLength.setText(Main.pref.get("draw.rawgps.max-line-length", "-1"));
+                drawRawGpsMaxLineLength.setText(Integer.toString(Main.pref.getInteger("draw.rawgps.max-line-length", -1)));
                 drawRawGpsMaxLineLength.setToolTipText(tr("Maximum length (in meters) to draw lines. Set to '-1' to draw all lines."));
                 drawRawGpsMaxLineLength.setEnabled(drawRawGpsLines.isSelected());
-                gui.display.add(new JLabel(tr("Maximum length (meters)")), GBC.std().insets(40,0,0,0));
-                gui.display.add(drawRawGpsMaxLineLength, GBC.eol().fill(GBC.HORIZONTAL).insets(5,0,0,5));
+                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
@@ -60 +69 @@
                 forceRawGpsLines.setSelected(Main.pref.getBoolean("draw.rawgps.lines.force"));
                 forceRawGpsLines.setEnabled(drawRawGpsLines.isSelected());
-                gui.display.add(forceRawGpsLines, GBC.eop().insets(40,0,0,0));
+                panel.add(forceRawGpsLines, GBC.eop().insets(40,0,0,0));
                 
                 // drawGpsArrows
@@ -66 +75 @@
                         public void actionPerformed(ActionEvent e) {
                             drawGpsArrowsFast.setEnabled(drawGpsArrows.isSelected() && drawGpsArrows.isEnabled());
+                            drawGpsArrowsMinDist.setEnabled(drawGpsArrows.isSelected() && drawGpsArrows.isEnabled());
                         }
                 });
@@ -71 +81 @@
                 drawGpsArrows.setSelected(Main.pref.getBoolean("draw.rawgps.direction"));
                 drawGpsArrows.setEnabled(drawRawGpsLines.isSelected());
-                gui.display.add(drawGpsArrows, GBC.eop().insets(40,0,0,0));
+                panel.add(drawGpsArrows, GBC.eop().insets(40,0,0,0));
 
                 // drawGpsArrowsFast
@@ -77 +87 @@
                 drawGpsArrowsFast.setSelected(Main.pref.getBoolean("draw.rawgps.alternatedirection"));
                 drawGpsArrowsFast.setEnabled(drawGpsArrows.isSelected() && drawGpsArrows.isEnabled());
-                gui.display.add(drawGpsArrowsFast, GBC.eop().insets(60,0,0,0));
+                panel.add(drawGpsArrowsFast, GBC.eop().insets(60,0,0,0));
+
+                // drawGpsArrowsMinDist
+                drawGpsArrowsMinDist.setToolTipText(tr("Don't 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", 0)));
+                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));
 
                 // colorTracks
@@ -83 +100 @@
                 colorTracks.setToolTipText(tr("Choose the hue for the track color by the velocity at that point."));
                 colorTracks.setEnabled(drawRawGpsLines.isSelected());
-                gui.display.add(colorTracks, GBC.eop().insets(40,0,0,0));
+                panel.add(colorTracks, GBC.eop().insets(40,0,0,0));
                 
                 // largeGpsPoints
                 largeGpsPoints.setSelected(Main.pref.getBoolean("draw.rawgps.large"));
                 largeGpsPoints.setToolTipText(tr("Draw larger dots for the GPS points."));
-                gui.display.add(largeGpsPoints, GBC.eop().insets(20,0,0,0));
+                panel.add(largeGpsPoints, GBC.eop().insets(20,0,0,0));
                 
+                panel.add(Box.createVerticalGlue(), GBC.eol().fill(GBC.BOTH));
+                JScrollPane scrollpane = new JScrollPane(panel);
+                scrollpane.setBorder(BorderFactory.createEmptyBorder( 0, 0, 0, 0 ));
+                gui.displaycontent.addTab(tr("GPS Points"), scrollpane);
+                panel = new JPanel(new GridBagLayout());
+                panel.setBorder(BorderFactory.createEmptyBorder(5,5,5,5));
+
                 // directionHint
                 directionHint.addActionListener(new ActionListener(){
@@ -103 +127 @@
                 directionHint.setToolTipText(tr("Draw direction hints for way segments."));
                 directionHint.setSelected(Main.pref.getBoolean("draw.segment.direction"));
-                gui.display.add(directionHint, GBC.eop().insets(20,0,0,0));
+                panel.add(directionHint, GBC.eop().insets(20,0,0,0));
 
                 // only interesting directions
@@ -109 +133 @@
                 interestingDirections.setSelected(Main.pref.getBoolean("draw.segment.relevant_directions_only"));
                 interestingDirections.setEnabled(directionHint.isSelected());
-                gui.display.add(interestingDirections, GBC.eop().insets(40,0,0,0));
+                panel.add(interestingDirections, GBC.eop().insets(40,0,0,0));
                 
                 // segment order number
                 segmentOrderNumber.setToolTipText(tr("Draw the order numbers of all segments within their way."));
                 segmentOrderNumber.setSelected(Main.pref.getBoolean("draw.segment.order_number"));
-                gui.display.add(segmentOrderNumber, GBC.eop().insets(20,0,0,0));
+                panel.add(segmentOrderNumber, GBC.eop().insets(20,0,0,0));
                 
                 // antialiasing
                 useAntialiasing.setToolTipText(tr("Apply antialiasing to the map view resulting in a smoother appearance."));
                 useAntialiasing.setSelected(Main.pref.getBoolean("mappaint.use-antialiasing"));
-                gui.display.add(useAntialiasing, GBC.eop().insets(20,0,0,0));
+                panel.add(useAntialiasing, GBC.eop().insets(20,0,0,0));
                 
                 // downloaded area
                 sourceBounds.setToolTipText(tr("Draw the boundaries of data loaded from the server."));
                 sourceBounds.setSelected(Main.pref.getBoolean("draw.data.downloaded_area", true));
-                gui.display.add(sourceBounds, GBC.eop().insets(20,0,0,0));
+                panel.add(sourceBounds, GBC.eop().insets(20,0,0,0));
 
                 // virtual nodes
                 virtualNodes.setToolTipText(tr("Draw virtual nodes in select mode for easy way modification."));
                 virtualNodes.setSelected(Main.pref.getInteger("mappaint.node.virtual-size", 8) != 0);
-                gui.display.add(virtualNodes, GBC.eop().insets(20,0,0,0));
+                panel.add(virtualNodes, GBC.eop().insets(20,0,0,0));
 
                 // background layers in inactive color
                 inactive.setToolTipText(tr("Draw the inactive data layers in a different color."));
                 inactive.setSelected(Main.pref.getBoolean("draw.data.inactive_color", true));
-                gui.display.add(inactive, GBC.eop().insets(20,0,0,0));
+                panel.add(inactive, GBC.eop().insets(20,0,0,0));
 
-                // Show splash screen on startup
-                showSplashScreen.setToolTipText(tr("Show splash screen at startup"));
-                showSplashScreen.setSelected(Main.pref.getBoolean("draw.splashscreen", true));
-                gui.display.add(showSplashScreen, GBC.eop().insets(20, 0, 0, 0));
+                panel.add(Box.createVerticalGlue(), GBC.eol().fill(GBC.BOTH));
+                scrollpane = new JScrollPane(panel);
+                scrollpane.setBorder(BorderFactory.createEmptyBorder( 0, 0, 0, 0 ));
+                gui.displaycontent.addTab(tr("OSM Data"), scrollpane);
         }
 
@@ -148 +172 @@
                 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", colorTracks.isSelected());
                 Main.pref.put("draw.rawgps.large", largeGpsPoints.isSelected());
@@ -156 +181 @@
                 Main.pref.put("draw.data.inactive_color", inactive.isSelected());
                 Main.pref.put("mappaint.use-antialiasing", useAntialiasing.isSelected());
-                Main.pref.put("draw.splashscreen", showSplashScreen.isSelected());
                 int vn = Main.pref.getInteger("mappaint.node.virtual-size", 8);
                 if(virtualNodes.isSelected()) { if (vn < 1) vn = 8; }