Changeset 3109 in ntrip for trunk/BNC

Timestamp:

Mar 22, 2011, 10:57:19 AM (14 years ago)

Author:

mervart

Message:

 

Location:

trunk/BNC

Files:

• bncapp.cpp (modified) (4 diffs)
• bncapp.h (modified) (1 diff)
• bncwindow.cpp (modified) (1 diff)

trunk/BNC/bncapp.cpp ¶

@@ -751 +751 @@
 
   bncSettings settings;
-  _waitCoTime    = settings.value("corrTime").toInt();
-  if (_waitCoTime < 1) {
-    _waitCoTime = 1;
+  _waitCoTime = settings.value("corrTime").toInt();
+  if (_waitCoTime < 0) {
+    _waitCoTime = 0;
   }
 
@@ -764 +764 @@
   // An old correction - throw it away
   // ---------------------------------
-  if (coTime <= _lastDumpCoSec) {
+  if (_waitCoTime > 0 && coTime <= _lastDumpCoSec) {
     if (!_bncComb) {
       QString line = staID + ": Correction for one sat neglected because overaged by " +
@@ -779 +779 @@
   // Dump Corrections
   // ----------------
-  if (coTime - _waitCoTime > _lastDumpCoSec) {
+  if      (_waitCoTime == 0) {
+    dumpCorrs();
+  }
+  else if (coTime - _waitCoTime > _lastDumpCoSec) {
     dumpCorrs(_lastDumpCoSec + 1, coTime - _waitCoTime);
     _lastDumpCoSec = coTime - _waitCoTime;
@@ -788 +791 @@
 ////////////////////////////////////////////////////////////////////////////
 void bncApp::dumpCorrs(long minTime, long maxTime) {
-
   for (long sec = minTime; sec <= maxTime; sec++) {
     QList<QString> allCorrs = _corrs->values(sec);
-    emit newCorrections(allCorrs);
-    if (_socketsCorr) {
-      QListIterator<QString> it(allCorrs);
-      while (it.hasNext()) {
-        QString corrLine = it.next() + "\n";
-      
-        QMutableListIterator<QTcpSocket*> is(*_socketsCorr);
-        while (is.hasNext()) {
-          QTcpSocket* sock = is.next();
-          if (sock->state() == QAbstractSocket::ConnectedState) {
-            if (sock->write(corrLine.toAscii()) == -1) {
-              delete sock;
-              is.remove();
-            }
-          }
-          else if (sock->state() != QAbstractSocket::ConnectingState) {
+    dumpCorrs(allCorrs);
+    _corrs->remove(sec);
+  }
+}
+
+// Dump all corrections
+////////////////////////////////////////////////////////////////////////////
+void bncApp::dumpCorrs() {
+}
+
+// Dump List of Corrections 
+////////////////////////////////////////////////////////////////////////////
+void bncApp::dumpCorrs(const QList<QString>& allCorrs) {
+  emit newCorrections(allCorrs);
+  if (_socketsCorr) {
+    QListIterator<QString> it(allCorrs);
+    while (it.hasNext()) {
+      QString corrLine = it.next() + "\n";
+    
+      QMutableListIterator<QTcpSocket*> is(*_socketsCorr);
+      while (is.hasNext()) {
+        QTcpSocket* sock = is.next();
+        if (sock->state() == QAbstractSocket::ConnectedState) {
+          if (sock->write(corrLine.toAscii()) == -1) {
             delete sock;
             is.remove();
           }
         }
+        else if (sock->state() != QAbstractSocket::ConnectingState) {
+          delete sock;
+          is.remove();
+        }
       }
     }
-    _corrs->remove(sec);
   }
 }

trunk/BNC/bncapp.h ¶

@@ -82 +82 @@
                      const QByteArray& allLines);
     void dumpCorrs(long minTime, long maxTime);
+    void dumpCorrs();
+    void dumpCorrs(const QList<QString>& allCorrs);
     void messagePrivate(const QByteArray& msg);
 

trunk/BNC/bncwindow.cpp ¶

@@ -206 +206 @@
   _corrPortLineEdit    = new QLineEdit(settings.value("corrPort").toString());
   _corrTimeSpinBox   = new QSpinBox();
-  _corrTimeSpinBox->setMinimum(1);
+  _corrTimeSpinBox->setMinimum(0);
   _corrTimeSpinBox->setMaximum(60);
   _corrTimeSpinBox->setSingleStep(1);