Changeset 3751 in ntrip for trunk/BNC/bncpppclient.cpp

Timestamp:

Mar 30, 2012, 3:44:32 PM (12 years ago)

Author:

mervart

Message:

 

File:

• trunk/BNC/bncpppclient.cpp (modified) (6 diffs)

trunk/BNC/bncpppclient.cpp

@@ -271 +271 @@
   }
 
-  // Remove All Corrections
-  // ----------------------
-  //  QMapIterator<QString, t_corr*> ic(_corr);
-  //  while (ic.hasNext()) {
-  //    ic.next();
-  //    delete ic.value();
-  //  }
-  //  _corr.clear();
-
   QListIterator<QString> it(corrList);
   while (it.hasNext()) {
@@ -303 +294 @@
 
       cc->readLine(line);
-      _corr_tt = cc->tt;
+      _corr_tt = cc->tClk;
     }
     else if ( messageType == BTYPE_GPS ) { 
@@ -337 +328 @@
   }
 
-  QMutableMapIterator<QString, t_corr*> im(_corr);
-  while (im.hasNext()) {
-    im.next();
-    t_corr* cc = im.value();
-    if (!cc->ready()) {
-      delete cc;
-      im.remove();
-    }
-  }
 }
 
@@ -360 +342 @@
       if (_corr.contains(prn)) {
         t_corr* cc = _corr.value(prn);
-        if (tt - cc->tt < MAXAGE) {
+        if (cc->ready() && tt - cc->tClk < MAXAGE) {
           t_eph*  eLast = _eph.value(prn)->last;
           t_eph*  ePrev = _eph.value(prn)->prev;
@@ -390 +372 @@
                               ColumnVector& xc, ColumnVector& vv) {
 
-  double dt = tt - cc->tt;
-  ColumnVector raoHlp = cc->rao + cc->dotRao * dt + cc->dotDotRao * dt * dt;
+  double dtRao = tt - cc->tRao;
+  ColumnVector raoHlp = cc->rao + cc->dotRao * dtRao 
+                      + cc->dotDotRao * dtRao * dtRao;
 
   if (raoHlp.norm_Frobenius() > 20.0) {
@@ -402 +385 @@
   xc[1] -= dx[1];
   xc[2] -= dx[2];
-  xc[3] += cc->dClk + cc->dotDClk * dt + cc->dotDotDClk * dt * dt
+
+  double dtClk = tt - cc->tClk;
+
+  xc[3] += cc->dClk + cc->dotDClk * dtClk + cc->dotDotDClk * dtClk * dtClk
         + cc->hrClk;