Changeset 6598 in ntrip


Ignore:
Timestamp:
Feb 19, 2015, 6:18:11 PM (9 years ago)
Author:
stoecker
Message:

rename Compass to BDS

Location:
trunk/BNC/src
Files:
6 edited

Legend:

Unmodified
Added
Removed

  • trunk/BNC/src/RTCM3/RTCM3Decoder.cpp

    r6595 r6598  
    7878  connect(this, SIGNAL(newGalileoEph(t_ephGal)), BNC_CORE, SLOT(slotNewGalileoEph(t_ephGal)));
    7979  connect(this, SIGNAL(newSBASEph(t_ephSBAS)),   BNC_CORE, SLOT(slotNewSBASEph(t_ephSBAS)));
    80   connect(this, SIGNAL(newCompassEph(t_ephCompass)), BNC_CORE, SLOT(slotNewCompassEph(t_ephCompass)));
     80  connect(this, SIGNAL(newBDSEph(t_ephBDS)),     BNC_CORE, SLOT(slotNewBDSEph(t_ephBDS)));
    8181
    8282  // Mode can be either observations or corrections
    … …  
    262262              }
    263263
    264               // COMPASS
     264              // BDS
    265265              // -------------
    266               else if (satID >= PRN_COMPASS_START && satID <= PRN_COMPASS_END) {
    267                 obs._prn.set('C', satID - PRN_COMPASS_START + 1);
     266              else if (satID >= PRN_BDS_START && satID <= PRN_BDS_END) {
     267                obs._prn.set('C', satID - PRN_BDS_START + 1);
    268268              }
    269269
    … …  
    412412          }
    413413
    414           // COMPASS Ephemeris
     414          // BDS Ephemeris
    415415          // -----------------
    416           else if (rr == 63) {
    417             decoded = true;
    418 //            t_ephCompass eph; eph.set(&parser.ephemerisCompass);
    419 //            emit newCompassEph(eph);
     416          else if (rr == RTCM3ID_BDS) {
     417            decoded = true;
     418            t_ephBDS eph; eph.set(&parser.ephemerisBDS);
     419            emit newBDSEph(eph);
    420420          }
    421421        }

  • trunk/BNC/src/RTCM3/RTCM3Decoder.h

    r6595 r6598  
    5252  void newSBASEph(t_ephSBAS eph);
    5353  void newGalileoEph(t_ephGal eph);
    54   void newCompassEph(t_ephCompass eph);
     54  void newBDSEph(t_ephBDS eph);
    5555
    5656 private:

  • trunk/BNC/src/bnccore.cpp

    r6595 r6598  
    119119  qRegisterMetaType<t_ephGal>               ("t_ephGal");
    120120  qRegisterMetaType<t_ephSBAS>              ("t_ephSBAS");
    121   qRegisterMetaType<t_ephCompass>           ("t_ephCompass");
     121  qRegisterMetaType<t_ephBDS>               ("t_ephBDS");
    122122  qRegisterMetaType<QList<t_orbCorr> >      ("QList<t_orbCorr>");
    123123  qRegisterMetaType<QList<t_clkCorr> >      ("QList<t_clkCorr>");
    … …  
    250250}
    251251
    252 // New Compass Ephemeris
    253 ////////////////////////////////////////////////////////////////////////////
    254 void t_bncCore::slotNewCompassEph(t_ephCompass eph) {
     252// New BDS Ephemeris
     253////////////////////////////////////////////////////////////////////////////
     254void t_bncCore::slotNewBDSEph(t_ephBDS eph) {
    255255  if (checkPrintEph(&eph) == success) {
    256     emit newCompassEph(eph);
     256    emit newBDSEph(eph);
    257257  }
    258258}

  • trunk/BNC/src/bnccore.h

    r6595 r6598  
    8080  void slotNewGalileoEph(t_ephGal);
    8181  void slotNewSBASEph(t_ephSBAS);
    82   void slotNewCompassEph(t_ephCompass);
     82  void slotNewBDSEph(t_ephBDS);
    8383  void slotNewOrbCorrections(QList<t_orbCorr>);
    8484  void slotNewClkCorrections(QList<t_clkCorr>);
    … …  
    9494  void newSBASEph(t_ephSBAS eph);
    9595  void newGalileoEph(t_ephGal eph);
    96   void newCompassEph(t_ephCompass eph);
     96  void newBDSEph(t_ephBDS eph);
    9797  void newOrbCorrections(QList<t_orbCorr>);
    9898  void newClkCorrections(QList<t_clkCorr>);

  • trunk/BNC/src/bncephuser.cpp

    r6595 r6598  
    1 // Part of BNC, a utility for retrieving decoding and
    21// converting GNSS data streams from NTRIP broadcasters.
    32//
    … …  
    6261            this, SLOT(slotNewSBASEph(t_ephSBAS)), Qt::DirectConnection);
    6362
    64     connect(BNC_CORE, SIGNAL(newCompassEph(t_ephCompass)),
    65             this, SLOT(slotNewCompassEph(t_ephCompass)), Qt::DirectConnection);
     63    connect(BNC_CORE, SIGNAL(newBDSEph(t_ephBDS)),
     64            this, SLOT(slotNewBDSEph(t_ephBDS)), Qt::DirectConnection);
    6665  }
    6766}
    … …  
    104103}
    105104
    106 // New Compass Ephemeris
    107 ////////////////////////////////////////////////////////////////////////////
    108 void bncEphUser::slotNewCompassEph(t_ephCompass eph) {
     105// New BDS Ephemeris
     106////////////////////////////////////////////////////////////////////////////
     107void bncEphUser::slotNewBDSEph(t_ephBDS eph) {
    109108  putNewEph(&eph, false);
    110109}
    … …  
    128127  const t_ephGal*     ephGal     = dynamic_cast<const t_ephGal*>(eph);
    129128  const t_ephSBAS*    ephSBAS    = dynamic_cast<const t_ephSBAS*>(eph);
    130   const t_ephCompass* ephCompass = dynamic_cast<const t_ephCompass*>(eph);
     129  const t_ephBDS*     ephBDS     = dynamic_cast<const t_ephBDS*>(eph);
    131130
    132131  t_eph* newEph = 0;
    … …  
    144143    newEph = new t_ephSBAS(*ephSBAS);
    145144  }
    146   else if (ephCompass) {
    147     newEph = new t_ephCompass(*ephCompass);
     145  else if (ephBDS) {
     146    newEph = new t_ephBDS(*ephBDS);
    148147  }
    149148  else {

  • trunk/BNC/src/bncephuser.h

    r6595 r6598  
    4242  void slotNewGalileoEph(t_ephGal);
    4343  void slotNewSBASEph(t_ephSBAS);
    44   void slotNewCompassEph(t_ephCompass);
     44  void slotNewBDSEph(t_ephBDS);
    4545
    4646 public:
Note: See TracChangeset for help on using the changeset viewer.