Changeset 936 in ntrip

Timestamp:

Jun 8, 2008, 5:40:11 PM (16 years ago)

Author:

mervart

Message:

* empty log message *

Location:

trunk/BNC

Files:

• RTCM3/RTCM3coDecoder.cpp (modified) (7 diffs)
• RTCM3/RTCM3coDecoder.h (modified) (2 diffs)
• bncapp.cpp (modified) (1 diff)
• bncapp.h (modified) (1 diff)

trunk/BNC/RTCM3/RTCM3coDecoder.cpp

@@ -45 +45 @@
 #include "bncutils.h"
 #include "bncrinex.h"
+#include "bncapp.h"
 
 using namespace std;
@@ -65 +66 @@
   _out = 0;
 
-  _port = settings.value("corrPort").toInt();
-  _server = 0;
-  _sockets = 0;
+  connect(this, SIGNAL(newCorrLine(QString)), 
+          (bncApp*) qApp, SLOT(slotNewCorrLine(QString)));
 }
 
@@ -74 +74 @@
 RTCM3coDecoder::~RTCM3coDecoder() {
   delete _out;
-  delete _server;
-  delete _sockets;
 }
 
@@ -82 +80 @@
 void RTCM3coDecoder::reopen() {
 
-  // Socket Server
-  // -------------
-  if (_port != 0 && _server == 0) {
-    _server = new QTcpServer;
-    _server->listen(QHostAddress::Any, _port);
-    QObject::connect(_server, SIGNAL(newConnection()), this, SLOT(slotNewConnection()));
-    _sockets = new QList<QTcpSocket*>;
-    cout << "new port = " << _port << endl;
-  }
-
-  // Output File
-  // ----------- 
   if (!_fileNameSkl.isEmpty()) {
 
@@ -117 +103 @@
     _out = new ofstream( _fileName.toAscii().data() );
   }
-}
-
-// New Connection
-////////////////////////////////////////////////////////////////////////////
-void RTCM3coDecoder::slotNewConnection() {
-  cout << "slotNewConnection" << endl;
-  _sockets->push_back( _server->nextPendingConnection() );
 }
 
@@ -222 +201 @@
 ////////////////////////////////////////////////////////////////////////////
 void RTCM3coDecoder::printLine(const QString& line) {
-
   if (_out) {
     *_out << line.toAscii().data();
@@ -228 +206 @@
   }
 
-  if (_sockets) {
-    QMutableListIterator<QTcpSocket*> is(*_sockets);
-    while (is.hasNext()) {
-      QTcpSocket* sock = is.next();
-      if (sock->state() == QAbstractSocket::ConnectedState) {
-        if (sock->write(line.toAscii()) == -1) {
-          delete sock;
-          is.remove();
-        }
-      }
-      else if (sock->state() != QAbstractSocket::ConnectingState) {
-        delete sock;
-        is.remove();
-      }
-    }
-  }
-}
+  emit newCorrLine(line);
+}

trunk/BNC/RTCM3/RTCM3coDecoder.h

@@ -44 +44 @@
   virtual t_irc Decode(char* buffer = 0, int bufLen = 0);
 
- private slots:
-  void slotNewConnection();
+ signals:
+  void newCorrLine(QString line);
 
  private:
@@ -58 +58 @@
   ClockOrbit          _co;
   Bias                _bias;
-  QTcpServer*         _server;
-  QList<QTcpSocket*>* _sockets;
 };
 

trunk/BNC/bncapp.cpp

@@ -570 +570 @@
 
 
+// 
+////////////////////////////////////////////////////////////////////////////
+void bncApp::slotNewCorrLine(QString line) {
+  cout << line.toAscii().data() << endl;
+}

trunk/BNC/bncapp.h

@@ -45 +45 @@
     void slotNewGPSEph(gpsephemeris* gpseph);
     void slotNewGlonassEph(glonassephemeris* glonasseph);
+    void slotNewCorrLine(QString line);
     void slotQuit();