Changeset 10095 in ntrip


Ignore:
Timestamp:
Jun 16, 2023, 11:51:23 AM (15 months ago)
Author:
stuerze
Message:

allow 30 sec update rate for sp3 files

Location:
trunk/BNC/src
Files:
4 edited

Legend:

Unmodified
Added
Removed

  • trunk/BNC/src/bncmain.cpp

    r10073 r10095  
    299299      "   uploadIntr             {Length of SP3, Clock RINEX and Bias SINEX file interval [character string: 1 min|2 min|5 min|10 min|15 min|30 min|1 hour|1 day]}\n"
    300300      "   uploadSamplRtcmEphCorr {Orbit corrections stream sampling rate [integer number of seconds: 0|5|10|15|20|25|30|35|40|45|50|55|60]}\n"
    301       "   uploadSamplSp3         {SP3 file sampling rate [integer number of minutes: 0-15]}\n"
     301      "   uploadSamplSp3         {SP3 file sampling rate [integer number of seconds: 0 sec|30 sec|60 sec|300 sec|900 sec]}\n"
    302302      "   uploadSamplClkRnx      {Clock RINEX file sampling rate [integer number of seconds: 0|5|10|15|20|25|30|35|40|45|50|55|60]}\n"
    303303          "   uploadSamplBiaSnx      {SINEX Bias file sampling rate [integer number of seconds: 0|5|10|15|20|25|30|35|40|45|50|55|60]}\n"

  • trunk/BNC/src/bncwindow.cpp

    r10091 r10095  
    605605  _uploadSamplRtcmEphCorrSpinBox->setSuffix(" sec");
    606606
    607   _uploadSamplSp3SpinBox = new QSpinBox;
    608   _uploadSamplSp3SpinBox->setMinimum(0);
    609   _uploadSamplSp3SpinBox->setMaximum(15);
    610   _uploadSamplSp3SpinBox->setSingleStep(1);
    611   _uploadSamplSp3SpinBox->setMaximumWidth(9*ww);
    612   _uploadSamplSp3SpinBox->setValue(settings.value("uploadSamplSp3").toInt());
    613   _uploadSamplSp3SpinBox->setSuffix(" min");
     607  _uploadSamplSp3ComboBox = new QComboBox();
     608  _uploadSamplSp3ComboBox->addItems(QString("0 sec,30 sec,60 sec,300 sec,900 sec").split(","));
     609  int oo = _uploadSamplSp3ComboBox->findText(settings.value("uploadSamplSp3").toString());
     610    if (oo != -1) {
     611      _uploadSamplSp3ComboBox->setCurrentIndex(nn);
     612    }
    614613
    615614  _uploadSamplClkRnxSpinBox = new QSpinBox;
    … …  
    633632    enableWidget(true, _uploadIntrComboBox);
    634633    enableWidget(true, _uploadSamplRtcmEphCorrSpinBox);
    635     enableWidget(true, _uploadSamplSp3SpinBox);
     634    enableWidget(true, _uploadSamplSp3ComboBox);
    636635    enableWidget(true, _uploadSamplClkRnxSpinBox);
    637636    enableWidget(true, _uploadSamplBiaSnxSpinBox);
    … …  
    641640    enableWidget(false, _uploadIntrComboBox);
    642641    enableWidget(false, _uploadSamplRtcmEphCorrSpinBox);
    643     enableWidget(false, _uploadSamplSp3SpinBox);
     642    enableWidget(false, _uploadSamplSp3ComboBox);
    644643    enableWidget(false, _uploadSamplClkRnxSpinBox);
    645644    enableWidget(true, _uploadSamplBiaSnxSpinBox);
    … …  
    13191318  uploadHlpLayout->addWidget(_uploadSamplRtcmEphCorrSpinBox,      0, 5);
    13201319  uploadHlpLayout->addWidget(new QLabel("SP3"),                   0, 6, Qt::AlignRight);
    1321   uploadHlpLayout->addWidget(_uploadSamplSp3SpinBox,              0, 7);
     1320  uploadHlpLayout->addWidget(_uploadSamplSp3ComboBox,             0, 7);
    13221321  uploadHlpLayout->addWidget(new QLabel("RNX"),                   0, 8, Qt::AlignRight);
    13231322  uploadHlpLayout->addWidget(_uploadSamplClkRnxSpinBox,           0, 9);
    … …  
    15321531  _uploadIntrComboBox->setWhatsThis(tr("<p>Select the length of the SP3, Clock RINEX and Bias SINEX files. <i>[key: uploadIntr]</i></p>"));
    15331532  _uploadSamplRtcmEphCorrSpinBox->setWhatsThis(tr("<p>Select a stream's orbit correction sampling interval in seconds.</p><p>A value of zero '0' tells BNC to upload all available orbit and clock correction samples together in combined messages. <i>[key: uploadSamplRtcmEphCorr]</i></p>"));
    1534   _uploadSamplSp3SpinBox->setWhatsThis(tr("<p>Select a SP3 orbit file sampling interval in minutes.</p><p>A value of zero '0' tells BNC to store all available samples into SP3 orbit files. <i>[key: uploadSamplSp3]</i></p>"));
     1533  _uploadSamplSp3ComboBox->setWhatsThis(tr("<p>Select a SP3 orbit file sampling interval in seconds.</p><p>A value of zero '0' tells BNC to store all available samples into SP3 orbit files. <i>[key: uploadSamplSp3]</i></p>"));
    15351534  _uploadSamplClkRnxSpinBox->setWhatsThis(tr("<p>Select a Clock RINEX file sampling interval in seconds.</p><p>A value of zero '0' tells BNC to store all available samples into Clock RINEX files. <i>[key: uploadSamplClkRnx]</i></p>"));
    15361535  _uploadSamplBiaSnxSpinBox->setWhatsThis(tr("<p>Select a Bias SINEX file sampling interval in seconds.</p><p>A value of zero '0' tells BNC to store all available samples into Bias SINEX files. <i>[key: uploadSamplBiaSnx]</i></p>"));
    … …  
    16701669  delete _uploadAntexFile;
    16711670  delete _uploadSamplRtcmEphSpinBox;
    1672   delete _uploadSamplSp3SpinBox;
     1671  delete _uploadSamplSp3ComboBox;
    16731672  delete _uploadSamplClkRnxSpinBox;
    16741673  delete _uploadSamplBiaSnxSpinBox;
    … …  
    21632162  settings.setValue("uploadIntr",             _uploadIntrComboBox->currentText());
    21642163  settings.setValue("uploadSamplRtcmEphCorr", _uploadSamplRtcmEphCorrSpinBox->value());
    2165   settings.setValue("uploadSamplSp3",         _uploadSamplSp3SpinBox->value());
     2164  settings.setValue("uploadSamplSp3",         _uploadSamplSp3ComboBox->currentText());
    21662165  settings.setValue("uploadSamplClkRnx",      _uploadSamplClkRnxSpinBox->value());
    21672166  settings.setValue("uploadSamplBiaSnx",      _uploadSamplBiaSnxSpinBox->value());
    … …  
    27022701    enableWidget(true, _uploadSamplClkRnxSpinBox);
    27032702    enableWidget(true, _uploadSamplBiaSnxSpinBox);
    2704     enableWidget(true, _uploadSamplSp3SpinBox);
     2703    enableWidget(true, _uploadSamplSp3ComboBox);
    27052704    enableWidget(true, _uploadAntexFile);
    27062705  }
    … …  
    27102709    enableWidget(false, _uploadSamplClkRnxSpinBox);
    27112710    enableWidget(false, _uploadSamplBiaSnxSpinBox);
    2712     enableWidget(false, _uploadSamplSp3SpinBox);
     2711    enableWidget(false, _uploadSamplSp3ComboBox);
    27132712    enableWidget(false, _uploadAntexFile);
    27142713  }
    … …  
    28992898    enableWidget(false, _uploadIntrComboBox);
    29002899    enableWidget(false, _uploadSamplRtcmEphCorrSpinBox);
    2901     enableWidget(false, _uploadSamplSp3SpinBox);
     2900    enableWidget(false, _uploadSamplSp3ComboBox);
    29022901    enableWidget(false, _uploadSamplClkRnxSpinBox);
    29032902    enableWidget(false, _uploadAntexFile);

  • trunk/BNC/src/bncwindow.h

    r10091 r10095  
    232232    QComboBox*     _uploadIntrComboBox;
    233233    QSpinBox*      _uploadSamplRtcmEphCorrSpinBox;
    234     QSpinBox*      _uploadSamplSp3SpinBox;
     234    QComboBox*     _uploadSamplSp3ComboBox;
    235235    QSpinBox*      _uploadSamplClkRnxSpinBox;
    236236    QSpinBox*      _uploadSamplBiaSnxSpinBox;

  • trunk/BNC/src/upload/bncrtnetuploadcaster.cpp

    r10024 r10095  
    9292  }
    9393  int samplClkRnx = settings.value("uploadSamplClkRnx").toInt();
    94   int samplSp3    = settings.value("uploadSamplSp3").toInt() * 60;
     94  int samplSp3    = settings.value("uploadSamplSp3").toString().split("sec").first().toInt();
    9595  int samplBiaSnx = settings.value("uploadSamplBiaSnx").toInt();
    9696
Note: See TracChangeset for help on using the changeset viewer.