Changeset 382 in ntrip

Timestamp:

Jan 26, 2007, 4:25:57 PM (17 years ago)

Author:

mervart

Message:

* empty log message *

Location:

trunk/BNC

Files:

• bnccaster.cpp (modified) (5 diffs)
• bnccaster.h (modified) (2 diffs)
• test_bnc_qt.cpp (modified) (1 diff)

trunk/BNC/bnccaster.cpp

@@ -93 +93 @@
     _waitTime = 1;
   }
+
+  // Start dump epoch loop
+  // ---------------------
+  _newTime = 0;
+  dumpEpochSlot();
 }
 
@@ -133 +138 @@
 
   long iSec    = long(floor(obs->GPSWeeks+0.5));
-  long newTime = obs->GPSWeek * 7*24*3600 + iSec;
+  _newTime = obs->GPSWeek * 7*24*3600 + iSec;
 
   // Rename the Station
@@ -150 +155 @@
     rnx->deepCopy(obs);
   }
-  rnx->dumpEpoch(newTime);
+  rnx->dumpEpoch(_newTime);
 
   // First time, set the _lastDumpSec immediately
   // --------------------------------------------
   if (_lastDumpSec == 0) {
-    _lastDumpSec = newTime - 1;
+    _lastDumpSec = _newTime - 1;
   }
 
   // An old observation - throw it away
   // ----------------------------------
-  if (newTime <= _lastDumpSec) {
+  if (_newTime <= _lastDumpSec) {
     if (firstObs) {
       QSettings settings;
@@ -175 +180 @@
   // Save the observation
   // --------------------
-  _epochs->insert(newTime, obs);
-
-  // Dump older epochs
-  // -----------------
-  dumpEpochs(_lastDumpSec + 1, newTime - _waitTime);
-
-  if (_lastDumpSec < newTime - _waitTime) {
-    _lastDumpSec = newTime - _waitTime;
-  }
+  _epochs->insert(_newTime, obs);
+}
+
+// Dump Loop Event
+////////////////////////////////////////////////////////////////////////////
+void bncCaster::dumpEpochSlot() {
+  if (_newTime != 0 && _epochs->size() > 0) {
+    dumpEpochs(_lastDumpSec + 1, _newTime - _waitTime);
+
+    if (_lastDumpSec < _newTime - _waitTime) {
+      _lastDumpSec = _newTime - _waitTime;
+    }
+  }
+  QTimer::singleShot(100, this, SLOT(dumpEpochSlot()));
 }
 
@@ -282 +292 @@
               sock->write(&begEpoch, 1);
             }
-            sock->write(&begObs, 1);
-            sock->write((char*) obs, numBytes);
-            if (!it.hasNext()) {
-              sock->write(&endEpoch, 1);
-            }
+////            sock->write(&begObs, 1);
+////            sock->write((char*) obs, numBytes);
+////            if (!it.hasNext()) {
+////              sock->write(&endEpoch, 1);
+////            }
           }
         }

trunk/BNC/bnccaster.h

@@ -57 +57 @@
    void slotNewConnection();
    void slotGetThreadError(const QByteArray& staID);
+   void dumpEpochSlot();
 
  private:
@@ -74 +75 @@
    long                           _waitTime;
    QMutex                         _mutex;
+   long                           _newTime;
 };
 

trunk/BNC/test_bnc_qt.cpp

@@ -31 +31 @@
     if ( socket.bytesAvailable() ) {
       int bytesRecv = socket.read(&flag, 1);
+      cout << flag << endl;
       if (flag == begObs) {
         if ( socket.bytesAvailable() >= sizeof(obs) ) {