Changeset 18738 in josm for trunk/src/org

Timestamp:

2023-05-30T15:39:05+02:00 (18 months ago)

Author:

stoecker

Message:

add NMEA track coloring by reference ID

Location:

trunk/src/org/openstreetmap/josm

Files:

• gui/layer/gpx/GpxDrawHelper.java (modified) (8 diffs)
• gui/preferences/display/GPXSettingsPanel.java (modified) (6 diffs)
• io/nmea/NmeaReader.java (modified) (1 diff)
• tools/ColorScale.java (modified) (3 diffs)

trunk/src/org/openstreetmap/josm/gui/layer/gpx/GpxDrawHelper.java

@@ -134 +134 @@
     private ColorScale qualityScale;
     private ColorScale fixScale;
+    private ColorScale refScale;
     private ColorScale dateScale;
     private ColorScale directionScale;
@@ -243 +244 @@
         qualityScale = ColorScale.createFixedScale(rtkLibQualityColors).addTitle(tr("Quality")).addColorBarTitles(rtkLibQualityNames);
         fixScale = ColorScale.createFixedScale(gpsFixQualityColors).addTitle(tr("GPS fix")).addColorBarTitles(gpsFixQualityNames);
+        refScale = ColorScale.createCyclicScale(1).addTitle(tr("GPS ref"));
         dateScale = ColorScale.createHSBScale(256).addTitle(tr("Time"));
         directionScale = ColorScale.createCyclicScale(256).setIntervalCount(4).addTitle(tr("Direction"));
@@ -291 +293 @@
          * Color by GPS fix
          */
-        FIX;
+        FIX,
+        /**
+         * Color by differential ID
+         */
+        REF;
 
         static ColorMode fromIndex(final int index) {
@@ -393 +399 @@
         qualityScale.setNoDataColor(neutralColor);
         fixScale.setNoDataColor(neutralColor);
+        refScale.setNoDataColor(neutralColor);
         directionScale.setNoDataColor(neutralColor);
 
@@ -609 +616 @@
             qualityScale.setRange(1, rtkLibQualityColors.length);
             fixScale.setRange(0, gpsFixQualityColors.length);
+            refScale.setRange(0, gpsFixQualityColors.length);
         }
         double now = System.currentTimeMillis()/1000.0;
@@ -618 +626 @@
         }
 
+        ArrayList<String> refs = new ArrayList<String>();
+        if(colored == ColorMode.REF) {
+            for (Line segment : getLinesIterable(null)) {
+                for (WayPoint trkPnt : segment) {
+                    if (trkPnt.get(GpxConstants.PT_DGPSID) != null) {
+                        String refval = trkPnt.get(GpxConstants.PT_DGPSID).toString();
+                        int i = refs.indexOf(refval);
+                        if(i < 0) {
+                            refs.add(refval);
+                        }
+                    }
+                }
+            }
+            if(refs.size() > 0) {
+                Collections.sort(refs);
+                String[] a = {};
+                refScale = ColorScale.createCyclicScale(refs.size()).addTitle(tr("GPS ref")).addColorBarTitles(refs.toArray(a));
+                refScale.setRange(0, refs.size());
+            }
+        }
         // Now the colors for all the points will be assigned
         for (Line segment : getLinesIterable(null)) {
@@ -641 +669 @@
                         if (fix >= 0) {
                             color = fixScale.getColor(fix);
+                        }
+                    }
+                } else if (colored == ColorMode.REF) {
+                    if (trkPnt.get(GpxConstants.PT_DGPSID) != null) {
+                        String refval = trkPnt.get(GpxConstants.PT_DGPSID).toString();
+                        int i = refs.indexOf(refval);
+                        if (i >= 0) {
+                            color = refScale.getColor(i);
                         }
                     }
@@ -1572 +1608 @@
         } else if (colored == ColorMode.FIX) {
             fixScale.drawColorBar(g, w-30, 50, 20, 175, 1.0);
+        } else if (colored == ColorMode.REF) {
+            refScale.drawColorBar(g, w-30, 50, 20, 175, 1.0);
         } else if (colored == ColorMode.VELOCITY) {
             SystemOfMeasurement som = SystemOfMeasurement.getSystemOfMeasurement();

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

@@ -72 +72 @@
     private final JRadioButton colorTypeQuality = new JRadioButton(tr("Quality (RTKLib only, if available)"));
     private final JRadioButton colorTypeFix = new JRadioButton(tr("GPS fix value"));
+    private final JRadioButton colorTypeRef = new JRadioButton(tr("GPS reference ID"));
     private final JRadioButton colorTypeTime = new JRadioButton(tr("Track date"));
     private final JRadioButton colorTypeHeatMap = new JRadioButton(tr("Heat Map (dark = few, bright = many)"));
@@ -455 +456 @@
         colorGroup.add(colorTypeQuality);
         colorGroup.add(colorTypeFix);
+        colorGroup.add(colorTypeRef);
         colorGroup.add(colorTypeTime);
         colorGroup.add(colorTypeHeatMap);
@@ -466 +468 @@
                 tr("Colors points and track segments by RTKLib quality flag (Q). Your capture device needs to log that information."));
         colorTypeFix.setToolTipText(tr("Colors points and track segments by GPS fix value."));
+        colorTypeRef.setToolTipText(tr("Colors points and track segments by GPS reference ID."));
         colorTypeTime.setToolTipText(tr("Colors points and track segments by its timestamp."));
         colorTypeHeatMap.setToolTipText(tr("Collected points and track segments for a position and displayed as heat map."));
@@ -488 +491 @@
         add(colorTypeQuality, GBC.eol().insets(40, 0, 0, 0));
         add(colorTypeFix, GBC.eol().insets(40, 0, 0, 0));
+        add(colorTypeRef, GBC.eol().insets(40, 0, 0, 0));
         add(colorTypeTime, GBC.eol().insets(40, 0, 0, 0));
         add(colorTypeHeatMap, GBC.std().insets(40, 0, 0, 0));
@@ -642 +646 @@
             case 6: colorTypeQuality.setSelected(true); break;
             case 7: colorTypeFix.setSelected(true); break;
+            case 8: colorTypeRef.setSelected(true); break;
             default: Logging.warn("Unknown color type: " + colorType);
             }
@@ -720 +725 @@
         } else if (colorTypeFix.isSelected()) {
             putPref("colormode", 7);
+        } else if (colorTypeRef.isSelected()) {
+            putPref("colormode", 8);
         } else {
             putPref("colormode", 0);

trunk/src/org/openstreetmap/josm/io/nmea/NmeaReader.java

@@ -432 +432 @@
                     }
                 }
+                // h-dilution
+                accu = e[GGA.REF.position];
+                if (!accu.isEmpty()) {
+                    currentwp.put(GpxConstants.PT_DGPSID, accu);
+                }
             } else if (isSentence(e[0], Sentence.VTG)) {
                 // COURSE

trunk/src/org/openstreetmap/josm/tools/ColorScale.java

@@ -73 +73 @@
         for (int i = 0; i < sc.colors.length; i++) {
 
-            float angle = i / 256f * 4;
+            float angle = i * 4f / count;
             int quadrant = (int) angle;
             angle -= quadrant;
@@ -236 +236 @@
     public void drawColorBar(Graphics2D g, int x, int y, int w, int h, double valueScale) {
         int n = colors.length;
-
         for (int i = 0; i < n; i++) {
             g.setColor(colors[i]);
@@ -269 +268 @@
                 txt = String.format("%.3f", val*valueScale);
             }
-            if (w < h) {
+            if (intervalCount == 0) {
+                g.drawString(txt, x-fw-3, y+h/2+fh/2);
+            } else if (w < h) {
                 g.drawString(txt, x-fw-3, y+i*h/intervalCount+fh/2);
             } else {