Changeset 2049 in ntrip

Timestamp:

Nov 29, 2009, 10:21:42 AM (15 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

@@ -203 +203 @@
 }
 
+// Correct Time of Transmission
+////////////////////////////////////////////////////////////////////////////
+t_irc bncPPPclient::cmpToT(const QString& prn, t_satData* satData) {
+
+  double prange = satData->C1;
+  if (prange == 0.0) {
+    prange = satData->P1;
+  }
+  if (prange == 0.0) {
+    return failure;
+  }
+
+  double clkSat = 0.0;
+  for (int ii = 1; ii <= 10; ii++) {
+
+    t_time ToT = _epoData->tt - prange / t_CST::c - clkSat;
+
+    ColumnVector xc(4);
+    ColumnVector vv(3);
+    bool corr = false;
+    if (getSatPos(ToT, prn, xc, vv, corr) != success) {
+      return failure;
+    }
+
+    double clkSatOld = clkSat;
+    clkSat = xc(4) * t_CST::c;
+
+    if ( fabs(clkSat-clkSatOld) * t_CST::c < 1.e-4 ) {
+      satData->xx      = xc.Rows(1,3);
+      satData->vv      = vv;
+      satData->clk     = clkSat;
+      satData->clkCorr = corr;
+      return success;
+    } 
+  }
+
+  return failure;
+}
+
 // 
 ////////////////////////////////////////////////////////////////////////////
@@ -209 +248 @@
   cout.setf(ios::fixed);
 
-  QMapIterator<QString, t_satData*> it(_epoData->satData);
+  QMutableMapIterator<QString, t_satData*> it(_epoData->satData);
+
   while (it.hasNext()) {
     it.next();
@@ -215 +255 @@
     t_satData* satData = it.value();
 
-    ColumnVector xc(4);
-    ColumnVector vv(3);
-
-    bool corr = false;
-    if (getSatPos(_epoData->tt, prn, xc, vv, corr) == success) {
-      cout << _epoData->tt.timestr(1) << " " << prn.toAscii().data() << "   "
-           << setw(14) << setprecision(3) << xc(1)                << "  "
-           << setw(14) << setprecision(3) << xc(2)                << "  "
-           << setw(14) << setprecision(3) << xc(3)                << "  "
-           << setw(12) << setprecision(6) << xc(4)*1.e6;
-      if (corr) {
-        cout << endl;
-      }
-      else {
-        cout << " !\n";
-      }
+    if (cmpToT(prn, satData) != success) {
+      delete satData;
+      it.remove();
+      continue;
+    }
+
+    cout << _epoData->tt.timestr(1) << " " << prn.toAscii().data() << "   "
+         << setw(14) << setprecision(3) << satData->xx(1)          << "  "
+         << setw(14) << setprecision(3) << satData->xx(2)          << "  "
+         << setw(14) << setprecision(3) << satData->xx(3)          << "  "
+         << setw(12) << setprecision(3) << satData->clk;
+
+    if (satData->clkCorr) {
+      cout << endl;
+    }
+    else {
+      cout << " !\n";
     }
   }
@@ -237 +278 @@
   cout.flush();
 }
+

trunk/BNC/bncpppclient.h

@@ -45 +45 @@
   double L1;
   double L2;
+  ColumnVector xx;
+  ColumnVector vv;
+  double       clk;
+  bool         clkCorr;
 };
 
@@ -89 +93 @@
   void processEpoch();
   void applyCorr(const t_corr* cc, ColumnVector& xc, ColumnVector& vv);
+  t_irc cmpToT(const QString& prn, t_satData* satData);
 
   QByteArray             _staID;