Changeset 9671 in ntrip for branches/BNC_2.12

Timestamp:

Apr 4, 2022, 2:16:06 PM (2 years ago)

Author:

stuerze

Message:

minor changes to allow combination sampling iterval of 5 seconds

Location:

branches/BNC_2.12

Files:

• ChangeLog.txt (modified) (1 diff)
• Example_Configs/03_BrdcCorr.bnc (modified) (1 diff)
• src/bncmain.cpp (modified) (1 diff)
• src/bncversion.h (modified) (1 diff)
• src/bncwindow.cpp (modified) (2 diffs)
• src/combination/bnccomb.cpp (modified) (3 diffs)

branches/BNC_2.12/ChangeLog.txt

@@ +1 @@
+--------------------------------------------------------------------------------
+ BNC VERSION 2.12.19 (04.04.2022)
+--------------------------------------------------------------------------------
+  CHANGED    (04.04.2022): Minimum combination sampling interval
+
 --------------------------------------------------------------------------------
  BNC VERSION 2.12.18 (28.09.2021)

branches/BNC_2.12/Example_Configs/03_BrdcCorr.bnc

@@ -168 +168 @@
 sigmaGIM=4.0
 sigmaL1=0.01
-sigmaTz0=0.10
 snxtroAc=
 snxtroIntr=1 hour

branches/BNC_2.12/src/bncmain.cpp

@@ -247 +247 @@
       "   cmbMethodFilter {Combination approach [character string: Single-Epoch|Filter]\n"
       "   cmbMaxres       {Clock outlier residuum threshold in meters [floating-point number]\n"
-      "   cmbSampl        {Clock sampling rate [integer number of seconds: 10|20|30|40|50|60]}\n"
+      "   cmbSampl        {Clock sampling rate [integer number of seconds: 0|10|20|30|40|50|60]}\n"
       "   cmbUseGlonass   {Use GLONASS in combination [integer number: 0=no,2=yes]\n"
       "\n"

branches/BNC_2.12/src/bncversion.h

@@ -3 +3 @@
 #define BNCVERSION_H
 
-#define BNCVERSION "2.12.18"
+#define BNCVERSION "2.12.19"
 #define BNCPGMNAME "BNC " BNCVERSION
 

branches/BNC_2.12/src/bncwindow.cpp

@@ -450 +450 @@
 
   _cmbSamplSpinBox = new QSpinBox;
-  _cmbSamplSpinBox->setMinimum(10);
+  _cmbSamplSpinBox->setMinimum(0);
   _cmbSamplSpinBox->setMaximum(60);
   _cmbSamplSpinBox->setSingleStep(10);
@@ -1357 +1357 @@
   _cmbMethodComboBox->setWhatsThis(tr("<p>Select a clock combination approach. Options are 'Single-Epoch' and Kalman 'Filter'.</p><p>It is suggested to use the Kalman filter approach for the purpose of Precise Point Positioning.</p>"));
   _cmbMaxresLineEdit->setWhatsThis(tr("<p>BNC combines all incoming clocks according to specified weights. Individual clock estimates that differ by more than 'Maximal residuum' meters from the average of all clocks will be ignored.<p></p>It is suggested to specify a value of about 0.2 m for the Kalman filter combination approach and a value of about 3.0 meters for the Single-Epoch combination approach.</p><p>Default is a value of '999.0'.</p>"));
-  _cmbSamplSpinBox->setWhatsThis(tr("<p>Select a combination Sampling interval for the clocks. Clock corrections will be produced following that interval.</p><p>A value of 10 sec may be an appropriate choice.</p>"));
+  _cmbSamplSpinBox->setWhatsThis(tr("<p>Select a combination Sampling interval for the clocks. Clock corrections will be produced following that interval.</p><p>A value of 10 sec may be an appropriate choice. A value of zero '0' tells BNC to use all available samples.</p>"));
   _cmbUseGlonass->setWhatsThis(tr("<p>In case the incoming orbit and clock correction stream(s) support GLONASS, you can tick 'Use GLONASS' to produce a GPS plus GLONASS combination solution.</p><p>Default is a GPS-only combination.</p>"));
 

branches/BNC_2.12/src/combination/bnccomb.cpp

@@ -142 +142 @@
   _cmbSampl = settings.value("cmbSampl").toInt();
   if (_cmbSampl <= 0) {
-    _cmbSampl = 10;
+    _cmbSampl = 5;
   }
 
@@ -180 +180 @@
     _ssrCorr = new SsrCorrIgs();
   }
-  
+
   _rtnetDecoder = 0;
 
@@ -410 +410 @@
     else {
       QMap<t_prn, t_orbCorr>& storage = _orbCorrections[acName];
-      if (!storage.contains(clkCorr._prn)  || 
+      if (!storage.contains(clkCorr._prn)  ||
            storage[clkCorr._prn]._iod != newCorr->_iod) {
         delete newCorr;