Changeset 5827 in ntrip

Timestamp:

Aug 6, 2014, 1:48:21 PM (10 years ago)

Author:

mervart

Message:

 

Location:

trunk/BNC/src/PPP

Files:

• pppObsPool.cpp (modified) (1 diff)
• pppSatObs.cpp (modified) (1 diff)

trunk/BNC/src/PPP/pppObsPool.cpp

@@ -85 +85 @@
 /////////////////////////////////////////////////////////////////////////////
 void t_pppObsPool::putBias(t_satBias* satBias) {
-  int iPrn = satBias->prn().toInt();
+  int iPrn = satBias->_prn.toInt();
   delete _satBiases[iPrn];
   _satBiases[iPrn] = satBias;

trunk/BNC/src/PPP/pppSatObs.cpp

@@ -246 +246 @@
   bool biasL1flg = false;
   bool biasL2flg = false;
-  const t_pppSatBias* satBias = PPP_CLIENT->obsPool()->satBias(_prn);
+  const t_satBias* satBias = PPP_CLIENT->obsPool()->satBias(_prn);
   if (satBias) { 
-    map<t_biasType, double>::const_iterator it;
-    for (it = satBias->biases().begin(); it != satBias->biases().end(); it++) {
-      const t_biasType& biasType = it->first;
-      if (_validObs1) {
-        _validObs1->_biasJumpCounter = satBias->jumpCount();
-        if      ("C" + _validObs1->_rnxType2ch == biasType) {
-          _model._biasC1 = it->second;
-          biasC1flg = true;
+    for (unsigned ii = 0; ii < satBias->_bias.size(); ii++) {
+      const t_frqBias& bias = satBias->_bias[ii];
+      if (_validObs1 && _validObs1->_rnxType2ch == bias._rnxType2ch) {
+        _validObs1->_biasJumpCounter = satBias->_jumpCount;
+        if (bias._codeValid) {
+          _model._biasC1 = bias._code;
+          biasC1flg      = true;
         }
-        else if ("L" + _validObs1->_rnxType2ch == biasType) {
-          _model._biasL1 = it->second;
-          biasL1flg = true;
+        if (bias._phaseValid) {
+          _model._biasL1 = bias._phase;
+          biasL1flg      = true;
         }
       }
-      if (_validObs2) {
-        _validObs2->_biasJumpCounter = satBias->jumpCount();
-        if      ("C" + _validObs2->_rnxType2ch == biasType) {
-          _model._biasC2 = it->second;
-          biasC2flg = true;
+      if (_validObs2 && _validObs2->_rnxType2ch == bias._rnxType2ch) {
+        _validObs2->_biasJumpCounter = satBias->_jumpCount;
+        if (bias._codeValid) {
+          _model._biasC2 = bias._code;
+          biasC2flg      = true;
         }
-        else if ("L" + _validObs2->_rnxType2ch == biasType) {
-          _model._biasL2 = it->second;
-          biasL2flg = true;
+        if (bias._phaseValid) {
+          _model._biasL2 = bias._phase;
+          biasL2flg      = true;
         }
       }