Changeset 5994 in ntrip for trunk/BNC/src

Timestamp:

Aug 18, 2014, 9:04:31 AM (10 years ago)

Author:

mervart

Message:

 

Location:

trunk/BNC/src

Files:

• bnccaster.cpp (modified) (3 diffs)
• bnccaster.h (modified) (1 diff)

trunk/BNC/src/bnccaster.cpp

@@ -98 +98 @@
 
   int nmeaPort = settings.value("PPP/nmeaPort").toInt();
-  cout << "nmeaPort = " << nmeaPort << endl;
   if (nmeaPort != 0) {
     _nmeaServer = new QTcpServer;
@@ -293 +292 @@
           this, SLOT(slotGetThreadFinished(QByteArray)));
 
-  connect(BNC_CORE, SIGNAL(newNMEAstr(QByteArray)), this, SLOT(slotNewNMEAstr(QByteArray)));
+  connect(BNC_CORE, SIGNAL(newNMEAstr(QByteArray, QByteArray)), 
+          this,     SLOT(slotNewNMEAstr(QByteArray, QByteArray)));
 
   _staIDs.push_back(getThread->staID());
@@ -534 +534 @@
 // 
 ////////////////////////////////////////////////////////////////////////////
-void bncCaster::slotNewNMEAstr(QByteArray str) {
+void bncCaster::slotNewNMEAstr(QByteArray staID, QByteArray str) {
   if (_nmeaSockets) {
     QMutableListIterator<QTcpSocket*> is(*_nmeaSockets);

trunk/BNC/src/bnccaster.h

@@ -47 +47 @@
    void slotNewObs(QByteArray staID, QList<t_obs> obsList);
    void slotNewRawData(QByteArray staID, QByteArray data);
-   void slotNewNMEAstr(QByteArray str);
+   void slotNewNMEAstr(QByteArray staID, QByteArray str);
    void slotNewMiscConnection();