Changeset 5120 in ntrip for trunk/BNC/src/bnccore.cpp

Timestamp:

Apr 14, 2013, 6:26:22 PM (11 years ago)

Author:

mervart

Message:

 

File:

• trunk/BNC/src/bnccore.cpp (modified) (6 diffs)

trunk/BNC/src/bnccore.cpp

@@ -115 +115 @@
   _userName = _userName.leftJustified(20, ' ', true);
 
-  _lastDumpCoSec = 0;
-
-  _corrs = new QMultiMap<long, QString>;
+  _corrs = new QMultiMap<bncTime, QString>;
 
   _currentDateAndTimeGPS = 0;
@@ -633 +631 @@
 // 
 ////////////////////////////////////////////////////////////////////////////
-void t_bncCore::slotNewCorrLine(QString line, QString staID, long coTime) {
+void t_bncCore::slotNewCorrLine(QString line, QString staID, bncTime coTime) {
 
   QMutexLocker locker(&_mutex);
@@ -646 +644 @@
 
   bncSettings settings;
-  _waitCoTime = settings.value("corrTime").toInt();
-  if (_waitCoTime < 0) {
-    _waitCoTime = 0;
+  _waitCoTime = settings.value("corrTime").toDouble();
+  if (_waitCoTime < 0.0) {
+    _waitCoTime = 0.0;
   }
 
   // First time, set the _lastDumpSec immediately
   // --------------------------------------------
-  if (_lastDumpCoSec == 0) {
-    _lastDumpCoSec = coTime - 1;
+  if (!_lastDumpCoSec.valid()) {
+    _lastDumpCoSec = coTime - 1.0;
   }
 
   // An old correction - throw it away
   // ---------------------------------
-  if (_waitCoTime > 0 && coTime <= _lastDumpCoSec) {
-    if (!_bncComb) {
+  if (_waitCoTime > 0.0 && coTime <= _lastDumpCoSec) {
+    ///    if (!_bncComb) {
       QString line = staID + ": Correction for one sat neglected because overaged by " +
-                      QString().sprintf(" %ld sec",
+                      QString().sprintf(" %f sec",
                       _lastDumpCoSec - coTime + _waitCoTime);
       messagePrivate(line.toAscii());
       emit( newMessage(line.toAscii(), true) );
-    }
+      ///    }
     return;
   }
@@ -674 +672 @@
   // Dump Corrections
   // ----------------
-  if      (_waitCoTime == 0) {
+  if      (_waitCoTime == 0.0) {
     dumpCorrs();
   }
@@ -685 +683 @@
 // Dump Complete Correction Epochs
 ////////////////////////////////////////////////////////////////////////////
-void t_bncCore::dumpCorrs(long minTime, long maxTime) {
-  for (long sec = minTime; sec <= maxTime; sec++) {
+void t_bncCore::dumpCorrs(bncTime minTime, bncTime maxTime) {
+  for (bncTime sec = minTime; sec <= maxTime; sec = sec + 1.0) {
     QList<QString> allCorrs = _corrs->values(sec);
     dumpCorrs(allCorrs);
@@ -697 +695 @@
 void t_bncCore::dumpCorrs() {
   QList<QString> allCorrs;
-  QMutableMapIterator<long, QString> it(*_corrs);
+  QMutableMapIterator<bncTime, QString> it(*_corrs);
   while (it.hasNext()) {
     allCorrs << it.next().value();