Changeset 10244 in ntrip for trunk/BNC/src/bncwindow.cpp

Timestamp:

Nov 6, 2023, 10:21:40 PM (6 months ago)

Author:

stuerze

Message:

revert last changes

File:

• trunk/BNC/src/bncwindow.cpp (modified) (7 diffs)

trunk/BNC/src/bncwindow.cpp

@@ -491 +491 @@
 
   _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 +1292 @@
   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 +1529 @@
   _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. <i>[key: cmbMethod]</i></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'. <i>[key: cmbMaxres]</i></p>"));
-  _cmbWaitSpinBox->setWhatsThis(tr("<p>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.</p><p>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. <i>[key: cmbWait]</i></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. <i>[key:  ]</i></p>"));
   _cmbGpsCheckBox->setWhatsThis(tr("<p>GPS clock corrections shall be combined. GPS Broadcast ephemeris and corrections are required. <i>[key: cmbGps]</i></p>"));
@@ -1678 +1668 @@
   _cmbTable->deleteLater();
   delete _cmbMaxresLineEdit;
-  delete _cmbWaitSpinBox;
   delete _cmbSamplSpinBox;
   delete _cmbMethodComboBox;
@@ -2171 +2160 @@
   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 +2681 @@
       enableWidget(true, _cmbMethodComboBox);
       enableWidget(true, _cmbMaxresLineEdit);
-      enableWidget(true, _cmbWaitSpinBox);
       enableWidget(true, _cmbSamplSpinBox);
       enableWidget(true, _cmbGpsCheckBox);
@@ -2707 +2694 @@
       enableWidget(false, _cmbMethodComboBox);
       enableWidget(false, _cmbMaxresLineEdit);
-      enableWidget(false, _cmbWaitSpinBox);
       enableWidget(false, _cmbSamplSpinBox);
       enableWidget(false, _cmbGpsCheckBox);