Changeset 5576 in ntrip for trunk/BNC/src/RTCM3

Timestamp:

Nov 25, 2013, 5:47:57 PM (11 years ago)

Author:

mervart

Message:

 

Location:

trunk/BNC/src/RTCM3

Files:

• RTCM3coDecoder.cpp (modified) (7 diffs)
• RTCM3coDecoder.h (modified) (2 diffs)

trunk/BNC/src/RTCM3/RTCM3coDecoder.cpp

@@ -82 +82 @@
   memset(&_co, 0, sizeof(_co));
   memset(&_bias, 0, sizeof(_bias));
+
+  _providerID[0] = -1;
+  _providerID[1] = -1;
+  _providerID[2] = -1;
 }
 
@@ -220 +224 @@
         }
 
+        checkProviderID();
+
         QStringList asciiLines = corrsToASCIIlines(GPSweek, _GPSweeks, 
                                                    _co, &_bias);
@@ -309 +315 @@
                      "   %8.3f %8.3f %8.3f %8.3f"
                      "   %10.5f %10.5f %10.5f %10.5f"
-                     "   %10.5f"
-                     "   %5d %2d %2d",
+                     "   %10.5f",
                      co.Sat[ii].IOD, 
                      co.Sat[ii].Clock.DeltaA0,
@@ -320 +325 @@
                      co.Sat[ii].Orbit.DotDeltaAlongTrack,
                      co.Sat[ii].Orbit.DotDeltaCrossTrack,
-                     co.Sat[ii].Clock.DeltaA2,
-                     co.SSRProviderID, co.SSRSolutionID, co.SSRIOD);
+                     co.Sat[ii].Clock.DeltaA2);
         retLines << linePart+line;
       }
@@ -332 +336 @@
         line.sprintf("   %3d"
                      "   %8.3f %8.3f %8.3f"
-                     "   %10.5f %10.5f %10.5f"
-                     "   %5d %2d %2d",
+                     "   %10.5f %10.5f %10.5f",
                      co.Sat[ii].IOD, 
                      co.Sat[ii].Orbit.DeltaRadial, 
@@ -340 +343 @@
                      co.Sat[ii].Orbit.DotDeltaRadial, 
                      co.Sat[ii].Orbit.DotDeltaAlongTrack,
-                     co.Sat[ii].Orbit.DotDeltaCrossTrack,
-                     co.SSRProviderID, co.SSRSolutionID, co.SSRIOD);
+                     co.Sat[ii].Orbit.DotDeltaCrossTrack);
         retLines << linePart+line;
       }
@@ -416 +418 @@
   return retLines;
 }
+
+// 
+////////////////////////////////////////////////////////////////////////////
+void RTCM3coDecoder::checkProviderID() {
+
+  if (_co.SSRProviderID == 0 && _co.SSRSolutionID == 0 && _co.SSRIOD == 0) {
+    return;
+  }
+
+  int newProviderID[3];
+  newProviderID[0] = _co.SSRProviderID;
+  newProviderID[1] = _co.SSRSolutionID;
+  newProviderID[2] = _co.SSRIOD;
+
+  bool alreadySet = false;
+  bool different  = false;
+
+  for (unsigned ii = 0; ii < 3; ii++) {
+    if (_providerID[ii] != -1) {
+      alreadySet = true;
+    }
+    if (_providerID[ii] != newProviderID[ii]) {
+      different = true;
+    }
+    _providerID[ii] = newProviderID[ii];
+  }
+    
+  if (alreadySet && different) {
+    emit newMessage("RTCM3coDecoder: Provider Changed\n", true);
+  }
+}

trunk/BNC/src/RTCM3/RTCM3coDecoder.h

@@ -55 +55 @@
  private:
   void printLine(const QString& line, int GPSweek, double GPSweeks);
+  void checkProviderID();
   std::ofstream* _out;
   QString        _staID;
@@ -63 +64 @@
   ClockOrbit     _co;
   Bias           _bias;
+  int            _providerID[3];
 };