Changeset 974 in ntrip

Timestamp:

Jul 26, 2008, 10:10:54 AM (16 years ago)

Author:

mervart

Message:

* empty log message *

Location:

trunk/BNC

Files:

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

trunk/BNC/RTCM3/RTCM3coDecoder.cpp

@@ -68 +68 @@
   _out = 0;
 
-  connect(this, SIGNAL(newCorrLine(QString, QString)), 
-          (bncApp*) qApp, SLOT(slotNewCorrLine(QString, QString)));
+  connect(this, SIGNAL(newCorrLine(QString, QString, long)), 
+          (bncApp*) qApp, SLOT(slotNewCorrLine(QString, QString, long)));
 }
 
@@ -175 +175 @@
                _co.Sat[ii].Orbit.DeltaAlongTrack,
                _co.Sat[ii].Orbit.DeltaCrossTrack);
-        printLine(line);
+        long coTime = GPSweek * 7*24*3600 + long(floor(GPSweeks+0.5));
+        printLine(line, coTime);
       }
       for(int ii = CLOCKORBIT_NUMGPS; 
@@ -186 +187 @@
                _co.Sat[ii].Orbit.DeltaAlongTrack,
                _co.Sat[ii].Orbit.DeltaCrossTrack);
-        printLine(line);
+        long coTime = GPSweek * 7*24*3600 + long(floor(GPSweeks+0.5));
+        printLine(line, coTime);
       }
       _buffer = _buffer.substr(bytesused);
@@ -202 +204 @@
 // 
 ////////////////////////////////////////////////////////////////////////////
-void RTCM3coDecoder::printLine(const QString& line) {
+void RTCM3coDecoder::printLine(const QString& line, long coTime) {
   if (_out) {
     *_out << line.toAscii().data() << endl;
@@ -208 +210 @@
   }
 
-  emit newCorrLine(line, _staID);
-}
+  emit newCorrLine(line, _staID, coTime);
+}

trunk/BNC/RTCM3/RTCM3coDecoder.h

@@ -45 +45 @@
 
  signals:
-  void newCorrLine(QString line, QString staID);
+  void newCorrLine(QString line, QString staID, long coTime);
 
  private:
   void reopen();
-  void printLine(const QString& line);
+  void printLine(const QString& line, long coTime);
 
   int                 _port;

trunk/BNC/bncapp.cpp

@@ -597 +597 @@
 // 
 ////////////////////////////////////////////////////////////////////////////
-void bncApp::slotNewCorrLine(QString line, QString staID) {
-  if (_socketsCorr) {
-    QMutableListIterator<QTcpSocket*> is(*_socketsCorr);
-    while (is.hasNext()) {
-      QTcpSocket* sock = is.next();
-      if (sock->state() == QAbstractSocket::ConnectedState) {
-        if (sock->write(QString(line + " " + staID + "\n").toAscii()) == -1) {
-          delete sock;
-          is.remove();
-        }
-      }
-      else if (sock->state() != QAbstractSocket::ConnectingState) {
+void bncApp::slotNewCorrLine(QString line, QString staID, long coTime) {
+
+  QMutexLocker locker(&_mutex);
+
+  if (!_socketsCorr) {
+    return;
+  }
+
+  // First time, set the _lastDumpSec immediately
+  // --------------------------------------------
+  if (_lastDumpCoSec == 0) {
+    _lastDumpCoSec = coTime - 1;
+  }
+
+  QMutableListIterator<QTcpSocket*> is(*_socketsCorr);
+  while (is.hasNext()) {
+    QTcpSocket* sock = is.next();
+    if (sock->state() == QAbstractSocket::ConnectedState) {
+      if (sock->write(QString(line + " " + staID + "\n").toAscii()) == -1) {
         delete sock;
         is.remove();
       }
     }
-  }
-}
+    else if (sock->state() != QAbstractSocket::ConnectingState) {
+      delete sock;
+      is.remove();
+    }
+  }
+}

trunk/BNC/bncapp.h

@@ -46 +46 @@
     void slotNewGPSEph(gpsephemeris* gpseph);
     void slotNewGlonassEph(glonassephemeris* glonasseph);
-    void slotNewCorrLine(QString line, QString staID);
+    void slotNewCorrLine(QString line, QString staID, long coTime);
     void slotQuit();