Changeset 10244 in ntrip


Ignore:
Timestamp:
Nov 6, 2023, 10:21:40 PM (11 months ago)
Author:
stuerze
Message:

revert last changes

Location:
trunk/BNC/src
Files:
5 edited

Legend:

Unmodified
Added
Removed
  • trunk/BNC/src/bnchelp.html

    r10239 r10244  
    221221&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; 2.14.1.2 <a href=#combimethod>Method</a><br>
    222222&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; 2.14.1.3 <a href=#combimax>Maximal Residuum</a><br>
    223 &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; 2.14.1.4 <a href=#combiwait>Wait for full clock epoch</a><br>
    224 &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; 2.14.1.5 <a href=#combismpl>Sampling</a><br>
     223&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; 2.14.1.4 <a href=#combismpl>Sampling</a><br>
    225224&nbsp; &nbsp; &nbsp; 2.15 <a href=#upclk><b>Upload Corrections</b></a><br>
    226225&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; 2.15.1 <a href=#upadd>Add, Delete Row</a><br>
     
    45514550Default is a 'Maximal Residuum' of 999.0 meters.</p>
    45524551
    4553 <p><h4 id="combiwait">2.14.1.4 Wait for full clock epoch - mandatory if 'Combine Corrections' table is populated</h4></p>
    4554 <p>
    4555 During the combination process BNC is waiting for clock corrections input epoch by epoch.
    4556 BNC drops whatever is received later than 'Wait for full clock epoch' seconds.
    4557 A value of about 10 seconds is recommended, depending on the latency of the incoming streams
    4558 and the delay acceptable to your real-time GNSS combination product.
    4559 </p>
    4560 
    4561 <p><h4 id="combismpl">2.14.1.5 Sampling - mandatory if 'Combine Corrections' table is populated</h4></p>
     4552<p><h4 id="combismpl">2.14.1.4 Sampling - mandatory if 'Combine Corrections' table is populated</h4></p>
    45624553<p>
    45634554Specify a combination sampling interval. Orbit and clock corrections will be produced following that interval.
  • trunk/BNC/src/bncmain.cpp

    r10240 r10244  
    287287      "   cmbBsxFile      {SINEX Bias file, full path [char string]}\n"
    288288      "   cmbMaxres       {Clock outlier residuum threshold in meters [floating-point number]\n"
    289       "   cmbWait         {Wait for full clock epoch [integer number of seconds: 5-60]}\n"
    290289      "   cmbSampl        {Clock sampling rate [integer number of seconds: 0|10|20|30|40|50|60]}\n"
    291290      "   cmbGps          {GPS correction usage [integer number: 0=no,2=yes]}\n"
  • trunk/BNC/src/bncsettings.cpp

    r10239 r10244  
    172172    setValue_p("cmbMaxres",           "");
    173173    setValue_p("cmbSampl",          "10");
    174     setValue_p("cmbWait",           "10");
    175174    setValue_p("cmbGps",             "2");
    176175    setValue_p("cmbGlo",             "2");
  • trunk/BNC/src/bncwindow.cpp

    r10240 r10244  
    491491
    492492  _cmbMaxresLineEdit = new QLineEdit(settings.value("cmbMaxres").toString());
    493 
    494   _cmbWaitSpinBox = new QSpinBox();
    495   _cmbWaitSpinBox->setMinimum(5);
    496   _cmbWaitSpinBox->setMaximum(60);
    497   _cmbWaitSpinBox->setSingleStep(1);
    498   _cmbWaitSpinBox->setSuffix(" sec");
    499   _cmbWaitSpinBox->setValue(settings.value("cmbWait").toInt());
    500493
    501494  _cmbSamplSpinBox = new QSpinBox;
     
    12991292  cmbLayout->addWidget(new QLabel("Max Residual"),                               5,  6, Qt::AlignLeft);
    13001293  cmbLayout->addWidget(_cmbMaxresLineEdit,                                       5,  7, Qt::AlignRight);
    1301   cmbLayout->addWidget(new QLabel("Wait for full clock epoch"),                  6,  6, Qt::AlignLeft);
    1302   cmbLayout->addWidget(_cmbWaitSpinBox ,                                         6,  7, Qt::AlignRight);
    1303   cmbLayout->addWidget(new QLabel("Sampling"),                                   7,  6, Qt::AlignLeft);
    1304   cmbLayout->addWidget(_cmbSamplSpinBox,                                         7,  7, Qt::AlignRight);
    1305   cmbLayout->addWidget(new QLabel("GNSS"),                                       8,  6, Qt::AlignLeft);
    1306   cmbLayout->addWidget(new QLabel("GPS (C1W/C2W)"),                              8,  7);
    1307   cmbLayout->addWidget(_cmbGpsCheckBox,                                          8,  8);
    1308   cmbLayout->addWidget(new QLabel("GLONASS (C1P/C2P)"),                          8,  9);
    1309   cmbLayout->addWidget(_cmbGloCheckBox,                                          8, 10);
    1310   cmbLayout->addWidget(new QLabel("Galileo (C1C/C5Q)"),                          8, 11);
    1311   cmbLayout->addWidget(_cmbGalCheckBox,                                          8, 12);
    1312   cmbLayout->addWidget(new QLabel("Beidou (C2I/C6I)"),                           8, 13);
    1313   cmbLayout->addWidget(_cmbBdsCheckBox,                                          8, 14);
    1314   cmbLayout->addWidget(new QLabel("QZSS (C1C/C2L)"),                             9,  7);
    1315   cmbLayout->addWidget(_cmbQzssCheckBox,                                         9,  8);
    1316   cmbLayout->addWidget(new QLabel("SBAS (C1C/C5Q)"),                             9,  9);
    1317   cmbLayout->addWidget(_cmbSbasCheckBox,                                         9, 10);
    1318   cmbLayout->addWidget(new QLabel("IRNSS"),                                      9, 11);
    1319   cmbLayout->addWidget(_cmbIrnssCheckBox,                                        9, 12);
    1320   cmbLayout->setRowStretch(9, 999);
     1294  cmbLayout->addWidget(new QLabel("Sampling"),                                   6,  6, Qt::AlignLeft);
     1295  cmbLayout->addWidget(_cmbSamplSpinBox,                                         6,  7, Qt::AlignRight);
     1296  cmbLayout->addWidget(new QLabel("GNSS"),                                       7,  6, Qt::AlignLeft);
     1297  cmbLayout->addWidget(new QLabel("GPS (C1W/C2W)"),                                7,  7);
     1298  cmbLayout->addWidget(_cmbGpsCheckBox,                                          7,  8);
     1299  cmbLayout->addWidget(new QLabel("GLONASS (C1P/C2P)"),                          7,  9);
     1300  cmbLayout->addWidget(_cmbGloCheckBox,                                          7, 10);
     1301  cmbLayout->addWidget(new QLabel("Galileo (C1C/C5Q)"),                          7, 11);
     1302  cmbLayout->addWidget(_cmbGalCheckBox,                                          7, 12);
     1303  cmbLayout->addWidget(new QLabel("Beidou (C2I/C6I)"),                           7, 13);
     1304  cmbLayout->addWidget(_cmbBdsCheckBox,                                          7, 14);
     1305  cmbLayout->addWidget(new QLabel("QZSS (C1C/C2L)"),                             8,  7);
     1306  cmbLayout->addWidget(_cmbQzssCheckBox,                                         8,  8);
     1307  cmbLayout->addWidget(new QLabel("SBAS (C1C/C5Q)"),                             8,  9);
     1308  cmbLayout->addWidget(_cmbSbasCheckBox,                                         8, 10);
     1309  cmbLayout->addWidget(new QLabel("IRNSS"),                                      8, 11);
     1310  cmbLayout->addWidget(_cmbIrnssCheckBox,                                        8, 12);
     1311  cmbLayout->setRowStretch(8, 999);
    13211312
    13221313  connect(addCmbRowButton, SIGNAL(clicked()), this, SLOT(slotAddCmbRow()));
     
    15381529  _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>"));
    15391530  _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>"));
    1540   _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>"));
    15411531  _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>"));
    15421532  _cmbGpsCheckBox->setWhatsThis(tr("<p>GPS clock corrections shall be combined. GPS Broadcast ephemeris and corrections are required. <i>[key: cmbGps]</i></p>"));
     
    16781668  _cmbTable->deleteLater();
    16791669  delete _cmbMaxresLineEdit;
    1680   delete _cmbWaitSpinBox;
    16811670  delete _cmbSamplSpinBox;
    16821671  delete _cmbMethodComboBox;
     
    21712160  settings.setValue("cmbMethod",     _cmbMethodComboBox->currentText());
    21722161  settings.setValue("cmbMaxres",     _cmbMaxresLineEdit->text());
    2173   settings.setValue("cmbWait",       _cmbWaitSpinBox->value());
    21742162  settings.setValue("cmbSampl",      _cmbSamplSpinBox->value());
    21752163  settings.setValue("cmbGps",        _cmbGpsCheckBox->checkState());
     
    26932681      enableWidget(true, _cmbMethodComboBox);
    26942682      enableWidget(true, _cmbMaxresLineEdit);
    2695       enableWidget(true, _cmbWaitSpinBox);
    26962683      enableWidget(true, _cmbSamplSpinBox);
    26972684      enableWidget(true, _cmbGpsCheckBox);
     
    27072694      enableWidget(false, _cmbMethodComboBox);
    27082695      enableWidget(false, _cmbMaxresLineEdit);
    2709       enableWidget(false, _cmbWaitSpinBox);
    27102696      enableWidget(false, _cmbSamplSpinBox);
    27112697      enableWidget(false, _cmbGpsCheckBox);
  • trunk/BNC/src/bncwindow.h

    r10239 r10244  
    221221    QComboBox*     _cmbMethodComboBox;
    222222    QSpinBox*      _cmbSamplSpinBox;
    223     QSpinBox*      _cmbWaitSpinBox;
    224223    QCheckBox*     _cmbGpsCheckBox;
    225224    QCheckBox*     _cmbGloCheckBox;
Note: See TracChangeset for help on using the changeset viewer.