Changeset 19316 in josm for trunk/src/org/openstreetmap/josm/gui/preferences/display/GPXSettingsPanel.java

Timestamp:

2025-02-14T10:20:59+01:00 (14 months ago)

Author:

stoecker

Message:

support 2 more circle drawing data sources for NMEA, patch by StephaneP (slightly modified), fix #21007

File:

• trunk/src/org/openstreetmap/josm/gui/preferences/display/GPXSettingsPanel.java (modified) (6 diffs)

trunk/src/org/openstreetmap/josm/gui/preferences/display/GPXSettingsPanel.java

@@ -21 +21 @@
 import javax.swing.ButtonGroup;
 import javax.swing.JCheckBox;
+import javax.swing.JComboBox;
 import javax.swing.JLabel;
 import javax.swing.JOptionPane;
@@ -66 +67 @@
     private final JCheckBox forceRawGpsLines = new JCheckBox(tr("Force lines if no segments imported"));
     private final JCheckBox largeGpsPoints = new JCheckBox(tr("Draw large GPS points"));
-    private final JCheckBox hdopCircleGpsPoints = new JCheckBox(tr("Draw a circle from HDOP value"));
+    private final JCheckBox circleGpsPoints = new JCheckBox(tr("Draw a circle from value"));
+    private final JComboBox<String> circleDataSource = new JosmComboBox<>(new String[] {tr("Hdop"), tr("Horizontal deviation estimate"), tr("Age of correction data")}); 
     private final JRadioButton colorTypeVelocity = new JRadioButton(tr("Velocity (red = slow, green = fast)"));
     private final JRadioButton colorTypeDirection = new JRadioButton(tr("Direction (red = west, yellow = north, green = east, blue = south)"));
@@ -133 +135 @@
         m.put("markers.pattern", Marker.LABEL_PATTERN_AUTO);
         m.put("markers.audio.pattern", "?{ '{name}' | '{desc}' | '{" + Marker.MARKER_FORMATTED_OFFSET + "}' }");
-        m.put("points.hdopcircle", false);
+        m.put("points.circle", false);
+        m.put("points.circle.data.source", 0);
         m.put("points.large", false);
         m.put("points.large.alpha", -1); //Expert mode only
@@ -421 +424 @@
         add(drawGpsArrowsMinDist, GBC.eol().fill(GBC.HORIZONTAL).insets(5, 0, 0, 5));
 
-        // hdopCircleGpsPoints
-        hdopCircleGpsPoints.setToolTipText(tr("Draw a circle from HDOP value"));
-        add(hdopCircleGpsPoints, GBC.eop().insets(20, 0, 0, 0));
-        ExpertToggleAction.addVisibilitySwitcher(hdopCircleGpsPoints);
+        // circleGpsPoints
+        circleGpsPoints.addItemListener(e -> {circleDataSource.setEnabled(circleGpsPoints.isSelected());});
+        circleGpsPoints.setToolTipText(tr("Draw a circle from value"));
+        circleDataSource.setToolTipText(tr("Source of the circle size"));
+        circleDataSource.setEnabled(false);
+
+        add(circleGpsPoints, GBC.std().insets(20, 0, 0, 0));
+        add(circleDataSource, GBC.eop().fill(GBC.HORIZONTAL).insets(5, 0, 0, 5));
+        ExpertToggleAction.addVisibilitySwitcher(circleGpsPoints);
+        ExpertToggleAction.addVisibilitySwitcher(circleDataSource);
 
         // largeGpsPoints
@@ -623 +632 @@
         drawGpsArrowsFast.setSelected(prefBool("lines.arrows.fast"));
         drawGpsArrowsMinDist.setText(pref("lines.arrows.min-distance"));
-        hdopCircleGpsPoints.setSelected(prefBool("points.hdopcircle"));
+        circleGpsPoints.setSelected(prefBool("points.circle"));
+        circleDataSource.setSelectedIndex(prefInt("points.circle.data.source"));
         largeGpsPoints.setSelected(prefBool("points.large"));
         useGpsAntialiasing.setSelected(Config.getPref().getBoolean("mappaint.gpx.use-antialiasing", false));
@@ -699 +709 @@
         }
 
-        putPref("points.hdopcircle", hdopCircleGpsPoints.isSelected());
+        putPref("points.circle", circleGpsPoints.isSelected());
+        putPref("points.circle.data.source", circleDataSource.getSelectedIndex());
         putPref("points.large", largeGpsPoints.isSelected());
         putPref("lines.width", drawLineWidth.getText());