Changeset 3051 in ntrip

Timestamp:

Feb 25, 2011, 3:50:44 PM (14 years ago)

Author:

mervart

Message:

 

Location:

trunk/BNC

Files:

• bncpppclient.h (modified) (2 diffs)
• combination/bnccomb.cpp (modified) (1 diff)

trunk/BNC/bncpppclient.h

@@ -113 +113 @@
   ~bncPPPclient();
   void putNewObs(const t_obs& pp);
+  static void applyCorr(const bncTime& tt, const t_corr* cc, ColumnVector& xc, 
+                        ColumnVector& vv);
 
  public slots:
@@ -140 +142 @@
   void processEpochs();
   void processFrontEpoch();
-  void applyCorr(const bncTime& tt, const t_corr* cc, ColumnVector& xc, 
-                 ColumnVector& vv);
   t_irc cmpToT(t_satData* satData);
 

trunk/BNC/combination/bnccomb.cpp

@@ -363 +363 @@
       ColumnVector xc(4);
       ColumnVector vv(3);
-      corr->eph->position(corr->tt.gpsw(), corr->tt.gpssec(), 
+      corr->eph->position(resTime.gpsw(), resTime.gpssec(), 
                           xc.data(), vv.data());
-      xc(4) -= 2.0 * DotProduct(xc.Rows(1,3),vv) / t_CST::c / t_CST::c;
+      bncPPPclient::applyCorr(resTime, corr, xc, vv);
+      xc(4) += 2.0 * DotProduct(xc.Rows(1,3),vv) / t_CST::c / t_CST::c;
       _sp3->write(resTime.gpsw(), resTime.gpssec(), corr->prn, xc, _append);
     }