Changeset 6080 in ntrip for trunk/BNC/src/PPP_free

Timestamp:

Sep 7, 2014, 5:40:26 PM (10 years ago)

Author:

mervart

Message:

 

Location:

trunk/BNC/src/PPP_free

Files:

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

trunk/BNC/src/PPP_free/bncpppclient.cpp

@@ -95 +95 @@
     const t_satObs* obs     = satObs[ii]; 
     t_satData*      satData = new t_satData();
+
+    if (_epoData->tt.undef()) {
+      _epoData->tt = obs->_time;
+    }
+
     satData->tt       = obs->_time;
     satData->prn      = QString(obs->_prn.toString().c_str());
@@ -180 +185 @@
       double a1 =   f1 * f1 / (f1 * f1 - f2 * f2);
       double a2 = - f2 * f2 / (f1 * f1 - f2 * f2);
+      satData->L1      = satData->L1 * t_CST::c / f1;
+      satData->L2      = satData->L2 * t_CST::c / f2;
       satData->P3      = a1 * satData->P1 + a2 * satData->P2;
       satData->L3      = a1 * satData->L1 + a2 * satData->L2;
       satData->lambda3 = a1 * t_CST::c / f1 + a2 * t_CST::c / f2;
       _epoData->satData[satData->prn] = satData;
-      _epoData->tt = satData->tt;
     }
     else {
@@ -200 +206 @@
       double a1 =   f1 * f1 / (f1 * f1 - f5 * f5);
       double a5 = - f5 * f5 / (f1 * f1 - f5 * f5);
+      satData->L1      = satData->L1 * t_CST::c / f1;
+      satData->L5      = satData->L5 * t_CST::c / f5;
       satData->P3      = a1 * satData->P1 + a5 * satData->P5;
       satData->L3      = a1 * satData->L1 + a5 * satData->L5;
       satData->lambda3 = a1 * t_CST::c / f1 + a5 * t_CST::c / f5;
       _epoData->satData[satData->prn] = satData;
-      _epoData->tt = satData->tt;
     }
     else {

trunk/BNC/src/PPP_free/bncpppclient.h

@@ -128 +128 @@
     }
     satData.clear();
+    tt.reset();
   }