Changeset 4183 in ntrip

Timestamp:

May 16, 2012, 9:50:19 AM (12 years ago)

Author:

mervart

Message:

 

Location:

trunk/BNC/combination

Files:

• bnccomb.cpp (modified) (4 diffs)
• bnccomb.h (modified) (1 diff)

trunk/BNC/combination/bnccomb.cpp

@@ -30 +30 @@
 #include "bnctides.h"
 
-const int moduloTime = 10;
-
 const double sig0_offAC    = 1000.0;
 const double sig0_offACSat =  100.0;
@@ -140 +138 @@
 
   QStringList combineStreams = settings.value("combineStreams").toStringList();
+
+  _cmbSampl = settings.value("cmbSampl").toInt();
+  if (_cmbSampl <= 0) {
+    _cmbSampl = 10;
+  }
 
   _masterMissingEpochs = 0;
@@ -329 +332 @@
   // Check Modulo Time
   // -----------------
-  if (int(newCorr->tClk.gpssec()) % moduloTime != 0.0) {
+  if (int(newCorr->tClk.gpssec()) % _cmbSampl != 0.0) {
     delete newCorr;
     return;
@@ -368 +371 @@
   while (itTime.hasNext()) {
     bncTime epoTime = itTime.next();
-    if (epoTime < newCorr->tClk - moduloTime) {
+    if (epoTime < newCorr->tClk - _cmbSampl) {
       _resTime = epoTime;
       processEpoch();

trunk/BNC/combination/bnccomb.h

@@ -108 +108 @@
   e_method                _method;
   bool                    _useGlonass;
+  int                     _cmbSampl;
   QMap<QString, cmbCorr*> _orbitCorrs;
 };