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

Timestamp:

Nov 1, 2014, 6:16:37 PM (10 years ago)

Author:

mervart

Message:

 

Location:

trunk/BNC/src/rinex

Files:

• reqcanalyze.cpp (modified) (4 diffs)
• reqcanalyze.h (modified) (2 diffs)

trunk/BNC/src/rinex/reqcanalyze.cpp

@@ -141 +141 @@
   // --------------------
   try {
+    QMap<QString, bncTime> lastObsTime; 
     bool firstEpo = true;
     while ( (_currEpo = obsFile->nextEpoch()) != 0) {
@@ -164 +165 @@
         t_rnxObsFile::setObsFromRnx(obsFile, _currEpo, rnxSat, satObs);
         t_qcSat& qcSat = qcEpo._qcSat[satObs._prn];
-        setQcObs(qcEpo._epoTime, xyzSta, satObs, qcSat);
+        setQcObs(qcEpo._epoTime, xyzSta, satObs, lastObsTime, qcSat);
         updateQcSat(qcSat, _qcFile._qcSatSum[satObs._prn]);
       }
@@ -263 +264 @@
 ////////////////////////////////////////////////////////////////////////////
 void t_reqcAnalyze::setQcObs(const bncTime& epoTime, const ColumnVector& xyzSta, 
-                             const t_satObs& satObs, t_qcSat& qcSat) {
+                             const t_satObs& satObs, QMap<QString, bncTime>& lastObsTime,
+                             t_qcSat& qcSat) {
 
   t_eph* eph = 0;
@@ -305 +307 @@
     // Check Gaps
     // ----------
-    if (qcFrq._lastObsTime.valid()) {
-      double dt = epoTime - qcFrq._lastObsTime;
+    QString key = QString(satObs._prn.toString().c_str()) + qcFrq._rnxType2ch;
+    if (lastObsTime[key].valid()) {
+      double dt = epoTime - lastObsTime[key];
       if (dt > 1.5 * _qcFile._interval) {
         qcFrq._gap = true;
       }
     }
-    qcFrq._lastObsTime = epoTime;
+    lastObsTime[key] = epoTime;
 
     // Compute the Multipath Linear Combination

trunk/BNC/src/rinex/reqcanalyze.h

@@ -79 +79 @@
     }
     QString _rnxType2ch;
-    bncTime _lastObsTime;
     bool    _phaseValid;
     bool    _codeValid;
@@ -160 +159 @@
 
   void   setQcObs(const bncTime& epoTime, const ColumnVector& xyzSta, 
-                  const t_satObs& satObs, t_qcSat& qcSat);
+                  const t_satObs& satObs, QMap<QString, bncTime>& lastObsTime, t_qcSat& qcSat);
 
   void   analyzeMultipath();