Changeset 4405 in ntrip

Timestamp:

Jul 8, 2012, 12:45:32 PM (12 years ago)

Author:

mervart

Message:

 

Location:

trunk/BNC/src/RTCM

Files:

• GPSDecoder.cpp (modified) (4 diffs)
• GPSDecoder.h (modified) (1 diff)

trunk/BNC/src/RTCM/GPSDecoder.cpp

@@ -93 +93 @@
 //////////////////////////////////////////////////////////////////////////////
 void t_obs::setMeasdata(const QString& rnxStr, float rnxVers, double value) {
-  int ie = iEntry(rnxStr, rnxVers);
+  int ie = iEntry(rnxStr, rnxVers, false);
   if (ie != -1) {
     _measdata[ie] = value;
@@ -102 +102 @@
 //////////////////////////////////////////////////////////////////////////////
 double t_obs::measdata(const QString& rnxStr, float rnxVers) const {
-  int ie = iEntry(rnxStr, rnxVers);
+  int ie = iEntry(rnxStr, rnxVers, true);
   if (ie != -1) {
     return _measdata[ie];
@@ -113 +113 @@
 // 
 //////////////////////////////////////////////////////////////////////////////
-int t_obs::iEntry(const QString& rnxStr, float rnxVers) const {
+int t_obs::iEntry(const QString& rnxStr, float rnxVers, bool nonEmpty) const {
   if (rnxVers >= 3.0) {
     return iEntryV3(rnxStr);
@@ -127 +127 @@
     QString hlpStr = rnxStr + chars[ii];
     int ie = iEntryV3(hlpStr.trimmed());
-    if (ie != -1) return ie;
+    if (ie != -1 && (!nonEmpty || _measdata[ie] != 0.0)) {
+      return ie;
+    }
   }
 

trunk/BNC/src/RTCM/GPSDecoder.h

@@ -81 +81 @@
 
  private:
-  int iEntry(const QString& rnxStr, float rnxVer) const;
+  int iEntry(const QString& rnxStr, float rnxVer, bool nonEmpty) const;
   int iEntryV3(const QString& rnxStr) const;
 };