Changeset 9436 in ntrip for trunk/BNC

Timestamp:

May 20, 2021, 2:44:18 PM (4 years ago)

Author:

stuerze

Message:

 

Location:

trunk/BNC/src

Files:

• bncwindow.cpp (modified) (2 diffs)
• upload/bncephuploadcaster.cpp (modified) (1 diff)

trunk/BNC/src/bncwindow.cpp

@@ -2957 +2957 @@
       QComboBox* system = new QComboBox();
       system->setEditable(false);
-      system->addItems(QString("ALL,GPS,GLONASS,Galileo,BDS,QZSS,SBAS,IRNSS").split(","));
+      system->addItems(QString("G,R,E,C,J,I,S,G+R,G+E,G+R+E,G+R+E+C,G+R+E+C+J,G+R+E+C+J+Q,G+R+E+C+J+Q+I,ALL").split(","));
       system->setFrame(false);
       _uploadEphTable->setCellWidget(iRow, iCol, system);
@@ -3043 +3043 @@
         QComboBox* system = new QComboBox();
         system->setEditable(false);
-        system->addItems(QString("ALL,GPS,GLONASS,Galileo,BDS,QZSS,SBAS,IRNSS").split(","));
+        system->addItems(QString("G,R,E,C,J,I,S,G+R,G+E,G+R+E,G+R+E+C,G+R+E+C+J,G+R+E+C+J+Q,G+R+E+C+J+Q+I,ALL").split(","));
         system->setFrame(false);
         system->setCurrentIndex(system->findText(hlp[iCol]));

trunk/BNC/src/upload/bncephuploadcaster.cpp

@@ -91 +91 @@
         int size = 0;
 
-        if      (ephGPS && ephGPS->type() == t_eph::GPS  &&  (system == "ALL" || system == "GPS")) {
+        if      (ephGPS && ephGPS->type() == t_eph::GPS  &&  (system == "ALL" || system.contains('G'))) {
           if (dt < 14400.0 || dt > -7200.0) {
             size = t_ephEncoder::RTCM3(*ephGPS, Array);
           }
         }
-        else if (ephGPS && ephGPS->type() == t_eph::QZSS && (system == "ALL" || system == "QZSS")) {
+        else if (ephGPS && ephGPS->type() == t_eph::QZSS && (system == "ALL" || system.contains('J'))) {
           if (dt <  7200.0 || dt > -3600.0) {
             size = t_ephEncoder::RTCM3(*ephGPS, Array);
           }
         }
-        else if (ephGlo && (system == "ALL" || system == "GLONASS")) {
+        else if (ephGlo && (system == "ALL" || system.contains('R'))) {
           if (dt <  3900.0 || dt > -2100.0) {
             size = t_ephEncoder::RTCM3(*ephGlo, Array);
           }
         }
-        else if (ephGal && (system == "ALL" || system == "Galileo")) {
+        else if (ephGal && (system == "ALL" || system.contains('E'))) {
           if (dt < 14400.0 || dt >     0.0) {
             size = t_ephEncoder::RTCM3(*ephGal, Array);
           }
         }
-        else if (ephSBAS && (system == "ALL" || system == "SBAS")) {
+        else if (ephSBAS && (system == "ALL" || system.contains('S'))) {
           if (dt <   600.0 || dt >  -600.0) {
             size = t_ephEncoder::RTCM3(*ephSBAS, Array);
           }
         }
-        else if (ephBDS && (system == "ALL" || system == "BDS")) {
+        else if (ephBDS && (system == "ALL" || system.contains('C'))) {
           if (dt <  3900.0 || dt >     0.0) {
             size = t_ephEncoder::RTCM3(*ephBDS, Array);
           }
         }
-        else if (ephGPS && ephGPS->type() == t_eph::IRNSS && (system == "ALL" || system == "IRNSS")) {
+        else if (ephGPS && ephGPS->type() == t_eph::IRNSS && (system == "ALL" || system.contains('I'))) {
           if (fabs(dt < 86400.0)) {
             size = t_ephEncoder::RTCM3(*ephGPS, Array);