Changeset 5913 in ntrip

Timestamp:

Aug 12, 2014, 4:42:23 PM (10 years ago)

Author:

mervart

Message:

 

Location:

trunk/BNC/src/PPP

Files:

• pppMain.cpp (modified) (3 diffs)
• pppOptions.h (modified) (1 diff)

trunk/BNC/src/PPP/pppMain.cpp

@@ -152 +152 @@
     t_pppOptions* opt = new t_pppOptions();
 
-    opt->_realTime    = realTime;
-    opt->_roverName   = hlp[0].toAscii().data();
-    opt->_sigCrd[0]   = hlp[1].toDouble();
-    opt->_sigCrd[1]   = hlp[2].toDouble();
-    opt->_sigCrd[2]   = hlp[3].toDouble();
-    opt->_noiseCrd[0] = hlp[4].toDouble();
-    opt->_noiseCrd[1] = hlp[5].toDouble();
-    opt->_noiseCrd[2] = hlp[6].toDouble();
-    opt->_sigTropo    = hlp[7].toDouble();
-    opt->_noiseTropo  = hlp[8].toDouble();
+    opt->_realTime     = realTime;
+    opt->_roverName    = hlp[0].toAscii().data();
+    opt->_aprSigCrd[0] = hlp[1].toDouble();
+    opt->_aprSigCrd[1] = hlp[2].toDouble();
+    opt->_aprSigCrd[2] = hlp[3].toDouble();
+    opt->_noiseCrd[0]  = hlp[4].toDouble();
+    opt->_noiseCrd[1]  = hlp[5].toDouble();
+    opt->_noiseCrd[2]  = hlp[6].toDouble();
+    opt->_aprSigTrp    = hlp[7].toDouble();
+    opt->_noiseTrp     = hlp[8].toDouble();
 
     if (realTime) {
@@ -172 +172 @@
     }
 
-    opt->_crdFile   = settings.value("PPP/crdFile").toString().toAscii().data();
-    opt->_antexFile = settings.value("PPP/antexFile").toString().toAscii().data();
+    opt->_crdFile       = settings.value("PPP/crdFile").toString().toAscii().data();
+    opt->_antexFileName = settings.value("PPP/antexFile").toString().toAscii().data();
 
     opt->_sigmaC1      = settings.value("PPP/sigmaC1").toDouble();
@@ -180 +180 @@
 
     if      (settings.value("PPP/lcGPS").toString() == "P3") {
-      opt->_lcGPS.push_back(t_lc::cIF);
+      opt->_LCsGPS.push_back(t_lc::cIF);
     }
     else if (settings.value("PPP/lcGPS").toString() == "L3") {
-      opt->_lcGPS.push_back(t_lc::lIF);
+      opt->_LCsGPS.push_back(t_lc::lIF);
     }
     else if (settings.value("PPP/lcGPS").toString() == "P3&L3") {
-      opt->_lcGPS.push_back(t_lc::cIF);
-      opt->_lcGPS.push_back(t_lc::lIF);
+      opt->_LCsGPS.push_back(t_lc::cIF);
+      opt->_LCsGPS.push_back(t_lc::lIF);
     }
 
     if      (settings.value("PPP/lcGLONASS").toString() == "P3") {
-      opt->_lcGLONASS.push_back(t_lc::cIF);
+      opt->_LCsGLONASS.push_back(t_lc::cIF);
     }
     else if (settings.value("PPP/lcGLONASS").toString() == "L3") {
-      opt->_lcGLONASS.push_back(t_lc::lIF);
+      opt->_LCsGLONASS.push_back(t_lc::lIF);
     }
     else if (settings.value("PPP/lcGLONASS").toString() == "P3&L3") {
-      opt->_lcGLONASS.push_back(t_lc::cIF);
-      opt->_lcGLONASS.push_back(t_lc::lIF);
+      opt->_LCsGLONASS.push_back(t_lc::cIF);
+      opt->_LCsGLONASS.push_back(t_lc::lIF);
     }
 
     if      (settings.value("PPP/lcGalileo").toString() == "P3") {
-      opt->_lcGalileo.push_back(t_lc::cIF);
+      opt->_LCsGalileo.push_back(t_lc::cIF);
     }
     else if (settings.value("PPP/lcGalileo").toString() == "L3") {
-      opt->_lcGalileo.push_back(t_lc::lIF);
+      opt->_LCsGalileo.push_back(t_lc::lIF);
     }
     else if (settings.value("PPP/lcGalileo").toString() == "P3&L3") {
-      opt->_lcGalileo.push_back(t_lc::cIF);
-      opt->_lcGalileo.push_back(t_lc::lIF);
+      opt->_LCsGalileo.push_back(t_lc::cIF);
+      opt->_LCsGalileo.push_back(t_lc::lIF);
     }
 

trunk/BNC/src/PPP/pppOptions.h

@@ -31 +31 @@
   std::string             _rinexNav;
   std::string             _corrFile;
+  double                  _corrWaitTime;
   std::string             _roverName;     
   ColumnVector            _xyzAprRover;