Index: trunk/BNC/src/bnchelp.html =================================================================== --- trunk/BNC/src/bnchelp.html (revision 10243) +++ trunk/BNC/src/bnchelp.html (revision 10244) @@ -221,6 +221,5 @@                   2.14.1.2 Method
                  2.14.1.3 Maximal Residuum
-                  2.14.1.4 Wait for full clock epoch
-                  2.14.1.5 Sampling
+                  2.14.1.4 Sampling
      2.15 Upload Corrections
            2.15.1 Add, Delete Row
@@ -4551,13 +4550,5 @@ Default is a 'Maximal Residuum' of 999.0 meters.

-

2.14.1.4 Wait for full clock epoch - mandatory if 'Combine Corrections' table is populated

-

-During the combination process BNC is waiting for clock corrections input epoch by epoch. -BNC drops whatever is received later than 'Wait for full clock epoch' seconds. -A value of about 10 seconds is recommended, depending on the latency of the incoming streams -and the delay acceptable to your real-time GNSS combination product. -

- -

2.14.1.5 Sampling - mandatory if 'Combine Corrections' table is populated

+

2.14.1.4 Sampling - mandatory if 'Combine Corrections' table is populated

Specify a combination sampling interval. Orbit and clock corrections will be produced following that interval. Index: trunk/BNC/src/bncmain.cpp =================================================================== --- trunk/BNC/src/bncmain.cpp (revision 10243) +++ trunk/BNC/src/bncmain.cpp (revision 10244) @@ -287,5 +287,4 @@ " cmbBsxFile {SINEX Bias file, full path [char string]}\n" " cmbMaxres {Clock outlier residuum threshold in meters [floating-point number]\n" - " cmbWait {Wait for full clock epoch [integer number of seconds: 5-60]}\n" " cmbSampl {Clock sampling rate [integer number of seconds: 0|10|20|30|40|50|60]}\n" " cmbGps {GPS correction usage [integer number: 0=no,2=yes]}\n" Index: trunk/BNC/src/bncsettings.cpp =================================================================== --- trunk/BNC/src/bncsettings.cpp (revision 10243) +++ trunk/BNC/src/bncsettings.cpp (revision 10244) @@ -172,5 +172,4 @@ setValue_p("cmbMaxres", ""); setValue_p("cmbSampl", "10"); - setValue_p("cmbWait", "10"); setValue_p("cmbGps", "2"); setValue_p("cmbGlo", "2"); Index: trunk/BNC/src/bncwindow.cpp =================================================================== --- trunk/BNC/src/bncwindow.cpp (revision 10243) +++ trunk/BNC/src/bncwindow.cpp (revision 10244) @@ -491,11 +491,4 @@ _cmbMaxresLineEdit = new QLineEdit(settings.value("cmbMaxres").toString()); - - _cmbWaitSpinBox = new QSpinBox(); - _cmbWaitSpinBox->setMinimum(5); - _cmbWaitSpinBox->setMaximum(60); - _cmbWaitSpinBox->setSingleStep(1); - _cmbWaitSpinBox->setSuffix(" sec"); - _cmbWaitSpinBox->setValue(settings.value("cmbWait").toInt()); _cmbSamplSpinBox = new QSpinBox; @@ -1299,24 +1292,22 @@ cmbLayout->addWidget(new QLabel("Max Residual"), 5, 6, Qt::AlignLeft); cmbLayout->addWidget(_cmbMaxresLineEdit, 5, 7, Qt::AlignRight); - cmbLayout->addWidget(new QLabel("Wait for full clock epoch"), 6, 6, Qt::AlignLeft); - cmbLayout->addWidget(_cmbWaitSpinBox , 6, 7, Qt::AlignRight); - cmbLayout->addWidget(new QLabel("Sampling"), 7, 6, Qt::AlignLeft); - cmbLayout->addWidget(_cmbSamplSpinBox, 7, 7, Qt::AlignRight); - cmbLayout->addWidget(new QLabel("GNSS"), 8, 6, Qt::AlignLeft); - cmbLayout->addWidget(new QLabel("GPS (C1W/C2W)"), 8, 7); - cmbLayout->addWidget(_cmbGpsCheckBox, 8, 8); - cmbLayout->addWidget(new QLabel("GLONASS (C1P/C2P)"), 8, 9); - cmbLayout->addWidget(_cmbGloCheckBox, 8, 10); - cmbLayout->addWidget(new QLabel("Galileo (C1C/C5Q)"), 8, 11); - cmbLayout->addWidget(_cmbGalCheckBox, 8, 12); - cmbLayout->addWidget(new QLabel("Beidou (C2I/C6I)"), 8, 13); - cmbLayout->addWidget(_cmbBdsCheckBox, 8, 14); - cmbLayout->addWidget(new QLabel("QZSS (C1C/C2L)"), 9, 7); - cmbLayout->addWidget(_cmbQzssCheckBox, 9, 8); - cmbLayout->addWidget(new QLabel("SBAS (C1C/C5Q)"), 9, 9); - cmbLayout->addWidget(_cmbSbasCheckBox, 9, 10); - cmbLayout->addWidget(new QLabel("IRNSS"), 9, 11); - cmbLayout->addWidget(_cmbIrnssCheckBox, 9, 12); - cmbLayout->setRowStretch(9, 999); + cmbLayout->addWidget(new QLabel("Sampling"), 6, 6, Qt::AlignLeft); + cmbLayout->addWidget(_cmbSamplSpinBox, 6, 7, Qt::AlignRight); + cmbLayout->addWidget(new QLabel("GNSS"), 7, 6, Qt::AlignLeft); + cmbLayout->addWidget(new QLabel("GPS (C1W/C2W)"), 7, 7); + cmbLayout->addWidget(_cmbGpsCheckBox, 7, 8); + cmbLayout->addWidget(new QLabel("GLONASS (C1P/C2P)"), 7, 9); + cmbLayout->addWidget(_cmbGloCheckBox, 7, 10); + cmbLayout->addWidget(new QLabel("Galileo (C1C/C5Q)"), 7, 11); + cmbLayout->addWidget(_cmbGalCheckBox, 7, 12); + cmbLayout->addWidget(new QLabel("Beidou (C2I/C6I)"), 7, 13); + cmbLayout->addWidget(_cmbBdsCheckBox, 7, 14); + cmbLayout->addWidget(new QLabel("QZSS (C1C/C2L)"), 8, 7); + cmbLayout->addWidget(_cmbQzssCheckBox, 8, 8); + cmbLayout->addWidget(new QLabel("SBAS (C1C/C5Q)"), 8, 9); + cmbLayout->addWidget(_cmbSbasCheckBox, 8, 10); + cmbLayout->addWidget(new QLabel("IRNSS"), 8, 11); + cmbLayout->addWidget(_cmbIrnssCheckBox, 8, 12); + cmbLayout->setRowStretch(8, 999); connect(addCmbRowButton, SIGNAL(clicked()), this, SLOT(slotAddCmbRow())); @@ -1538,5 +1529,4 @@ _cmbMethodComboBox->setWhatsThis(tr("

Select a clock combination approach. Options are 'Single-Epoch' and Kalman 'Filter'.

It is suggested to use the Kalman filter approach for the purpose of Precise Point Positioning. [key: cmbMethod]

")); _cmbMaxresLineEdit->setWhatsThis(tr("

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.

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.

Default is a value of '999.0'. [key: cmbMaxres]

")); - _cmbWaitSpinBox->setWhatsThis(tr("

During the combination process BNC is waiting for clock corrections input epoch by epoch. BNC drops whatever is received later than 'Wait for full clock epoch' seconds.

A value of about 10 seconds is recommended, depending on the latency of the incoming streams and the delay acceptable to your real-time GNSS combination product. [key: cmbWait]

")); _cmbSamplSpinBox->setWhatsThis(tr("

Select a combination Sampling interval for the clocks. Clock corrections will be produced following that interval.

A value of 10 sec may be an appropriate choice. A value of zero '0' tells BNC to use all available samples. [key: ]

")); _cmbGpsCheckBox->setWhatsThis(tr("

GPS clock corrections shall be combined. GPS Broadcast ephemeris and corrections are required. [key: cmbGps]

")); @@ -1678,5 +1668,4 @@ _cmbTable->deleteLater(); delete _cmbMaxresLineEdit; - delete _cmbWaitSpinBox; delete _cmbSamplSpinBox; delete _cmbMethodComboBox; @@ -2171,5 +2160,4 @@ settings.setValue("cmbMethod", _cmbMethodComboBox->currentText()); settings.setValue("cmbMaxres", _cmbMaxresLineEdit->text()); - settings.setValue("cmbWait", _cmbWaitSpinBox->value()); settings.setValue("cmbSampl", _cmbSamplSpinBox->value()); settings.setValue("cmbGps", _cmbGpsCheckBox->checkState()); @@ -2693,5 +2681,4 @@ enableWidget(true, _cmbMethodComboBox); enableWidget(true, _cmbMaxresLineEdit); - enableWidget(true, _cmbWaitSpinBox); enableWidget(true, _cmbSamplSpinBox); enableWidget(true, _cmbGpsCheckBox); @@ -2707,5 +2694,4 @@ enableWidget(false, _cmbMethodComboBox); enableWidget(false, _cmbMaxresLineEdit); - enableWidget(false, _cmbWaitSpinBox); enableWidget(false, _cmbSamplSpinBox); enableWidget(false, _cmbGpsCheckBox); Index: trunk/BNC/src/bncwindow.h =================================================================== --- trunk/BNC/src/bncwindow.h (revision 10243) +++ trunk/BNC/src/bncwindow.h (revision 10244) @@ -221,5 +221,4 @@ QComboBox* _cmbMethodComboBox; QSpinBox* _cmbSamplSpinBox; - QSpinBox* _cmbWaitSpinBox; QCheckBox* _cmbGpsCheckBox; QCheckBox* _cmbGloCheckBox;