Changeset 8773 in ntrip for trunk/BNC/src

Timestamp:

Jun 7, 2019, 10:22:27 AM (5 years ago)

Author:

stuerze

Message:

celanup of PPP(3) panel

Location:

trunk/BNC/src

Files:

• pppMain.cpp (modified) (4 diffs)
• pppWidgets.cpp (modified) (4 diffs)

trunk/BNC/src/pppMain.cpp

@@ -183 +183 @@
       opt->_corrWaitTime = 0;
     }
-
-    if      (settings.value("PPP/lcGPS").toString() == "P1") {
-      opt->_LCsGPS.push_back(t_lc::c1);
-    }
-    else if (settings.value("PPP/lcGPS").toString() == "L1") {
-      opt->_LCsGPS.push_back(t_lc::l1);
-    }
-    else if (settings.value("PPP/lcGPS").toString() == "P1&L1") {
-      opt->_LCsGPS.push_back(t_lc::c1);
-      opt->_LCsGPS.push_back(t_lc::l1);
-    }
-    if      (settings.value("PPP/lcGPS").toString() == "P2") {
-      opt->_LCsGPS.push_back(t_lc::c2);
-    }
-    else if (settings.value("PPP/lcGPS").toString() == "L2") {
-      opt->_LCsGPS.push_back(t_lc::l2);
-    }
-    else if (settings.value("PPP/lcGPS").toString() == "P2&L2") {
-      opt->_LCsGPS.push_back(t_lc::c2);
-      opt->_LCsGPS.push_back(t_lc::l2);
-    }
+    // GPS
     if      (settings.value("PPP/lcGPS").toString() == "Pi") {
       opt->_LCsGPS.push_back(t_lc::c1);
@@ -228 +208 @@
       opt->_LCsGPS.push_back(t_lc::lIF);
     }
-
-    if      (settings.value("PPP/lcGLONASS").toString() == "P1") {
-      opt->_LCsGLONASS.push_back(t_lc::c1);
-    }
-    else if (settings.value("PPP/lcGLONASS").toString() == "L1") {
-      opt->_LCsGLONASS.push_back(t_lc::l1);
-    }
-    else if (settings.value("PPP/lcGLONASS").toString() == "P1&L1") {
-      opt->_LCsGLONASS.push_back(t_lc::c1);
-      opt->_LCsGLONASS.push_back(t_lc::l1);
-    }
-    if      (settings.value("PPP/lcGLONASS").toString() == "P2") {
-      opt->_LCsGLONASS.push_back(t_lc::c2);
-    }
-    else if (settings.value("PPP/lcGLONASS").toString() == "L2") {
-      opt->_LCsGLONASS.push_back(t_lc::l2);
-    }
-    else if (settings.value("PPP/lcGLONASS").toString() == "P2&L2") {
-      opt->_LCsGLONASS.push_back(t_lc::c2);
-      opt->_LCsGLONASS.push_back(t_lc::l2);
-    }
+    // GLONASS
     if      (settings.value("PPP/lcGLONASS").toString() == "Pi") {
       opt->_LCsGLONASS.push_back(t_lc::c1);
@@ -273 +233 @@
       opt->_LCsGLONASS.push_back(t_lc::lIF);
     }
-
-    if      (settings.value("PPP/lcGalileo").toString() == "P1") {
-      opt->_LCsGalileo.push_back(t_lc::c1);
-    }
-    else if (settings.value("PPP/lcGalileo").toString() == "L1") {
-      opt->_LCsGalileo.push_back(t_lc::l1);
-    }
-    else if (settings.value("PPP/lcGalileo").toString() == "P1&L1") {
-      opt->_LCsGalileo.push_back(t_lc::c1);
-      opt->_LCsGalileo.push_back(t_lc::l1);
-    }
-    if      (settings.value("PPP/lcGalileo").toString() == "P5") {
-      opt->_LCsGalileo.push_back(t_lc::c2);
-    }
-    else if (settings.value("PPP/lcGalileo").toString() == "L5") {
-      opt->_LCsGalileo.push_back(t_lc::l2);
-    }
-    else if (settings.value("PPP/lcGalileo").toString() == "P5&L5") {
-      opt->_LCsGalileo.push_back(t_lc::c2);
-      opt->_LCsGalileo.push_back(t_lc::l2);
-    }
+    // Galileo
     if      (settings.value("PPP/lcGalileo").toString() == "Pi") {
       opt->_LCsGalileo.push_back(t_lc::c1);
@@ -318 +258 @@
       opt->_LCsGalileo.push_back(t_lc::lIF);
     }
-
-    if      (settings.value("PPP/lcBDS").toString() == "P2") {
-      opt->_LCsBDS.push_back(t_lc::c1);
-    }
-    else if (settings.value("PPP/lcBDS").toString() == "L2") {
-      opt->_LCsBDS.push_back(t_lc::l1);
-    }
-    else if (settings.value("PPP/lcBDS").toString() == "P2&L2") {
-      opt->_LCsBDS.push_back(t_lc::c1);
-      opt->_LCsBDS.push_back(t_lc::l1);
-    }
-    if      (settings.value("PPP/lcBDS").toString() == "P7") {
-      opt->_LCsBDS.push_back(t_lc::c2);
-    }
-    else if (settings.value("PPP/lcBDS").toString() == "L7") {
-      opt->_LCsBDS.push_back(t_lc::l2);
-    }
-    else if (settings.value("PPP/lcBDS").toString() == "P7&L7") {
-      opt->_LCsBDS.push_back(t_lc::c2);
-      opt->_LCsBDS.push_back(t_lc::l2);
-    }
+    // BDS
     if      (settings.value("PPP/lcBDS").toString() == "Pi") {
       opt->_LCsBDS.push_back(t_lc::c1);

trunk/BNC/src/pppWidgets.cpp

@@ -127 +127 @@
   _lcGPS->addItems(QString("P3,P3&L3").split(","));
 #else
-  _lcGPS->addItems(QString("no,P1,L1,P1&L1,P2,L2,P2&L2,Pi,Li,Pi&Li,P3,L3,P3&L3").split(","));
+  _lcGPS->addItems(QString("no,Pi,Li,Pi&Li,P3,L3,P3&L3").split(","));
 #endif
 
@@ -134 +134 @@
    _lcGLONASS->addItems(QString("no,P3,L3,P3&L3").split(","));
 #else
-  _lcGLONASS->addItems(QString("no,P1,L1,P1&L1,P2,L2,P2&L2,Pi,Li,Pi&Li,P3,L3,P3&L3").split(","));
+  _lcGLONASS->addItems(QString("no,Pi,Li,Pi&Li,P3,L3,P3&L3").split(","));
 #endif
 
@@ -141 +141 @@
   _lcGalileo->addItems(QString("no,P3,L3,P3&L3").split(","));
 #else
-  _lcGalileo->addItems(QString("no,P1,L1,P1&L1,P5,L5,P5&L5,Pi,Li,Pi&Li,P3,L3,P3&L3").split(","));
+  _lcGalileo->addItems(QString("no,Pi,Li,Pi&Li,P3,L3,P3&L3").split(","));
 #endif
 
@@ -148 +148 @@
   _lcBDS->addItems(QString("no,P3,L3,P3&L3").split(","));
 #else
-  _lcBDS->addItems(QString("no,P2,L2,P2&L2,P7,L7,P7&L7,Pi,Li,Pi&Li,P3,L3,P3&L3").split(","));
+  _lcBDS->addItems(QString("no,Pi,Li,Pi&Li,P3,L3,P3&L3").split(","));
 #endif