Changeset 6445 in ntrip

Timestamp:

Dec 26, 2014, 1:06:07 PM (9 years ago)

Author:

mervart

Message:

 

Location:

trunk/BNC/src

Files:

• PPP_free/pppClient.cpp (modified) (5 diffs)
• bncephuser.h (modified) (2 diffs)

trunk/BNC/src/PPP_free/pppClient.cpp

@@ -166 +166 @@
       int channel = 0;
       if (satData->system() == 'R') {
-        const bncEphUser::t_ephPair* ephPair = _ephUser->ephPair(satData->prn);
-        if (ephPair) {
-          channel = ephPair->last->slotNum();
+        const t_eph* eph = _ephUser->ephLast(satData->prn);
+        if (eph) {
+          channel = eph->slotNum();
         }
         else {
@@ -221 +221 @@
   for (unsigned ii = 0; ii < corr.size(); ii++) {
     QString prn = QString(corr[ii]->_prn.toString().c_str());
-    const bncEphUser::t_ephPair* ephPair = _ephUser->ephPair(prn);
-    if (ephPair) {
-      t_eph* eLast = ephPair->last;
-      t_eph* ePrev = ephPair->prev;
-      if      (eLast && eLast->IOD() == corr[ii]->_iod) {
-        eLast->setOrbCorr(corr[ii]);
-      }
-      else if (ePrev && ePrev->IOD() == corr[ii]->_iod) {
-        ePrev->setOrbCorr(corr[ii]);
-      }
+    t_eph* eLast = _ephUser->ephLast(prn);
+    t_eph* ePrev = _ephUser->ephPrev(prn);
+    if      (eLast && eLast->IOD() == corr[ii]->_iod) {
+      eLast->setOrbCorr(corr[ii]);
+    }
+    else if (ePrev && ePrev->IOD() == corr[ii]->_iod) {
+      ePrev->setOrbCorr(corr[ii]);
     }
   }
@@ -240 +237 @@
   for (unsigned ii = 0; ii < corr.size(); ii++) {
     QString prn = QString(corr[ii]->_prn.toString().c_str());
-    const bncEphUser::t_ephPair* ephPair = _ephUser->ephPair(prn);
-    if (ephPair) {
-      t_eph* eLast = ephPair->last;
-      t_eph* ePrev = ephPair->prev;
-      if      (eLast && eLast->IOD() == corr[ii]->_iod) {
-        eLast->setClkCorr(corr[ii]);
-      }
-      else if (ePrev && ePrev->IOD() == corr[ii]->_iod) {
-        ePrev->setClkCorr(corr[ii]);
-      }
+    t_eph* eLast = _ephUser->ephLast(prn);
+    t_eph* ePrev = _ephUser->ephPrev(prn);
+    if      (eLast && eLast->IOD() == corr[ii]->_iod) {
+      eLast->setClkCorr(corr[ii]);
+    }
+    else if (ePrev && ePrev->IOD() == corr[ii]->_iod) {
+      ePrev->setClkCorr(corr[ii]);
     }
   }
@@ -266 +260 @@
   const t_ephGal* ephGal = dynamic_cast<const t_ephGal*>(eph);
   if      (ephGPS) {
-    _ephUser->putNewEph(new t_ephGPS(*ephGPS));
+    _ephUser->putNewEph(new t_ephGPS(*ephGPS), false);
   }
   else if (ephGlo) {
-    _ephUser->putNewEph(new t_ephGlo(*ephGlo));
+    _ephUser->putNewEph(new t_ephGlo(*ephGlo), false);
   }
   else if (ephGal) {
-    _ephUser->putNewEph(new t_ephGal(*ephGal));
+    _ephUser->putNewEph(new t_ephGal(*ephGal), false);
   }
 }
@@ -281 +275 @@
                               ColumnVector& xc, ColumnVector& vv) {
 
-  const bncEphUser::t_ephPair* ephPair = _ephUser->ephPair(prn);
-  if (ephPair) {
-    t_eph* eLast = ephPair->last;
-    t_eph* ePrev = ephPair->prev;
-    if      (eLast && eLast->getCrd(tt, xc, vv, _opt->useOrbClkCorr()) == success) {
-      return success;
-    }
-    else if (ePrev && ePrev->getCrd(tt, xc, vv, _opt->useOrbClkCorr()) == success) {
-      return success;
-    }
+  t_eph* eLast = _ephUser->ephLast(prn);
+  t_eph* ePrev = _ephUser->ephPrev(prn);
+  if      (eLast && eLast->getCrd(tt, xc, vv, _opt->useOrbClkCorr()) == success) {
+    return success;
+  }
+  else if (ePrev && ePrev->getCrd(tt, xc, vv, _opt->useOrbClkCorr()) == success) {
+    return success;
   }
   return failure;

trunk/BNC/src/bncephuser.h

@@ -49 +49 @@
   t_irc putNewEph(const t_eph* newEph, bool check);
 
-  const t_eph* ephLast(const QString& prn) {
+  t_eph* ephLast(const QString& prn) {
     if (_eph.contains(prn)) {
       return _eph[prn].back();
@@ -56 +56 @@
   }
 
-  const t_eph* ephPrev(const QString& prn) {
+  t_eph* ephPrev(const QString& prn) {
     if (_eph.contains(prn)) {
       unsigned nn = _eph[prn].size();