Changeset 9436 in ntrip


Ignore:
Timestamp:
May 20, 2021, 2:44:18 PM (4 weeks ago)
Author:
stuerze
Message:
 
Location:
trunk/BNC/src
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/BNC/src/bncwindow.cpp

    r9424 r9436  
    29572957      QComboBox* system = new QComboBox();
    29582958      system->setEditable(false);
    2959       system->addItems(QString("ALL,GPS,GLONASS,Galileo,BDS,QZSS,SBAS,IRNSS").split(","));
     2959      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(","));
    29602960      system->setFrame(false);
    29612961      _uploadEphTable->setCellWidget(iRow, iCol, system);
     
    30433043        QComboBox* system = new QComboBox();
    30443044        system->setEditable(false);
    3045         system->addItems(QString("ALL,GPS,GLONASS,Galileo,BDS,QZSS,SBAS,IRNSS").split(","));
     3045        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(","));
    30463046        system->setFrame(false);
    30473047        system->setCurrentIndex(system->findText(hlp[iCol]));
  • trunk/BNC/src/upload/bncephuploadcaster.cpp

    r9414 r9436  
    9191        int size = 0;
    9292
    93         if      (ephGPS && ephGPS->type() == t_eph::GPS  &&  (system == "ALL" || system == "GPS")) {
     93        if      (ephGPS && ephGPS->type() == t_eph::GPS  &&  (system == "ALL" || system.contains('G'))) {
    9494          if (dt < 14400.0 || dt > -7200.0) {
    9595            size = t_ephEncoder::RTCM3(*ephGPS, Array);
    9696          }
    9797        }
    98         else if (ephGPS && ephGPS->type() == t_eph::QZSS && (system == "ALL" || system == "QZSS")) {
     98        else if (ephGPS && ephGPS->type() == t_eph::QZSS && (system == "ALL" || system.contains('J'))) {
    9999          if (dt <  7200.0 || dt > -3600.0) {
    100100            size = t_ephEncoder::RTCM3(*ephGPS, Array);
    101101          }
    102102        }
    103         else if (ephGlo && (system == "ALL" || system == "GLONASS")) {
     103        else if (ephGlo && (system == "ALL" || system.contains('R'))) {
    104104          if (dt <  3900.0 || dt > -2100.0) {
    105105            size = t_ephEncoder::RTCM3(*ephGlo, Array);
    106106          }
    107107        }
    108         else if (ephGal && (system == "ALL" || system == "Galileo")) {
     108        else if (ephGal && (system == "ALL" || system.contains('E'))) {
    109109          if (dt < 14400.0 || dt >     0.0) {
    110110            size = t_ephEncoder::RTCM3(*ephGal, Array);
    111111          }
    112112        }
    113         else if (ephSBAS && (system == "ALL" || system == "SBAS")) {
     113        else if (ephSBAS && (system == "ALL" || system.contains('S'))) {
    114114          if (dt <   600.0 || dt >  -600.0) {
    115115            size = t_ephEncoder::RTCM3(*ephSBAS, Array);
    116116          }
    117117        }
    118         else if (ephBDS && (system == "ALL" || system == "BDS")) {
     118        else if (ephBDS && (system == "ALL" || system.contains('C'))) {
    119119          if (dt <  3900.0 || dt >     0.0) {
    120120            size = t_ephEncoder::RTCM3(*ephBDS, Array);
    121121          }
    122122        }
    123         else if (ephGPS && ephGPS->type() == t_eph::IRNSS && (system == "ALL" || system == "IRNSS")) {
     123        else if (ephGPS && ephGPS->type() == t_eph::IRNSS && (system == "ALL" || system.contains('I'))) {
    124124          if (fabs(dt < 86400.0)) {
    125125            size = t_ephEncoder::RTCM3(*ephGPS, Array);
Note: See TracChangeset for help on using the changeset viewer.