Changeset 5206 in ntrip


Ignore:
Timestamp:
Jun 11, 2013, 3:24:07 PM (9 years ago)
Author:
mervart
Message:
 
Location:
trunk/BNC/src
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • trunk/BNC/src/RTCM3/RTCM3Decoder.cpp

    r5070 r5206  
    7676  connect(this, SIGNAL(newGPSEph(gpsephemeris*)),
    7777          BNC_CORE, SLOT(slotNewGPSEph(gpsephemeris*)));
    78   connect(this, SIGNAL(newGlonassEph(glonassephemeris*)),
    79           BNC_CORE, SLOT(slotNewGlonassEph(glonassephemeris*)));
     78  connect(this, SIGNAL(newGlonassEph(glonassephemeris*, const QString&)),
     79          BNC_CORE, SLOT(slotNewGlonassEph(glonassephemeris*, const QString&)));
    8080  connect(this, SIGNAL(newGalileoEph(galileoephemeris*)),
    8181          BNC_CORE, SLOT(slotNewGalileoEph(galileoephemeris*)));
     
    359359          else if (rr == 1020) {
    360360            decoded = true;
    361             emit newGlonassEph(new glonassephemeris(parser.ephemerisGLONASS));
     361            emit newGlonassEph(new glonassephemeris(parser.ephemerisGLONASS), _staID);
    362362          }
    363363
  • trunk/BNC/src/RTCM3/RTCM3Decoder.h

    r3578 r5206  
    4949  void newMessage(QByteArray msg,bool showOnScreen);
    5050  void newGPSEph(gpsephemeris* gpseph);
    51   void newGlonassEph(glonassephemeris* glonasseph);
     51  void newGlonassEph(glonassephemeris* glonasseph, const QString& staID);
    5252  void newGalileoEph(galileoephemeris* galileoeph);
    5353
  • trunk/BNC/src/bnccore.cpp

    r5133 r5206  
    249249// New Glonass Ephemeris
    250250////////////////////////////////////////////////////////////////////////////
    251 void t_bncCore::slotNewGlonassEph(glonassephemeris* glonasseph) {
     251void t_bncCore::slotNewGlonassEph(glonassephemeris* glonasseph, const QString& staID) {
    252252
    253253  QMutexLocker locker(&_mutex);
     
    285285    delete *ee;
    286286    *ee = glonasseph;
    287     printGlonassEph(glonasseph, true);
     287    printGlonassEph(glonasseph, true, staID);
    288288  }
    289289  else {
    290     printGlonassEph(glonasseph, false);
     290    printGlonassEph(glonasseph, false, staID);
    291291    delete glonasseph;
    292292  }
     
    515515// Print One Glonass Ephemeris
    516516////////////////////////////////////////////////////////////////////////////
    517 void t_bncCore::printGlonassEph(glonassephemeris* ep, bool printFile) {
     517void t_bncCore::printGlonassEph(glonassephemeris* ep, bool printFile, const QString& staID) {
    518518
    519519  t_ephGlo eph;
     
    522522  QString strV2 = eph.toString(2.11);
    523523  QString strV3 = eph.toString(3.01);
     524
     525  //// beg test Dirk
     526  //// cout << staID.toAscii().data() << endl
     527  ////      << strV3.toAscii().data() << endl;
     528  //// end test Dirk
    524529
    525530  printOutput(printFile, _ephStreamGlonass, strV2, strV3);
  • trunk/BNC/src/bnccore.h

    r5121 r5206  
    7070    void slotMessage(QByteArray msg, bool showOnScreen);
    7171    void slotNewGPSEph(gpsephemeris* gpseph);
    72     void slotNewGlonassEph(glonassephemeris* glonasseph);
     72    void slotNewGlonassEph(glonassephemeris* glonasseph, const QString& staID);
    7373    void slotNewGalileoEph(galileoephemeris* galileoeph);
    7474    void slotNewCorrLine(QString line, QString staID, bncTime coTime);
     
    8888    void printEphHeader();
    8989    void printGPSEph(gpsephemeris* ep, bool printFile);
    90     void printGlonassEph(glonassephemeris* ep, bool printFile);
     90    void printGlonassEph(glonassephemeris* ep, bool printFile, const QString& staID);
    9191    void printGalileoEph(galileoephemeris* ep, bool printFile);
    9292    void printOutput(bool printFile, QTextStream* stream,
Note: See TracChangeset for help on using the changeset viewer.