Changeset 5994 in ntrip for trunk/BNC


Ignore:
Timestamp:
Aug 18, 2014, 9:04:31 AM (10 years ago)
Author:
mervart
Message:
 
Location:
trunk/BNC/src
Files:
2 edited

Legend:

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

    r5993 r5994  
    9898
    9999  int nmeaPort = settings.value("PPP/nmeaPort").toInt();
    100   cout << "nmeaPort = " << nmeaPort << endl;
    101100  if (nmeaPort != 0) {
    102101    _nmeaServer = new QTcpServer;
     
    293292          this, SLOT(slotGetThreadFinished(QByteArray)));
    294293
    295   connect(BNC_CORE, SIGNAL(newNMEAstr(QByteArray)), this, SLOT(slotNewNMEAstr(QByteArray)));
     294  connect(BNC_CORE, SIGNAL(newNMEAstr(QByteArray, QByteArray)),
     295          this,     SLOT(slotNewNMEAstr(QByteArray, QByteArray)));
    296296
    297297  _staIDs.push_back(getThread->staID());
     
    534534//
    535535////////////////////////////////////////////////////////////////////////////
    536 void bncCaster::slotNewNMEAstr(QByteArray str) {
     536void bncCaster::slotNewNMEAstr(QByteArray staID, QByteArray str) {
    537537  if (_nmeaSockets) {
    538538    QMutableListIterator<QTcpSocket*> is(*_nmeaSockets);
  • trunk/BNC/src/bnccaster.h

    r5738 r5994  
    4747   void slotNewObs(QByteArray staID, QList<t_obs> obsList);
    4848   void slotNewRawData(QByteArray staID, QByteArray data);
    49    void slotNewNMEAstr(QByteArray str);
     49   void slotNewNMEAstr(QByteArray staID, QByteArray str);
    5050   void slotNewMiscConnection();
    5151
Note: See TracChangeset for help on using the changeset viewer.