Changeset 2357 in ntrip

Timestamp:

Mar 9, 2010, 8:26:55 AM (14 years ago)

Author:

mervart

Message:

* empty log message *

Location:

trunk/BNC

Files:

• bncpppclient.cpp (modified) (5 diffs)
• bncpppclient.h (modified) (3 diffs)

trunk/BNC/bncpppclient.cpp

@@ -68 +68 @@
   }
 
+  if (settings.value("pppSPP").toString() == "PPP") {
+    _pppMode = true;
+  }
+  else {
+    _pppMode = false;
+  }
+
   connect(((bncApp*)qApp), SIGNAL(newEphGPS(gpsephemeris)),
           this, SLOT(slotNewEphGPS(gpsephemeris)));
@@ -375 +382 @@
 ////////////////////////////////////////////////////////////////////////////
 t_irc bncPPPclient::getSatPos(const bncTime& tt, const QString& prn, 
-                              ColumnVector& xc, ColumnVector& vv, bool& corr) {
-
-//const bool   CORR_REQUIRED = true;
-  bncSettings settings;
+                              ColumnVector& xc, ColumnVector& vv) {
+
   const double MAXAGE        = 120.0;
-
-
-  corr = false;
 
   if (_eph.contains(prn)) {
@@ -388 +390 @@
     ee->position(tt.gpsw(), tt.gpssec(), xc.data(), vv.data());
 
-//  if (CORR_REQUIRED) {
-    if (settings.value("pppSPP").toString() == "PPP") {
+    if (_pppMode) {
       if (_corr.contains(prn)) {
         t_corr* cc = _corr.value(prn);
         if (ee->IOD() == cc->iod && (tt - cc->tt) < MAXAGE) {
-          corr = true;
           applyCorr(tt, cc, xc, vv);
           return success;
@@ -443 +443 @@
     ColumnVector xc(4);
     ColumnVector vv(3);
-    bool corr = false;
-    if (getSatPos(ToT, satData->prn, xc, vv, corr) != success) {
+    if (getSatPos(ToT, satData->prn, xc, vv) != success) {
       return failure;
     }
@@ -455 +454 @@
       satData->vv      = vv;
       satData->clk     = clkSat * t_CST::c;
-      satData->clkCorr = corr;
       return success;
     } 

trunk/BNC/bncpppclient.h

@@ -52 +52 @@
   ColumnVector vv;
   double       clk;
-  bool         clkCorr;
   double       eleSat;
   double       azSat;
@@ -127 +126 @@
  private:
   t_irc getSatPos(const bncTime& tt, const QString& prn, 
-                  ColumnVector& xc, ColumnVector& vv, bool& corr);
+                  ColumnVector& xc, ColumnVector& vv);
   void processEpoch();
   void applyCorr(const bncTime& tt, const t_corr* cc, ColumnVector& xc, 
@@ -141 +140 @@
   bncModel*              _model;
   bool                   _useGlonass;
+  bool                   _pppMode;
 };