Changeset 3528 in ntrip for trunk/BNC/bncgetthread.cpp

Timestamp:

Dec 16, 2011, 5:23:35 PM (12 years ago)

Author:

mervart

Message:

 

File:

• trunk/BNC/bncgetthread.cpp (modified) (7 diffs)

trunk/BNC/bncgetthread.cpp

@@ -52 +52 @@
 #include "bncapp.h"
 #include "bncutils.h"
-#include "bncrinex.h"
 #include "bnczerodecoder.h"
 #include "bncnetqueryv0.h"
@@ -116 +115 @@
 void bncGetThread::initialize() {
 
+  bncSettings settings;
+
   setTerminationEnabled(true);
 
@@ -127 +128 @@
   _nextSleep     = 0;
   _PPPclient     = 0;
-
-  bncSettings settings;
-
-  _miscMount = settings.value("miscMount").toString();
-
-  // RINEX writer
-  // ------------
-  _samplingRate = settings.value("rnxSampl").toInt();
-  if ( settings.value("rnxPath").toString().isEmpty() ) { 
-    _rnx = 0;
-  }
-  else {
-    _rnx = new bncRinex(_staID, _mountPoint, _latitude, _longitude, 
-                        _nmea, _ntripVersion);
-  }
+  _miscMount     = settings.value("miscMount").toString();
 
   // Serial Port
@@ -364 +351 @@
     delete it.value();
   }
-  delete _rnx;
   delete _rawFile;
   delete _serialOutFile;
@@ -515 +501 @@
         _prnLastEpo[prn] = obsTime;
 
-        // RINEX Output
-        // ------------
-        if (_rnx) {
-          if (_samplingRate == 0 || iSec % _samplingRate == 0) {
-            _rnx->deepCopy(obs);
-          }
-          _rnx->dumpEpoch(_format, obsTime);
-        }
-      
+        decoder()->dumpRinexEpoch(obs, _format);
+
         // PPP Client
         // ----------
@@ -560 +539 @@
   if (_query && _query->status() == bncNetQuery::running) {
     _nextSleep = 0;
-    if (_rnx) {
-      _rnx->setReconnectFlag(false);
+    QMapIterator<QString, GPSDecoder*> itDec(_decoders);
+    while (itDec.hasNext()) {
+      itDec.next();
+      GPSDecoder* decoder = itDec.value();
+      decoder->setRinexReconnectFlag(false);
     }
     return success;
@@ -623 +605 @@
   }
 
-  if (_rnx) {
-    _rnx->setReconnectFlag(true);
+  QMapIterator<QString, GPSDecoder*> itDec(_decoders);
+  while (itDec.hasNext()) {
+    itDec.next();
+    GPSDecoder* decoder = itDec.value();
+    decoder->setRinexReconnectFlag(false);
   }