Changeset 1222 in ntrip for trunk

Timestamp:

Nov 22, 2008, 2:09:45 PM (16 years ago)

Author:

mervart

Message:

* empty log message *

Location:

trunk/BNC

Files:

• RTCM3/RTCM3coDecoder.cpp (modified) (3 diffs)
• RTCM3/RTCM3coDecoder.h (modified) (1 diff)
• bnccaster.cpp (modified) (6 diffs)
• bnccaster.h (modified) (2 diffs)
• bncwindow.cpp (modified) (4 diffs)
• bncwindow.h (modified) (1 diff)

trunk/BNC/RTCM3/RTCM3coDecoder.cpp

@@ -109 +109 @@
 // 
 ////////////////////////////////////////////////////////////////////////////
-t_irc RTCM3coDecoder::Decode(char* buffer, int bufLen, vector<string>& errmsg) {
+t_irc RTCM3coDecoder::Decode(char* buffer, int /* bufLen */, 
+                             vector<string>& errmsg) {
 
   errmsg.clear();
 
-  _buffer.append(buffer, bufLen);
+  _buffer.append(buffer);
 
   t_irc retCode = failure;
@@ -198 +199 @@
         printLine(line, coTime);
       }
-      _buffer = _buffer.substr(bytesused);
+      _buffer = _buffer.mid(bytesused);
       retCode = success;
     }
@@ -205 +206 @@
     // ---------------
     else {
-      _buffer = _buffer.substr(1);
+      _buffer = _buffer.mid(1);
     }
   }

trunk/BNC/RTCM3/RTCM3coDecoder.h

@@ -56 +56 @@
   QString             _fileNameSkl;
   QString             _fileName;
-  std::string         _buffer;
+  QByteArray          _buffer;
   ClockOrbit          _co;
   Bias                _bias;

trunk/BNC/bnccaster.cpp

@@ -87 +87 @@
   }
 
+  int uPort = settings.value("outUPort").toInt();
+  if (uPort != 0) {
+    _uServer = new QTcpServer;
+    _uServer->listen(QHostAddress::Any, uPort);
+    connect(_uServer, SIGNAL(newConnection()), this, SLOT(slotNewUConnection()));
+    _uSockets = new QList<QTcpSocket*>;
+  }
+  else {
+    _uServer  = 0;
+    _uSockets = 0;
+  }
+
   _epochs = new QMultiMap<long, p_obs>;
 
@@ -111 +123 @@
   delete _server;
   delete _sockets;
+  delete _uServer;
+  delete _uSockets;
   if (_epochs) {
     QListIterator<p_obs> it(_epochs->values());
@@ -136 +150 @@
   obs->_o.StatID[sizeof(obs->_o.StatID)-1] = '\0';
         
+  const char begObs[] = "BEGOBS";
+  const int begObsNBytes = sizeof(begObs) - 1;
+
+  // Output into the socket
+  // ----------------------
+  if (_uSockets) {
+    QMutableListIterator<QTcpSocket*> is(*_uSockets);
+    while (is.hasNext()) {
+      QTcpSocket* sock = is.next();
+      if (sock->state() == QAbstractSocket::ConnectedState) {
+        bool ok = true;
+        if (myWrite(sock, begObs, begObsNBytes) != begObsNBytes) {
+          ok = false;
+        }
+        int numBytes = sizeof(obs->_o); 
+        if (myWrite(sock, (const char*)(&obs->_o), numBytes) != numBytes) {
+          ok = false;
+        }
+        if (!ok) {
+          delete sock;
+          is.remove();
+        }
+      }
+      else if (sock->state() != QAbstractSocket::ConnectingState) {
+        delete sock;
+        is.remove();
+      }
+    }
+  }
+
   // First time, set the _lastDumpSec immediately
   // --------------------------------------------
@@ -175 +219 @@
   emit( newMessage(QString("New Connection # %1")
                    .arg(_sockets->size()).toAscii()) );
+}
+
+void bncCaster::slotNewUConnection() {
+  _uSockets->push_back( _uServer->nextPendingConnection() );
+  emit( newMessage(QString("New Connection (usync) # %1")
+                   .arg(_uSockets->size()).toAscii()) );
 }
 
@@ -273 +323 @@
           while (is.hasNext()) {
             QTcpSocket* sock = is.next();
-            int myFlag = 0;
             if (sock->state() == QAbstractSocket::ConnectedState) {
               bool ok = true;
               if (first) {
                 if (myWrite(sock, begEpoch, begEpochNBytes) != begEpochNBytes) {
-                  myFlag = 1;
                   ok = false;
                 }
@@ -284 +332 @@
               int numBytes = sizeof(obs->_o); 
               if (myWrite(sock, (const char*)(&obs->_o), numBytes) != numBytes) {
-                myFlag = 2;
                 ok = false;
               }
               if (!it.hasNext()) {
                 if (myWrite(sock, endEpoch, endEpochNBytes) != endEpochNBytes) {
-                  myFlag = 3;
                   ok = false;
                 }

trunk/BNC/bnccaster.h

@@ -54 +54 @@
  private slots:
    void slotNewConnection();
+   void slotNewUConnection();
    void slotGetThreadError(QByteArray staID);
 
@@ -66 +67 @@
    long                    _lastDumpSec;
    QTcpServer*             _server;
+   QTcpServer*             _uServer;
    QList<QTcpSocket*>*     _sockets;
+   QList<QTcpSocket*>*     _uSockets;
    QList<QByteArray>       _staIDs;
    QList<bncGetThread*>    _threads;

trunk/BNC/bncwindow.cpp

@@ -125 +125 @@
   _outPortLineEdit    = new QLineEdit(settings.value("outPort").toString());
   _outPortLineEdit->setMaximumWidth(9*ww);
+  _outUPortLineEdit   = new QLineEdit(settings.value("outUPort").toString());
+  _outUPortLineEdit->setMaximumWidth(9*ww);
   _outEphPortLineEdit    = new QLineEdit(settings.value("outEphPort").toString());
   _outEphPortLineEdit->setMaximumWidth(9*ww);
@@ -264 +266 @@
   _outFileLineEdit->setWhatsThis(tr("Specify the full path to a file where synchronized observations are saved in plain ASCII format. Beware that the size of this file can rapidly increase depending on the number of incoming streams."));
   _outPortLineEdit->setWhatsThis(tr("BNC can produce synchronized observations in binary format on your local host through an IP port. Specify a port number here to activate this function."));
+  _outPortLineEdit->setWhatsThis(tr("Unsynchronized observations in binary format on your local host through an IP port. Specify a port number here to activate this function."));
   _outEphPortLineEdit->setWhatsThis(tr("BNC can produce ephemeris data in RINEX ASCII format on your local host through an IP port. Specify a port number here to activate this function."));
   _corrPortLineEdit->setWhatsThis(tr("BNC can produce Broadcast Ephemeris Corrections on your local host through an IP port. Specify a port number here to activate this function."));
@@ -345 +348 @@
   sLayout->addWidget(new QLabel("Port"),                          0, 0);
   sLayout->addWidget(_outPortLineEdit,                            0, 1);
+  sLayout->addWidget(new QLabel("Port (Unsynchronized)"),         0, 2);
+  sLayout->addWidget(_outUPortLineEdit,                           0, 3);
   sLayout->addWidget(new QLabel("Wait for full epoch"),           1, 0);
   sLayout->addWidget(_waitTimeSpinBox,                            1, 1);
   sLayout->addWidget(new QLabel("File (full path)"),              2, 0);
-  sLayout->addWidget(_outFileLineEdit,                            2, 1);
+  sLayout->addWidget(_outFileLineEdit,                            2, 1, 1, 3);
   sLayout->addWidget(new QLabel("Sampling"),                      3, 0, Qt::AlignLeft);
   sLayout->addWidget(_binSamplSpinBox,                            3, 1, Qt::AlignLeft);
-  sLayout->addWidget(new QLabel("Output synchronized observations epoch by epoch."),4,0,1,2,Qt::AlignLeft);
+  sLayout->addWidget(new QLabel("Output synchronized observations epoch by epoch."),4,0,1,4,Qt::AlignLeft);
   sLayout->addWidget(new QLabel("    "),5,0);
   sLayout->addWidget(new QLabel("    "),6,0);
@@ -634 +639 @@
   settings.setValue("perfIntr",    _perfIntrComboBox->currentText());
   settings.setValue("outPort",     _outPortLineEdit->text());
+  settings.setValue("outUPort",    _outUPortLineEdit->text());
   settings.setValue("outEphPort",  _outEphPortLineEdit->text());
   settings.setValue("corrPort",    _corrPortLineEdit->text());

trunk/BNC/bncwindow.h

@@ -102 +102 @@
     QLineEdit* _outFileLineEdit;
     QLineEdit* _outPortLineEdit;
+    QLineEdit* _outUPortLineEdit;
     QLineEdit* _outEphPortLineEdit;
     QLineEdit* _corrPortLineEdit;