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

Timestamp:

Feb 27, 2010, 9:47:33 PM (14 years ago)

Author:

weber

Message:

* empty log message *

File:

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

trunk/BNC/bncpppclient.cpp

@@ -336 +336 @@
       t_bias* bb = 0;
       if (_bias.contains(prn)) {
-        bb = _bias.value(prn); 
+        bb = _bias.value(prn);
       }
       else {
@@ -352 +352 @@
         in >> bType >> bValue;
         if      (bType ==  0) {
-          bb->p1c1 = -bValue;
+          bb->p1c1 = -bValue * t_CST::c ; // Weber
         }
         else if (bType == 10) {
-          bb->p1p2 = -bValue;
+          bb->p1p2 = -bValue * t_CST::c ; // Weber
         }
       }
@@ -377 +377 @@
                               ColumnVector& xc, ColumnVector& vv, bool& corr) {
 
-  const bool   CORR_REQUIRED = true;
+//const bool   CORR_REQUIRED = true;
+  bncSettings settings;
   const double MAXAGE        = 120.0;
+
 
   corr = false;
@@ -386 +388 @@
     ee->position(tt.gpsw(), tt.gpssec(), xc.data(), vv.data());
 
-    if (CORR_REQUIRED) {
+//  if (CORR_REQUIRED) {
+    if (settings.value("pppSPP").toString() == "PPP") {
       if (_corr.contains(prn)) {
         t_corr* cc = _corr.value(prn);
@@ -414 +417 @@
   RSW_to_XYZ(xc.Rows(1,3), vv, raoHlp, dx);
 
-  xc[0] -= dx[0];
-  xc[1] -= dx[1];
-  xc[2] -= dx[2];
-  xc[3] -= cc->dClk;
+    xc[0] -= dx[0];
+    xc[1] -= dx[1];
+    xc[2] -= dx[2];
+    xc[3] -= cc->dClk;
 
   // Relativistic Correction