Changeset 5749 in ntrip for trunk/BNC/src/PPP

Timestamp:

Aug 3, 2014, 10:55:00 AM (10 years ago)

Author:

mervart

Message:

 

Location:

trunk/BNC/src/PPP

Files:

• ephpool.cpp (modified) (5 diffs)
• ppp.h (modified) (2 diffs)

trunk/BNC/src/PPP/ephpool.cpp

@@ -49 +49 @@
 /////////////////////////////////////////////////////////////////////////////
 void t_ephPool::putEphemeris(t_eph* eph) {
-  if (eph && eph->isOK()) {
+  if (eph && eph->ok()) {
     _satEphPool[eph->prn().toInt()].putEphemeris(_maxQueueSize, eph);
   }
@@ -119 +119 @@
   for (unsigned ii = 0; ii < _ephs.size(); ii++) {
     t_eph* eph = _ephs[ii];
-    if (eph->IOD() == corr->IOD() || corr->absClk()) {
+    if (eph->IOD() == corr->IOD()) {
       eph->setClkCorr(corr); 
     }
@@ -133 +133 @@
     t_eph* eph = _ephs[ii];
     t_irc irc = eph->getCrd(tt, xc, vv);
-    if (irc == t_irc::success) {
-      if (eph->prn().system() == 'R') {
-        double age = tt - eph->toc();
+    if (irc == success) {
+      if (eph->system() == 'R') {
+        double age = tt - eph->TOC();
         if (fabs(age) > 3600.0) {
           continue;
@@ -143 +143 @@
     }
   }
-  return t_irc::failure;
+  return failure;
 }
 
@@ -150 +150 @@
 int t_ephPool::t_satEphPool::getChannel() const {
   if (_ephs.size() > 0) {
-    return _ephs[0]->getChannel();
+    return _ephs[0]->slotNum();
   }
   return 0;

trunk/BNC/src/PPP/ppp.h

@@ -54 +54 @@
 class t_orbCorr {
  public:
+  t_prn          prn() const {return _prn;}
+  unsigned short IOD() const {return _iod;}
   t_prn          _prn;
   unsigned short _iod;
@@ -64 +66 @@
 class t_clkCorr {
  public:
+  t_prn          prn() const {return _prn;}
+  unsigned short IOD() const {return _iod;}
   t_prn          _prn;
   unsigned short _iod;
   bncTime        _time;
-  bool           _absClk;
   double         _dClk;
   double         _dotDClk;