Changeset 36330 in osm for applications/editors

Timestamp:

2024-09-05T10:36:28+02:00 (4 months ago)

Author:

stoecker

Message:

add target display, patch by Pauline Thiele

Location:

applications/editors/josm/plugins/livegps/src/livegps

Files:

• CirclePanel.java (added)
• DrawPoint.java (added)
• LiveGPSPreferences.java (modified) (5 diffs)
• LiveGpsData.java (modified) (3 diffs)
• LiveGpsDialog.java (modified) (10 diffs)
• LiveGpsPlugin.java (modified) (3 diffs)
• LiveGpsStatus.java (modified) (1 diff)

applications/editors/josm/plugins/livegps/src/livegps/LiveGPSPreferences.java

@@ -6 +6 @@
 import java.awt.GridBagConstraints;
 import java.awt.GridBagLayout;
+
+//import java.beans.PropertyChangeEvent;
+//import java.beans.PropertyChangeListener;
 
 import javax.swing.Box;
@@ -34 +37 @@
     /* option to use specify gpsd disabling */
     public static final String C_DISABLED = "livegps.gpsd.disabled";
+    /* option to use distance visualisation and set threshold */
+    public static final String C_DISTANCE_VISUALISATION = "livegps.distance_visualisation";
+    public static final String C_OFFSET_THRESHOLD = "livegps.offset_threshold";
+    public static final double DEFAULT_THRESHOLD = 0.3;
 
     public static final String C_LIVEGPS_COLOR_POSITION = "color.livegps.position";
@@ -61 +68 @@
     private final JCheckBox disableGPSD = new JCheckBox(tr("Disable GPSD"));
     private final JCheckBox showOffset = new JCheckBox(tr("Show Distance to nearest way"));
+    private final JCheckBox showDistanceVisualisation = new JCheckBox(tr("Show distance visualisation"));
+    private final JTextField threshold = new JTextField(5);
+    private JLabel thresholdLabel;
 
     public LiveGPSPreferences() {
@@ -96 +106 @@
         panel.add(showOffset, GBC.eol().fill(GridBagConstraints.HORIZONTAL).insets(0, 0, 0, 5));
 
+        showDistanceVisualisation.setSelected(Config.getPref().getBoolean(C_DISTANCE_VISUALISATION, false));
+        panel.add(showDistanceVisualisation, GBC.eol().fill(GridBagConstraints.HORIZONTAL).insets(0, 0, 0, 5));
+
+        threshold.setText(String.valueOf(Config.getPref().getDouble(C_OFFSET_THRESHOLD, DEFAULT_THRESHOLD)));
+        threshold.setToolTipText(tr("Threshold, default is {0}", DEFAULT_THRESHOLD));
+        thresholdLabel = new JLabel(tr("Threshold"));
+        panel.add(thresholdLabel, GBC.std());
+        panel.add(threshold, GBC.eol().fill(GridBagConstraints.HORIZONTAL).insets(5, 0, 0, 5));
+        threshold.setVisible(false);
+        thresholdLabel.setVisible(false);
+
+        updateThreshold(); // beim Start
+        showDistanceVisualisation.addActionListener(e -> updateThreshold()); // wenn sich was ändert
+
         panel.add(Box.createVerticalGlue(), GBC.eol().fill(GridBagConstraints.VERTICAL));
         createPreferenceTabWithScrollPane(gui, panel);
+    }
+
+    private void updateThreshold() {
+        boolean isVisible = showDistanceVisualisation.isSelected();
+
+        threshold.setVisible(isVisible);
+        thresholdLabel.setVisible(isVisible);
     }
 
@@ -107 +138 @@
         Config.getPref().putBoolean(C_DISABLED, disableGPSD.isSelected());
         Config.getPref().putBoolean(C_WAYOFFSET, showOffset.isSelected());
+        boolean oldVal = Config.getPref().getBoolean(C_DISTANCE_VISUALISATION, false);
+        boolean newVal = showDistanceVisualisation.isSelected();
+        Config.getPref().putBoolean(C_DISTANCE_VISUALISATION, newVal);
+        Config.getPref().put(C_OFFSET_THRESHOLD, threshold.getText());
+        if (oldVal != newVal) {
+            LiveGpsDialog.updateCirclePanelVisibility();
+        }
         return false;
     }

applications/editors/josm/plugins/livegps/src/livegps/LiveGpsData.java

@@ -32 +32 @@
     private WayPoint waypoint;
     private static final DecimalFormat offsetFormat = new DecimalFormat("0.00");
+    private double offs = 0;
 
     public LiveGpsData(double latitude, double longitude, float course, float speed) {
@@ -165 +166 @@
         return getClass().getSimpleName() + "[fix=" + fix + ", lat=" + latLon.lat()
         + ", long=" + latLon.lon() + ", speed=" + speed + ", course=" + course + ']';
+    }
+
+    public void setOffset(double offs) {
+        this.offs = offs;
+    }
+
+    public double getOffset() {
+        return this.offs;
     }
 
@@ -194 +203 @@
                 }
                 if (Config.getPref().getBoolean(LiveGPSPreferences.C_WAYOFFSET, false)) {
-                    double offs = Geometry.getDistanceWayNode(way, n);
+                    offs = Geometry.getDistanceWayNode(way, n);
                     WaySegment ws = Geometry.getClosestWaySegment(way, n);
                     if (!Geometry.angleIsClockwise(ws.getFirstNode(), ws.getSecondNode(), n))
-                        offs = -offs;
+                        setOffset(-offs);
                     /* I18N: side offset and way name for livegps way display with offset */
                     wayString = tr("{0} ({1})", offsetFormat.format(offs), wayString);

applications/editors/josm/plugins/livegps/src/livegps/LiveGpsDialog.java

@@ -5 +5 @@
 
 import java.awt.Color;
-import java.awt.GridLayout;
+import java.awt.BorderLayout;
+import java.awt.GridBagLayout;
+import java.awt.GridBagConstraints;
+
 import java.awt.event.KeyEvent;
+
 import java.beans.PropertyChangeEvent;
 import java.beans.PropertyChangeListener;
@@ -13 +17 @@
 import javax.swing.JPanel;
 import javax.swing.SwingUtilities;
+import javax.swing.UIManager;
 
 import org.openstreetmap.josm.data.coor.conversion.CoordinateFormatManager;
@@ -43 +48 @@
     private JLabel wayText;
     private JPanel panel;
+    private JPanel opanel;
+    private Color backgroundColor;
     private LiveGpsStatus status = new LiveGpsStatus(LiveGpsStatus.GpsStatus.CONNECTING, tr("Connecting"));
     private LiveGpsStatus nmeaStatus = new LiveGpsStatus(LiveGpsStatus.GpsStatus.CONNECTING, tr("Connecting"));
     private LiveGpsData data;
+    private CirclePanel circlePanel;
+
+    private static volatile LiveGpsDialog dialog;
 
     public LiveGpsDialog(final MapFrame mapFrame) {
@@ -51 +61 @@
         Shortcut.registerShortcut("subwindow:livegps", tr("Toggle: {0}", tr("Live GPS")),
         KeyEvent.VK_G, Shortcut.ALT_CTRL_SHIFT), 100);
+
+        dialog = this;
+
+        backgroundColor = UIManager.getColor("Panel.background");
+
+        opanel = new JPanel();
+        opanel.setLayout(new BorderLayout());
+
         panel = new JPanel();
-        panel.setLayout(new GridLayout(7, 2));
-        panel.add(statusText = new JLabel(tr("Status gpsd")));
-        panel.add(statusLabel = new JLabel());
-        panel.add(nmeaStatusText = new JLabel(tr("Status NMEA")));
-        panel.add(nmeaStatusLabel = new JLabel());
-        panel.add(wayText = new JLabel(tr("Way Info")));
-        panel.add(wayLabel = new JLabel());
-        panel.add(latText = new JLabel(tr("Latitude")));
-        panel.add(latLabel = new JLabel());
-        panel.add(longText = new JLabel(tr("Longitude")));
-        panel.add(longLabel = new JLabel());
-        panel.add(new JLabel(tr("Speed")));
-        panel.add(speedLabel = new JLabel());
-        panel.add(new JLabel(tr("Course")));
-        panel.add(courseLabel = new JLabel());
+
+        GridBagLayout layout = new GridBagLayout();
+        panel.setLayout(layout);
+        GridBagConstraints gbc = new GridBagConstraints();
+
+        // first column
+        gbc.weightx = 0.3;
+        gbc.gridx = 0;
+        gbc.anchor = GridBagConstraints.WEST;
+        gbc.fill = GridBagConstraints.HORIZONTAL;
+
+        panel.add(statusText = new JLabel("Status gpsd "), gbc);
+        panel.add(nmeaStatusText = new JLabel("Status NMEA "), gbc);
+        panel.add(wayText = new JLabel("Way Info"), gbc);
+        panel.add(latText = new JLabel("Latitude"), gbc);
+        panel.add(longText = new JLabel("Longitude"), gbc);
+        panel.add(new JLabel(tr("Speed")), gbc);
+        panel.add(new JLabel(tr("Course")), gbc);
+
+        // second column
+        gbc.weightx = 0.7;
+        gbc.gridx = 1;
+        gbc.fill = GridBagConstraints.HORIZONTAL;
+
+        panel.add(statusLabel = new JLabel(), gbc);
+        panel.add(nmeaStatusLabel = new JLabel(), gbc);
+        panel.add(wayLabel = new JLabel(), gbc);
+        panel.add(latLabel = new JLabel(), gbc);
+        panel.add(longLabel = new JLabel(), gbc);
+        panel.add(speedLabel = new JLabel(), gbc);
+        panel.add(courseLabel = new JLabel(), gbc);
+
+        opanel.add(panel, BorderLayout.NORTH);
+
+        addPropertyChangeListener(new PropertyChangeListener() {
+            @Override
+            public void propertyChange(PropertyChangeEvent evt) {
+                updateCirclePanelVisibility();
+            }
+        });
+
+        circlePanel = new CirclePanel(0);
+        opanel.add(circlePanel, BorderLayout.CENTER);
+
         setStatusVisibility(true);
         if (Config.getPref().getBoolean(LiveGPSPreferences.C_WAYOFFSET, false)) {
@@ -74 +121 @@
             wayText.setText(tr("Way Info"));
         }
-        createLayout(panel, true, null);
+        createLayout(opanel, true, null);
+    }
+
+    public static void updateCirclePanelVisibility() {
+        if (dialog != null) {
+            boolean vis = Config.getPref().getBoolean(LiveGPSPreferences.C_DISTANCE_VISUALISATION, false);
+
+            dialog.circlePanel.setVisible(vis);
+
+            dialog.circlePanel.revalidate();
+            dialog.circlePanel.repaint();
+        }
     }
 
@@ -108 +166 @@
             public void run() {
                 if (data.isFix()) {
-                    panel.setBackground(Color.WHITE);
+                    panel.setBackground(backgroundColor);
                     ICoordinateFormat mCord = CoordinateFormatManager.getDefaultFormat();
                     if (ProjectedCoordinateFormat.INSTANCE.equals(mCord)) {
@@ -126 +184 @@
                     String wayString = data.getWayInfo();
                     if (!wayString.isEmpty()) {
-                        wayLabel.setText(wayString);
+                        wayLabel.setText(tr("<html><body width={0}>{1}</html>", (int) getWidth()*0.8, wayString));
+
+                        circlePanel.setOffset(data.getOffset());
+                        circlePanel.setBackground(backgroundColor);
+                        circlePanel.validate();
+                        circlePanel.repaint();
+
                     } else {
                         wayLabel.setText(tr("unknown"));
@@ -136 +200 @@
                         wayText.setText(tr("Way Info"));
                     }
+
                 } else {
                     latLabel.setText("");
@@ -143 +208 @@
                     panel.setBackground(Color.RED);
                 }
-            } });
+            }
+
+            });
         } else if ("gpsstatus".equals(evt.getPropertyName())) {
             LiveGpsStatus oldStatus = status;
@@ -162 +229 @@
                     panel.setBackground(Color.RED);
                 } else {
-                    panel.setBackground(Color.WHITE);
+                    panel.setBackground(backgroundColor);
                 }
             } });

applications/editors/josm/plugins/livegps/src/livegps/LiveGpsPlugin.java

@@ -48 +48 @@
     private LiveGpsLayer lgpslayer = null;
 
+    /**
+     * Main action to start data capture
+     */
     public class CaptureAction extends JosmAction {
         public CaptureAction() {
@@ -65 +68 @@
     }
 
+    /**
+     * Center view to newest data
+     */
     public class CenterAction extends JosmAction {
         public CenterAction() {
@@ -82 +88 @@
     }
 
+    /**
+     * Automatically center view to newest data
+     */
     public class AutoCenterAction extends JosmAction {
         public AutoCenterAction() {

applications/editors/josm/plugins/livegps/src/livegps/LiveGpsStatus.java

@@ -7 +7 @@
  */
 public class LiveGpsStatus {
+    /**
+     * Possible status of LiveGPS data input
+     */
     public enum GpsStatus {
         CONNECTING, CONNECTED, DISCONNECTED, CONNECTION_FAILED