Changeset 5722 in ntrip


Ignore:
Timestamp:
Jul 31, 2014, 1:57:27 PM (8 years ago)
Author:
mervart
Message:
 
Location:
trunk/BNC/src
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • trunk/BNC/src/PPP/pppThread.cpp

    r5721 r5722  
    6565void t_pppThread::run() {
    6666
    67 
    6867  // Connect to BNC Signals
    6968  // ----------------------
    70   connect(BNC_CORE, SIGNAL(newCorrections(QList<QString>)),
    71           this, SLOT(slotNewCorrections(QList<QString>)));
     69  if (BNC_CORE->caster()) {
     70    connect(BNC_CORE->caster(), SIGNAL(newObs(QByteArray, QList<t_obs>)),
     71          this,      SLOT(slotNewObs(QByteArray, QList<t_obs>)));
    7272
    73   connect(BNC_CORE, SIGNAL(newEphGPS(gpsephemeris)),
    74           this, SLOT(slotNewEphGPS(gpsephemeris)));
     73    connect(BNC_CORE, SIGNAL(newEphGPS(gpsephemeris)),
     74            this, SLOT(slotNewEphGPS(gpsephemeris)));
     75 
     76    connect(BNC_CORE, SIGNAL(newEphGlonass(glonassephemeris)),
     77            this, SLOT(slotNewEphGlonass(glonassephemeris)));
     78 
     79    connect(BNC_CORE, SIGNAL(newEphGalileo(galileoephemeris)),
     80            this, SLOT(slotNewEphGalileo(galileoephemeris)));
    7581
    76   connect(BNC_CORE, SIGNAL(newEphGlonass(glonassephemeris)),
    77           this, SLOT(slotNewEphGlonass(glonassephemeris)));
    78 
    79   connect(BNC_CORE, SIGNAL(newEphGalileo(galileoephemeris)),
    80           this, SLOT(slotNewEphGalileo(galileoephemeris)));
     82    connect(BNC_CORE, SIGNAL(newCorrections(QList<QString>)),
     83            this, SLOT(slotNewCorrections(QList<QString>)));
     84  }
    8185 
    8286  // Start processing loop
  • trunk/BNC/src/bnccaster.cpp

    r5680 r5722  
    283283          this,      SLOT(slotNewObs(QByteArray, QList<t_obs>)));
    284284
     285  connect(getThread, SIGNAL(newObs(QByteArray, QList<t_obs>)),
     286          this,      SIGNAL(slotNewObs(QByteArray, QList<t_obs>)));
     287
    285288  connect(getThread, SIGNAL(newRawData(QByteArray, QByteArray)),
    286289          this,      SLOT(slotNewRawData(QByteArray, QByteArray)));
  • trunk/BNC/src/bnccaster.h

    r5680 r5722  
    5454   void getThreadsFinished();   
    5555   void newMessage(QByteArray msg, bool showOnScreen);
     56   void newObs(QByteArray staID, QList<t_obs> obsList);
    5657
    5758 private slots:
  • trunk/BNC/src/bnccore.h

    r5578 r5722  
    5252    void setPortCorr(int port);
    5353    void setCaster(bncCaster* caster) {_caster = caster;}
     54    const bncCaster* caster() const {return _caster;}
    5455    QDateTime* _currentDateAndTimeGPS;
    5556    void setConfFileName(const QString& confFileName);
Note: See TracChangeset for help on using the changeset viewer.