Changeset 4694 in ntrip for trunk/BNC/src/rinex

Timestamp:

Sep 9, 2012, 5:25:03 PM (12 years ago)

Author:

mervart

Message:

 

Location:

trunk/BNC/src/rinex

Files:

• reqcanalyze.cpp (modified) (3 diffs)
• reqcanalyze.h (modified) (1 diff)

trunk/BNC/src/rinex/reqcanalyze.cpp

@@ -247 +247 @@
                                      .arg(obs.satNum, 2, 10, QChar('0'));
   
-        _allObsMap[prn].addObs(obs);
-
-        _obsStat._prnStat[prn]._numObs += 1;
+        t_irc irc = _allObsMap[prn].addObs(obs);
+
+        if (irc == success) {
+          const t_oneObs* newObs = _allObsMap[prn]._oneObsVec.last();
+          if (newObs->_hasL1 && newObs->_hasL2) {
+            _obsStat._prnStat[prn]._numObs += 1;
+          }
+        }
       }
   
@@ -298 +303 @@
 //  
 ////////////////////////////////////////////////////////////////////////////
-void t_reqcAnalyze::t_allObs::addObs(const t_obs& obs) { 
+t_irc t_reqcAnalyze::t_allObs::addObs(const t_obs& obs) { 
 
   t_oneObs* newObs = new t_oneObs(obs.GPSWeek, obs.GPSWeeks);
@@ -382 +387 @@
   if (okFlag) {
     _oneObsVec << newObs;
+    return success;
   }
   else {
     delete newObs;
+    return failure;
   }
 }

trunk/BNC/src/rinex/reqcanalyze.h

@@ -146 +146 @@
       }
     }
-    void addObs(const t_obs& obs);
+    t_irc addObs(const t_obs& obs);
     QVector<t_oneObs*> _oneObsVec;
   };