Changeset 15247 in josm for trunk/src/org/openstreetmap/josm/gui/layer

Timestamp:

2019-07-14T02:26:22+02:00 (5 years ago)

Author:

Don-vip

Message:

see #17829 - support RTKLib Positioning Solution files. Add new "Quality" GPX color mode

Location:

trunk/src/org/openstreetmap/josm/gui/layer

Files:

• geoimage/CorrelateGpxWithImages.java (modified) (2 diffs)
• gpx/GpxDrawHelper.java (modified) (8 diffs)

trunk/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java

@@ -79 +79 @@
 import org.openstreetmap.josm.gui.io.importexport.JpgImporter;
 import org.openstreetmap.josm.gui.io.importexport.NMEAImporter;
+import org.openstreetmap.josm.gui.io.importexport.RtkLibImporter;
 import org.openstreetmap.josm.gui.layer.GpxLayer;
 import org.openstreetmap.josm.gui.layer.Layer;
@@ -267 +268 @@
             ExtensionFileFilter gpxFilter = GpxImporter.getFileFilter();
             AbstractFileChooser fc = new FileChooserManager(true, null).createFileChooser(false, null,
-                    Arrays.asList(gpxFilter, NMEAImporter.FILE_FILTER), gpxFilter, JFileChooser.FILES_ONLY).openFileChooser();
+                    Arrays.asList(gpxFilter, NMEAImporter.FILE_FILTER, RtkLibImporter.FILE_FILTER), gpxFilter, JFileChooser.FILES_ONLY)
+                    .openFileChooser();
             if (fc == null)
                 return;

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

@@ -126 +126 @@
     /** Colors (without custom alpha channel, if given) for HDOP painting. **/
     private ColorScale hdopScale;
+    private ColorScale qualityScale;
     private ColorScale dateScale;
     private ColorScale directionScale;
@@ -177 +178 @@
     private static Color[] heatMapLutColorJosmRed2Blue = createColorFromResource("red2blue");
 
+    private static Color[] rtkLibQualityColors = new Color[] {
+        Color.GREEN, // Fixed, solution by carrier‐based relative positioning and the integer ambiguity is properly resolved.
+        Color.ORANGE, // Float, solution by carrier‐based relative positioning but the integer ambiguity is not resolved.
+        Color.PINK, // Reserved
+        Color.BLUE, // DGPS, solution by code‐based DGPS solutions or single point positioning with SBAS corrections
+        Color.RED, // Single, solution by single point positioning
+        Color.CYAN // PPP
+    };
+
     // user defined heatmap color
     private Color[] heatMapLutColor = createColorLut(0, Color.BLACK, Color.WHITE);
@@ -188 +198 @@
         /** Colors (without custom alpha channel, if given) for HDOP painting. **/
         hdopScale = ColorScale.createHSBScale(256).makeReversed().addTitle(tr("HDOP"));
+        qualityScale = ColorScale.createFixedScale(rtkLibQualityColors).addTitle(tr("Quality"));
         dateScale = ColorScale.createHSBScale(256).addTitle(tr("Time"));
         directionScale = ColorScale.createCyclicScale(256).setIntervalCount(4).addTitle(tr("Direction"));
@@ -228 +239 @@
          * Color using a heatmap instead of normal lines
          */
-        HEATMAP;
+        HEATMAP,
+        /**
+         * Color by quality (RTKLib)
+         */
+        QUALITY;
 
         static ColorMode fromIndex(final int index) {
@@ -343 +358 @@
         dateScale.setNoDataColor(neutralColor);
         hdopScale.setNoDataColor(neutralColor);
+        qualityScale.setNoDataColor(neutralColor);
         directionScale.setNoDataColor(neutralColor);
 
@@ -557 +573 @@
             velocityScale.setRange(0, colorTracksTune);
             hdopScale.setRange(0, hdoprange);
+            qualityScale.setRange(1, rtkLibQualityColors.length);
         }
         double now = System.currentTimeMillis()/1000.0;
@@ -586 +603 @@
 
                 if (colored == ColorMode.HDOP) {
-                    Float hdop = (Float) trkPnt.get(GpxConstants.PT_HDOP);
-                    color = hdopScale.getColor(hdop);
+                    color = hdopScale.getColor((Float) trkPnt.get(GpxConstants.PT_HDOP));
+                } else if (colored == ColorMode.QUALITY) {
+                    color = qualityScale.getColor((Integer) trkPnt.get(GpxConstants.RTKLIB_Q));
                 }
                 if (oldWp != null) { // other coloring modes need segment for calcuation
@@ -1506 +1524 @@
         if (colored == ColorMode.HDOP) {
             hdopScale.drawColorBar(g, w-30, 50, 20, 100, 1.0);
+        } else if (colored == ColorMode.QUALITY) {
+            qualityScale.drawColorBar(g, w-30, 50, 20, 100, 1.0);
         } else if (colored == ColorMode.VELOCITY) {
             SystemOfMeasurement som = SystemOfMeasurement.getSystemOfMeasurement();