Changeset 5715 in ntrip for trunk/BNC/src

Timestamp:

Jul 31, 2014, 12:02:10 PM (10 years ago)

Author:

mervart

Message:

 

Location:

trunk/BNC/src/PPP

Files:

• options.h (modified) (2 diffs)
• pppMain.cpp (modified) (1 diff)

trunk/BNC/src/PPP/options.h

@@ -29 +29 @@
   double       _sigmaL1;
   double       _corrWaitTime;
+  std::vector<t_lc::type> _lcGPS;
+  std::vector<t_lc::type> _lcGLONASS;
+  std::vector<t_lc::type> _lcGalileo;
 
   ColumnVector _xyzAprRover;
@@ -35 +38 @@
   std::string  _antNameRover;  
   int          _minobs;
-  bool         _useGlonass;
   double       _minEle;
   double       _maxResC1;

trunk/BNC/src/PPP/pppMain.cpp

@@ -117 +117 @@
     opt->_corrWaitTime = settings.value("PPP/corrWaitTime").toDouble();
 
+    if      (settings.value("PPP/lcGPS").toString() == "P3") {
+      opt->_lcGPS.push_back(t_lc::cIF);
+    }
+    else if (settings.value("PPP/lcGPS").toString() == "L3") {
+      opt->_lcGPS.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);
+    }
+
+    if      (settings.value("PPP/lcGLONASS").toString() == "P3") {
+      opt->_lcGLONASS.push_back(t_lc::cIF);
+    }
+    else if (settings.value("PPP/lcGLONASS").toString() == "L3") {
+      opt->_lcGLONASS.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);
+    }
+
+    if      (settings.value("PPP/lcGalileo").toString() == "P3") {
+      opt->_lcGalileo.push_back(t_lc::cIF);
+    }
+    else if (settings.value("PPP/lcGalileo").toString() == "L3") {
+      opt->_lcGalileo.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);
+    }
+
     _options << opt;
   }