Changeset 462 in ntrip

Timestamp:

May 26, 2007, 11:15:35 AM (17 years ago)

Author:

mervart

Message:

* empty log message *

Location:

trunk/BNC

Files:

• bnccaster.cpp (modified) (4 diffs)
• bnccaster.h (modified) (2 diffs)

trunk/BNC/bnccaster.cpp

@@ -93 +93 @@
     _waitTime = 1;
   }
-
-  // Start dump epoch loop
-  // ---------------------
-  _newObsRunning = false;
-  _newTime = 0;
-  dumpEpochSlot();
 }
 
@@ -124 +118 @@
 
   QMutexLocker locker(&_mutex);
-  _newObsRunning = true;
 
   long iSec    = long(floor(obs->GPSWeeks+0.5));
-  _newTime = obs->GPSWeek * 7*24*3600 + iSec;
+  long newTime = obs->GPSWeek * 7*24*3600 + iSec;
 
   // Rename the Station
@@ -137 +130 @@
   // --------------------------------------------
   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;
@@ -157 +150 @@
   // Save the observation
   // --------------------
-  _epochs->insert(_newTime, obs);
-
-  _newObsRunning = false;
-}
-
-// Dump Loop Event
-////////////////////////////////////////////////////////////////////////////
-void bncCaster::dumpEpochSlot() {
-  if (!_newObsRunning) {
-    if (_newTime != 0 && _epochs->size() > 0) {
-      dumpEpochs(_lastDumpSec + 1, _newTime - _waitTime);
-    
-      if (_lastDumpSec < _newTime - _waitTime) {
-        _lastDumpSec = _newTime - _waitTime;
-      }
-    }
-  }
-  QTimer::singleShot(100, this, SLOT(dumpEpochSlot()));
+  _epochs->insert(newTime, obs);
+
+  // Dump Epochs
+  // -----------
+  if (newTime - _waitTime > _lastDumpSec) {
+    dumpEpochs(_lastDumpSec + 1, newTime - _waitTime);
+    _lastDumpSec = newTime - _waitTime;
+  }
 }
 

trunk/BNC/bnccaster.h

@@ -52 +52 @@
    void slotNewConnection();
    void slotGetThreadError(const QByteArray staID);
-   void dumpEpochSlot();
 
  private:
@@ -69 +68 @@
    long                           _waitTime;
    QMutex                         _mutex;
-   long                           _newTime;
-   bool                           _newObsRunning;
 };