Changeset 6487 in ntrip for trunk/BNC

Timestamp:

Dec 28, 2014, 5:19:06 PM (9 years ago)

Author:

mervart

Message:

 

Location:

trunk/BNC/src/RTCM3

Files:

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

trunk/BNC/src/RTCM3/RTCM3coDecoder.cpp

@@ -215 +215 @@
 void RTCM3coDecoder::sendResults() {
 
-  QList<t_orbCorr>&     orbCorrections = _orbCorrections[_lastTime];
-  QList<t_clkCorr>&     clkCorrections = _clkCorrections[_lastTime];
-  QList<t_satCodeBias>& codeBiases     = _codeBiases[_lastTime];
+  QList<t_orbCorr>&      orbCorrections = _orbCorrections[_lastTime];
+  QList<t_clkCorr>&      clkCorrections = _clkCorrections[_lastTime];
+  QList<t_satCodeBias>&  codeBiases     = _codeBiases[_lastTime];
+  QList<t_satPhaseBias>& phaseBiases    = _phaseBiases[_lastTime];
+  t_vTec&                vTec           = _vTec[_lastTime];
 
   // Orbit and clock corrections of all satellites
@@ -329 +331 @@
   }
 
+  // Phase Biases
+  // -----------
+  for (unsigned ii = 0; ii < CLOCKORBIT_NUMGPS + _phaseBias.NumberOfSat[CLOCKORBIT_SATGLONASS]; ii++) {
+    char sysCh = ' ';
+    if      (ii < _phaseBias.NumberOfSat[CLOCKORBIT_SATGPS]) {
+      sysCh = 'G';
+    }
+    else if (ii >= CLOCKORBIT_NUMGPS) {
+      sysCh = 'R';
+    }
+    else {
+      continue;
+    }
+    t_satPhaseBias satPhaseBias;
+    satPhaseBias._prn.set(sysCh, _phaseBias.Sat[ii].ID);
+    satPhaseBias._staID = _staID.toAscii().data();
+    satPhaseBias._time  = _lastTime;
+    for (unsigned jj = 0; jj < _phaseBias.Sat[ii].NumberOfPhaseBiases; jj++) {
+      const PhaseBias::PhaseBiasSat::PhaseBiasEntry& biasEntry = _phaseBias.Sat[ii].Biases[jj];
+      t_frqPhaseBias frqPhaseBias;
+      frqPhaseBias._rnxType2ch = codeTypeToRnxType(sysCh, biasEntry.Type);
+      frqPhaseBias._value      = biasEntry.Bias;
+      if (!frqPhaseBias._rnxType2ch.empty()) {
+        satPhaseBias._bias.push_back(frqPhaseBias);
+      }
+    }
+    phaseBiases.push_back(satPhaseBias);
+  }
+
   // Dump all older epochs
   // ---------------------
@@ -356 +387 @@
       t_satCodeBias::writeEpoch(_out, itCB.value());
       itCB.remove();
+    } 
+  }
+  QMutableMapIterator<bncTime, QList<t_satPhaseBias> > itPB(_phaseBiases);
+  while (itPB.hasNext()) {
+    itPB.next();
+    if (itPB.key() < _lastTime) {
+      emit newPhaseBiases(itPB.value());
+      t_satPhaseBias::writeEpoch(_out, itPB.value());
+      itPB.remove();
     } 
   }

trunk/BNC/src/RTCM3/RTCM3coDecoder.h

@@ -77 +77 @@
   QMap<bncTime, QList<t_satCodeBias> >  _codeBiases;
   QMap<bncTime, QList<t_satPhaseBias> > _phaseBiases;
-  QMap<bncTime, QList<t_vTec> >         _vTec;
+  QMap<bncTime, t_vTec>                 _vTec;
 };