Changeset 5648 in ntrip

Timestamp:

Feb 23, 2014, 6:08:38 PM (11 years ago)

Author:

mervart

Message:

 

Location:

trunk/BNC/src

Files:

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

trunk/BNC/src/bnccaster.cpp

@@ -301 +301 @@
           this,      SLOT(slotNewObs(QByteArray, QList<t_obs>)));
 
+  connect(getThread, SIGNAL(newRawData(QByteArray, QByteArray)),
+          this,      SLOT(slotNewRawData(QByteArray, QByteArray)));
+
 #ifdef RTROVER_INTERFACE
   if (_bncRtrover) {
@@ -598 +601 @@
 }
 
-//      // Output into the Miscellaneous socket // Georg
-//      // ------------------------------------
-//      if (_miscSockets && _miscMount != "ALL") {
-//        QMutableListIterator<QTcpSocket*> is(*_miscSockets);
-//        while (is.hasNext()) {
-//          QTcpSocket* sock = is.next();
-//          if (sock->state() == QAbstractSocket::ConnectedState) {
-//            if (myMiscWrite(sock, data, nBytes) != nBytes) {
-//              delete sock;
-//              is.remove();
-//            }       
-//          }       
-//          else if (sock->state() != QAbstractSocket::ConnectingState) {
-//            delete sock;
-//            is.remove();
-//          }       
+// Output into the Miscellaneous socket // Georg
+////////////////////////////////////////////////////////////////////////////
+void bncCaster::slotNewRawData(QByteArray staID, QByteArray data) {
+  if (_miscSockets && (_miscMount == "ALL" || _miscMount == staID)) {
+    QMutableListIterator<QTcpSocket*> is(*_miscSockets);
+    while (is.hasNext()) {
+      QTcpSocket* sock = is.next();
+      if (sock->state() == QAbstractSocket::ConnectedState) {
+        sock->write(data);
+//        if (myMiscWrite(sock, data, nBytes) != nBytes) {
+//          delete sock;
+//          is.remove();
 //        }       
-//      } 
-
+      }       
+      else if (sock->state() != QAbstractSocket::ConnectingState) {
+        delete sock;
+        is.remove();
+      }       
+    }       
+  } 
+}
 
 // New Connection // Georg
@@ -625 +630 @@
                    .arg(_miscSockets->size()).toAscii(), true) );
 }
-
-// Write buffer // Georg
-////////////////////////////////////////////////////////////////////////////
-int bncCaster::myMiscWrite(QTcpSocket* sock, const char* buf, int bufLen) {
-  sock->write(buf, bufLen);
-  for (int ii = 1; ii <= 10; ii++) {
-    if (sock->waitForBytesWritten(10)) {  // wait 10 ms
-      return bufLen;
-    }
-  }
-  return -1;
-}
-

trunk/BNC/src/bnccaster.h

@@ -49 +49 @@
  public slots:
    void slotNewObs(QByteArray staID, QList<t_obs> obsList);
+   void slotNewRawData(QByteArray staID, QByteArray data);
    void slotNewNMEAstr(QByteArray str);
    void slotNewMiscConnection();
@@ -67 +68 @@
    void dumpEpochs(long minTime, long maxTime);
    static int myWrite(QTcpSocket* sock, const char* buf, int bufLen);
-   static int myMiscWrite(QTcpSocket* sock, const char* buf, int bufLen);
    void reopenOutFile();
 

trunk/BNC/src/bncgetthread.cpp

@@ -461 +461 @@
       else {
         emit newBytes(_staID, nBytes);
+        emit newRawData(_staID, data);
       }
 

trunk/BNC/src/bncgetthread.h

@@ -77 +77 @@
  signals:
    void newBytes(QByteArray staID, double nbyte);
+   void newRawData(QByteArray staID, QByteArray data);
    void newLatency(QByteArray staID, double clate);
    void newObs(QByteArray staID, QList<t_obs> obsList);