Changeset 2296 in ntrip

Timestamp:

Feb 14, 2010, 7:15:43 PM (14 years ago)

Author:

mervart

Message:

* empty log message *

Location:

trunk/BNC

Files:

• bncpppclient.cpp (modified) (4 diffs)
• bncpppclient.h (modified) (2 diffs)

trunk/BNC/bncpppclient.cpp

@@ -308 +308 @@
                 messageType == COTYPE_GLONASSCOMBINED ) {
         cc->rao.ReSize(3);
-        in >> cc->iod >> cc->dClk >> cc->rao[0] >> cc->rao[1] >> cc->rao[2];
+        cc->dotRao.ReSize(3); 
+        cc->dotRao = 0.0;
+        double dummyDotClk;
+        in >> cc->iod >> cc->dClk >> cc->rao[0] >> cc->rao[1] >> cc->rao[2]
+           >> dummyDotClk >> cc->dotRao[0] >> cc->dotRao[1] >> cc->dotRao[2];
         cc->dClk /= t_CST::c;
         cc->raoSet  = true;
@@ -316 +320 @@
                 messageType == COTYPE_GLONASSORBIT ) {
         cc->rao.ReSize(3);
-        in >> cc->iod >> cc->rao[0] >> cc->rao[1] >> cc->rao[2];
+        in >> cc->iod >> cc->rao[0] >> cc->rao[1] >> cc->rao[2]
+           >> cc->dotRao[0] >> cc->dotRao[1] >> cc->dotRao[2];
         cc->raoSet  = true;
       }
@@ -393 +398 @@
         if (ee->IOD() == cc->iod && (tt - cc->tt) < MAXAGE) {
           corr = true;
-          applyCorr(cc, xc, vv);
+          applyCorr(tt, cc, xc, vv);
           return success;
         }
@@ -408 +413 @@
 // 
 ////////////////////////////////////////////////////////////////////////////
-void bncPPPclient::applyCorr(const t_corr* cc, ColumnVector& xc, 
-                             ColumnVector& vv) {
+void bncPPPclient::applyCorr(const bncTime& tt, const t_corr* cc, 
+                             ColumnVector& xc, ColumnVector& vv) {
   ColumnVector dx(3);
-  RSW_to_XYZ(xc.Rows(1,3), vv, cc->rao, dx);
+
+  ColumnVector raoHlp = cc->rao + cc->dotRao * (tt - cc->tt);
+
+  RSW_to_XYZ(xc.Rows(1,3), vv, raoHlp, dx);
 
   xc[0] -= dx[0];

trunk/BNC/bncpppclient.h

@@ -92 +92 @@
   double       dClk;
   ColumnVector rao;
+  ColumnVector dotRao;
   bool         raoSet;
   bool         dClkSet;
@@ -132 +133 @@
                   ColumnVector& xc, ColumnVector& vv, bool& corr);
   void processEpoch();
-  void applyCorr(const t_corr* cc, ColumnVector& xc, ColumnVector& vv);
+  void applyCorr(const bncTime& tt, const t_corr* cc, ColumnVector& xc, 
+                 ColumnVector& vv);
   t_irc cmpToT(t_satData* satData);