Changeset 8398 in ntrip for branches/BNC_2.12


Ignore:
Timestamp:
Jun 28, 2018, 12:53:59 PM (6 years ago)
Author:
stuerze
Message:

some changes to allow RINEX file generation with correct version 3 file names, 10 Hz observation data processing and resampling (RINEX files, feed engine) and harmonization of all avalable sampling cases (RINEX files, feed engine, reqc edit)

Location:
branches/BNC_2.12/src
Files:
14 edited

Legend:

Unmodified
Added
Removed

  • branches/BNC_2.12/src/GPSDecoder.cpp

    r8373 r8398  
    8282  if (_rnx) {
    8383    int sec = int(nint(obs._time.gpssec()*10));
    84     if (_rnx->samplingRate() == 0 || sec % (_rnx->samplingRate()*10) == 0) {
     84    if (sec % _rnx->samplingRate() == 0) {
    8585      _rnx->deepCopy(obs);
    8686    }

  • branches/BNC_2.12/src/bnccaster.cpp

    r8373 r8398  
    9696  }
    9797
    98   _samplingRate = settings.value("outSampl").toInt();
     98  _samplingRateMult10 = int(settings.value("outSampl").toString().split("sec").first().toDouble() * 10.0);
    9999  _outWait      = settings.value("outWait").toDouble();
    100100  if (_outWait <= 0.0) {
    … …  
    304304      const QList<t_satObs>& allObs = itEpo.value();
    305305      int sec = int(nint(epoTime.gpssec()*10));
    306       if ( (_out || _sockets) && (_samplingRate == 0 || sec % (_samplingRate*10) == 0) ) {
     306      if ( (_out || _sockets) && (sec % (_samplingRateMult10) == 0) ) {
    307307        QListIterator<t_satObs> it(allObs);
    308308        bool firstObs = true;
    … …  
    374374  // Reread several options
    375375  // ----------------------
    376   _samplingRate = settings.value("outSampl").toInt();
     376  _samplingRateMult10 = int(settings.value("outSampl").toString().split("sec").first().toDouble() * 10.0);
    377377  _outWait      = settings.value("outWait").toInt();
    378378  if (_outWait < 1) {

  • branches/BNC_2.12/src/bnccaster.h

    r7387 r8398  
    7575   QList<QByteArray>               _staIDs;
    7676   QList<bncGetThread*>            _threads;
    77    int                             _samplingRate;
     77   int                             _samplingRateMult10;
    7878   double                          _outWait;
    7979   QMutex                          _mutex;

  • branches/BNC_2.12/src/bncmain.cpp

    r8351 r8398  
    103103      "   rnxPath        {Directory [character string]}\n"
    104104      "   rnxIntr        {File interval [character string: 1 min|2 min|5 min|10 min|15 min|30 min|1 hour|1 day]}\n"
    105       "   rnxSampl       {File sampling rate [integer number of seconds: 0,5|10|15|20|25|30|35|40|45|50|55|60]} \n"
     105      "   rnxSampl       {File sampling rate [character string: 0.1 sec|1 sec|5 sec|10 sec|15 sec|30 sec|60 sec]}\n"
    106106      "   rnxSkel        {RINEX skeleton file extension [character string]}\n"
    107107      "   rnxOnlyWithSKL {Using RINEX skeleton file is mandatory [integer number: 0=no,2=yes]}\n"
    … …  
    127127      "   reqcPlotDir           {QC plots directory [character string]}\n"
    128128      "   reqcRnxVersion        {RINEX version [integer number: 2|3]}\n"
    129       "   reqcSampling          {RINEX output file sampling rate [integer number of seconds: 0|5|10|15|20|25|30|35|40|45|50|55|60]}\n"
     129      "   reqcSampling          {RINEX output file sampling rate [character string: 0.1 sec|1 sec|5 sec|10 sec|15 sec|30 sec|60 sec]}\n"
    130130      "   reqcV2Priority        {Version 2 priority of signal attributes [character string, list separated by blank character, example: G:12&PWCSLXYN G:5&IQX C:IQX]}\n"
    131131      "   reqcStartDateTime     {Start time [character string, example: 1967-11-02T00:00:00]}\n"
    … …  
    164164      "   outPort  {Output port, synchronized [integer number]}\n"
    165165      "   outWait  {Wait for full observation epoch [integer number of seconds: 1-30]}\n"
    166       "   outSampl {Sampling rate [integer number of seconds: 0|5|10|15|20|25|30|35|40|45|50|55|60]}\n"
     166      "   outSampl {Sampling rate [character string: 0.1 sec|1 sec|5 sec|10 sec|15 sec|30 sec|60 sec]}\n"
    167167      "   outFile  {Output file, full path [character string]}\n"
    168168      "   outUPort {Output port, unsynchronized [integer number]}\n"
    … …  
    305305      "(5) bnc --conf /dev/null --key startTab 4 --key reqcAction Edit/Concatenate"
    306306      " --key reqcObsFile AGAR.15O --key reqcOutObsFile AGAR_X.15O"
    307       " --key reqcRnxVersion 2 --key reqcSampling 30 --key reqcV2Priority CWPX_?\n"
     307      " --key reqcRnxVersion 2 --key reqcSampling 30 sec --key reqcV2Priority CWPX_?\n"
    308308      "(6) bnc --key mountPoints \"//user:pass@mgex.igs-ip.net:2101/CUT07 RTCM_3.0 ETH 9.03 38.74 no 2;"
    309309      "//user:pass@www.igs-ip.net:2101/FFMJ1 RTCM_3.1 DEU 50.09 8.66 no 2\"\n"

  • branches/BNC_2.12/src/bncrinex.cpp

    r8351 r8398  
    9090  _userName = _userName.leftJustified(20, ' ', true);
    9191
    92   _samplingRate = settings.value("rnxSampl").toInt();
     92  _samplingRateMult10 = int(settings.value("rnxSampl").toString().split("sec").first().toDouble() * 10.0);
     93
     94  if      (settings.value("rnxSampl").toString() == "0.1 sec") {
     95    _samplingRateStr = "_10Z";
     96  }
     97  else if (settings.value("rnxSampl").toString() == "1 sec") {
     98    _samplingRateStr = "_01S";
     99  }
     100  else if (settings.value("rnxSampl").toString() == "5 sec") {
     101    _samplingRateStr = "_05S";
     102  }
     103  else if (settings.value("rnxSampl").toString() == "10 sec") {
     104    _samplingRateStr = "_10S";
     105  }
     106  else if (settings.value("rnxSampl").toString() == "15 sec") {
     107    _samplingRateStr = "_15S";
     108  }
     109  else if (settings.value("rnxSampl").toString() == "30 sec") {
     110    _samplingRateStr = "_30S";
     111  }
     112  else if (settings.value("rnxSampl").toString() == "60 sec") {
     113    _samplingRateStr = "_01M";
     114  }
    93115
    94116  _writeRinexFileOnlyWithSkl = settings.value("rnxOnlyWithSKL").toBool();
    … …  
    348370      }
    349371    }
    350     int sampl = settings.value("rnxSampl").toString().mid(0,2).toInt();
    351     if (!sampl)
    352       sampl++;
     372
    353373    path += ID4 +
    354374            QString("%1").arg(monNum, 1, 10) +
    … …  
    359379            QString("%1").arg(datTim.date().dayOfYear(), 3, 10, QChar('0')) +
    360380            hlpStr + // HMS_period
    361             QString("_%1S").arg(sampl, 2, 10, QChar('0')) + // sampling rate
     381            QString("%1").arg(_samplingRateStr) + // sampling rate
    362382            "_MO" + // mixed OBS
    363383            distStr +

  • branches/BNC_2.12/src/bncrinex.h

    r8351 r8398  
    4040   ~bncRinex();
    4141
    42    int  samplingRate() const {return _samplingRate;}
     42   int  samplingRate() const {return _samplingRateMult10;}
    4343   void deepCopy(t_satObs obs);
    4444   void dumpEpoch(const QByteArray& format, const bncTime& maxTime);
    … …  
    7777   bool            _reconnectFlag;
    7878   QDate           _skeletonDate;
    79    int             _samplingRate;
     79   QString         _samplingRateStr;
     80   int             _samplingRateMult10;
    8081   QStringList     _addComments;
    8182

  • branches/BNC_2.12/src/bncsettings.cpp

    r8351 r8398  
    8787    setValue_p("rnxIntr",             "1 day");
    8888    setValue_p("rnxOnlyWithSKL",      "");
    89     setValue_p("rnxSampl",            "0");
     89    setValue_p("rnxSampl",            "1 sec");
    9090    setValue_p("rnxSkel",             "SKL");
    9191    setValue_p("rnxV2Priority",       "");
    … …  
    107107    setValue_p("reqcPlotDir",         "");
    108108    setValue_p("reqcRnxVersion",      "");
    109     setValue_p("reqcSampling",        "");
     109    setValue_p("reqcSampling",        "1 sec");
    110110    setValue_p("reqcStartDateTime",   "1967-11-02T00:00:00");
    111111    setValue_p("reqcEndDateTime",     "2099-01-01T00:00:00");
    … …  
    143143    setValue_p("outPort",             "");
    144144    setValue_p("outWait",             "5");
    145     setValue_p("outSampl",            "0");
     145    setValue_p("outSampl",            "1 sec");
    146146    setValue_p("outFile",             "");
    147147    setValue_p("outUPort",            "");

  • branches/BNC_2.12/src/bncwindow.cpp

    r8371 r8398  
    206206    _rnxIntrComboBox->setCurrentIndex(ii);
    207207  }
    208   _rnxSamplSpinBox    = new QSpinBox();
    209   _rnxSamplSpinBox->setMinimum(0);
    210   _rnxSamplSpinBox->setMaximum(60);
    211   _rnxSamplSpinBox->setSingleStep(5);
    212   _rnxSamplSpinBox->setValue(settings.value("rnxSampl").toInt());
     208  _rnxSamplComboBox    = new QComboBox();
     209  _rnxSamplComboBox->setEditable(false);
     210  _rnxSamplComboBox->addItems(QString("0.1 sec,1 sec,5 sec,10 sec,15 sec,30 sec,60 sec").split(","));
     211  int ij = _rnxSamplComboBox->findText(settings.value("rnxSampl").toString());
     212  if (ij != -1) {
     213    _rnxSamplComboBox->setCurrentIndex(ij);
     214  }
    213215  _rnxFileCheckBox = new QCheckBox();
    214216  _rnxFileCheckBox->setCheckState(Qt::CheckState(settings.value("rnxOnlyWithSKL").toInt()));
    215   _rnxSamplSpinBox->setSuffix(" sec");
    216217  _rnxSkelLineEdit    = new QLineEdit(settings.value("rnxSkel").toString());
    217218  _rnxSkelLineEdit->setMaximumWidth(5*ww);
    … …  
    277278  _outWaitSpinBox->setSuffix(" sec");
    278279  _outWaitSpinBox->setValue(settings.value("outWait").toInt());
    279   _outSamplSpinBox    = new QSpinBox();
    280   _outSamplSpinBox->setMinimum(0);
    281   _outSamplSpinBox->setMaximum(60);
    282   _outSamplSpinBox->setSingleStep(5);
    283   _outSamplSpinBox->setValue(settings.value("outSampl").toInt());
    284   _outSamplSpinBox->setSuffix(" sec");
     280  _outSamplComboBox    = new QComboBox();
     281  _outSamplComboBox->addItems(QString("0.1 sec,1 sec,5 sec,10 sec,15 sec,30 sec,60 sec").split(","));
     282  int nn = _rnxSamplComboBox->findText(settings.value("rnxSampl").toString());
     283    if (nn != -1) {
     284      _rnxSamplComboBox->setCurrentIndex(nn);
     285    }
    285286  _outFileLineEdit    = new QLineEdit(settings.value("outFile").toString());
    286287  _outUPortLineEdit   = new QLineEdit(settings.value("outUPort").toString());
    … …  
    674675  oLayout->setColumnMinimumWidth(0,14*ww);
    675676  _rnxIntrComboBox->setMaximumWidth(9*ww);
    676   _rnxSamplSpinBox->setMaximumWidth(9*ww);
     677  _rnxSamplComboBox->setMaximumWidth(9*ww);
    677678
    678679  oLayout->addWidget(new QLabel("Saving RINEX observation files.<br>"),0, 0, 1,50);
    … …  
    682683  oLayout->addWidget(_rnxIntrComboBox,                             2, 1);
    683684  oLayout->addWidget(new QLabel("  Sampling"),                     2, 2, Qt::AlignRight);
    684   oLayout->addWidget(_rnxSamplSpinBox,                             2, 3, Qt::AlignLeft);
     685  oLayout->addWidget(_rnxSamplComboBox,                             2, 3, Qt::AlignLeft);
    685686  oLayout->addWidget(new QLabel("Skeleton extension"),             3, 0);
    686687  oLayout->addWidget(_rnxSkelLineEdit,                             3, 1, Qt::AlignLeft);
    … …  
    743744  _outPortLineEdit->setMaximumWidth(9*ww);
    744745  _outWaitSpinBox->setMaximumWidth(9*ww);
    745   _outSamplSpinBox->setMaximumWidth(9*ww);
     746  _outSamplComboBox->setMaximumWidth(9*ww);
    746747  _outUPortLineEdit->setMaximumWidth(9*ww);
    747748
    … …  
    752753  sLayout->addWidget(_outWaitSpinBox,                              1, 3, Qt::AlignLeft);
    753754  sLayout->addWidget(new QLabel("Sampling"),                        2, 0);
    754   sLayout->addWidget(_outSamplSpinBox,                              2, 1, Qt::AlignLeft);
     755  sLayout->addWidget(_outSamplComboBox,                              2, 1, Qt::AlignLeft);
    755756  sLayout->addWidget(new QLabel("File (full path)"),                3, 0);
    756757  sLayout->addWidget(_outFileLineEdit,                              3, 1, 1, 10);
    … …  
    12361237  _rnxPathLineEdit->setWhatsThis(tr("<p>Here you specify the path to where the RINEX Observation files will be stored.</p><p>If the specified directory does not exist, BNC will not create RINEX Observation files.</p>"));
    12371238  _rnxIntrComboBox->setWhatsThis(tr("<p>Select the length of the RINEX Observation file.</p>"));
    1238   _rnxSamplSpinBox->setWhatsThis(tr("<p>Select the RINEX Observation sampling interval in seconds.</p><p>A value of zero '0' tells BNC to store all received epochs into RINEX Observation files.</p>"));
     1239  _rnxSamplComboBox->setWhatsThis(tr("<p>Select the RINEX Observation sampling interval in seconds. </p>"));
    12391240  _rnxSkelLineEdit->setWhatsThis(tr("<p>BNC allows using personal RINEX skeleton files that contain the RINEX header records you would like to include. You can derive a skeleton file from information given in an up to date sitelog.</p><p>A file in the RINEX Observations 'Directory' with a 'Skeleton extension' skl or SKL is interpreted by BNC as a personal RINEX header skeleton file for the corresponding stream. In case of 'SKL'/'skl' the 4-char ID forming the base name has to be written in upper/lower cases. </p>"));
    12401241  _rnxFileCheckBox->setWhatsThis(tr("<p>Tick check box 'Skeleton mandatory' in case you want that RINEX files are only produced if skeleton files are available for BNC. If no skeleton file is available for a particular source then no RINEX Observation file will be produced from the affected stream.</p><p>Note that a skeleton file contains RINEX header information such as receiver and antenna types. In case of stream conversion to RINEX Version 3, a skeleton file should also contain information on potentially available observation types. A missing skeleton file will therefore enforce BNC to only save a default set of RINEX 3 observation types.</p>"));
    … …  
    12791280  _outPortLineEdit->setWhatsThis(tr("<p>BNC can produce synchronized observations in a plain ASCII format on your local host via IP port.</p><p>Specify a port number to activate this function.</p>"));
    12801281  _outWaitSpinBox->setWhatsThis(tr("<p>When feeding a real-time GNSS network engine waiting for synchronized input epoch by epoch, BNC drops whatever is received later than 'Wait for full obs epoch' seconds.</p><p>A value of 3 to 5 seconds is recommended, depending on the latency of the incoming streams and the delay acceptable to your real-time GNSS network engine or product.</p>"));
    1281   _outSamplSpinBox->setWhatsThis(tr("<p>Select a synchronized observation sampling interval in seconds.</p><p>A value of zero '0' tells BNC to send/store all received epochs.</p>"));
     1282  _outSamplComboBox->setWhatsThis(tr("<p>Select a synchronized observation sampling interval in seconds. </p>"));
    12821283  _outFileLineEdit->setWhatsThis(tr("<p>Specify the full path to a file where synchronized observations are saved in plain ASCII format.</p><p>Beware that the size of this file can rapidly increase depending on the number of incoming streams.</p>"));
    12831284  _outUPortLineEdit->setWhatsThis(tr("<p>BNC can produce unsynchronized observations in a plain ASCII format on your local host via IP port.</p><p>Specify a port number to activate this function.</p>"));
    … …  
    14391440  delete _rnxPathLineEdit;
    14401441  delete _rnxIntrComboBox;
    1441   delete _rnxSamplSpinBox;
     1442  delete _rnxSamplComboBox;
    14421443  delete _rnxFileCheckBox;
    14431444  delete _rnxSkelLineEdit;
    … …  
    14541455  delete _outPortLineEdit;
    14551456  delete _outWaitSpinBox;
    1456   delete _outSamplSpinBox;
     1457  delete _outSamplComboBox;
    14571458  delete _outFileLineEdit;
    14581459  delete _outUPortLineEdit;
    … …  
    18531854  settings.setValue("rnxPath",     _rnxPathLineEdit->text());
    18541855  settings.setValue("rnxIntr",     _rnxIntrComboBox->currentText());
    1855   settings.setValue("rnxSampl",    _rnxSamplSpinBox->value());
     1856  settings.setValue("rnxSampl",     _rnxSamplComboBox->currentText());
    18561857  settings.setValue("rnxSkel",     _rnxSkelLineEdit->text());
    18571858  settings.setValue("rnxOnlyWithSKL",_rnxFileCheckBox->checkState());
    … …  
    18631864  settings.setValue("ephIntr",       _ephIntrComboBox->currentText());
    18641865  settings.setValue("ephOutPort",    _ephOutPortLineEdit->text());
    1865    settings.setValue("rnxV3",        _rnxV3CheckBox->checkState());
     1866  settings.setValue("ephV3",         _ephV3CheckBox->checkState())
    18661867// Broadcast Corrections
    18671868  settings.setValue("corrPath",    _corrPathLineEdit->text());
    … …  
    18711872  settings.setValue("outPort",     _outPortLineEdit->text());
    18721873  settings.setValue("outWait",     _outWaitSpinBox->value());
    1873   settings.setValue("outSampl",    _outSamplSpinBox->value());
     1874  settings.setValue("outSampl",    _outSamplComboBox->currentText());
    18741875  settings.setValue("outFile",     _outFileLineEdit->text());
    18751876  settings.setValue("outUPort",    _outUPortLineEdit->text());
    … …  
    21842185  populateMountPointsTable();
    21852186  bncSettings settings;
    2186   _outSamplSpinBox->setValue(settings.value("outSampl").toInt());
     2187  _outSamplComboBox->findText(settings.value("rnxSampl").toString());
    21872188  _outWaitSpinBox->setValue(settings.value("outWait").toInt());
    21882189  QListIterator<bncGetThread*> iTh(threads);
    … …  
    23412342    enable = !_rnxPathLineEdit->text().isEmpty();
    23422343    enableWidget(enable, _rnxIntrComboBox);
    2343     enableWidget(enable, _rnxSamplSpinBox);
     2344    enableWidget(enable, _rnxSamplComboBox);
    23442345    enableWidget(enable, _rnxSkelLineEdit);
    23452346    enableWidget(enable, _rnxFileCheckBox);
    … …  
    23882389    enable = !_outPortLineEdit->text().isEmpty() || !_outFileLineEdit->text().isEmpty();
    23892390    enableWidget(enable, _outWaitSpinBox);
    2390     enableWidget(enable, _outSamplSpinBox);
     2391    enableWidget(enable, _outSamplComboBox);
    23912392  }
    23922393

  • branches/BNC_2.12/src/bncwindow.h

    r8351 r8398  
    166166    QComboBox* _ephIntrComboBox;
    167167    QComboBox* _corrIntrComboBox;
    168     QSpinBox*  _rnxSamplSpinBox;
    169     QSpinBox*  _outSamplSpinBox;
     168    QComboBox*  _rnxSamplComboBox;
     169    QComboBox*  _outSamplComboBox;
    170170    QCheckBox* _rnxAppendCheckBox;
    171171    QCheckBox* _autoStartCheckBox;

  • branches/BNC_2.12/src/reqcdlg.cpp

    r8130 r8398  
    5858
    5959  _reqcRnxVersion        = new QComboBox(this);
    60   _reqcSampling          = new QSpinBox(this);
     60  _reqcSampling          = new QComboBox(this);
    6161  _reqcStartDateTime     = new QDateTimeEdit(this);
    6262  _reqcStartDateTime->setDisplayFormat(timeFmtString);
    … …  
    8383  _reqcNewReceiverNumber = new QLineEdit(this);
    8484
    85 
    8685  _reqcRnxVersion->setEditable(false);
    8786  _reqcRnxVersion->addItems(QString("2,3").split(","));
    8887  _reqcRnxVersion->setMaximumWidth(7*ww);
    8988
    90   _reqcSampling->setMinimum(0);
    91   _reqcSampling->setMaximum(60);
    92   _reqcSampling->setSingleStep(5);
    93   _reqcSampling->setSuffix(" sec");
    94   _reqcSampling->setMaximumWidth(7*ww);
     89  _reqcSampling->setEditable(false);
     90  _reqcSampling->addItems(QString("0.1 sec,1 sec,5 sec,10 sec,15 sec,30 sec,60 sec").split(","));
     91  bncSettings settings;
     92  int ll = _reqcSampling->findText(settings.value("reqcSampl").toString());
     93  if (ll != -1) {
     94    _reqcSampling->setCurrentIndex(ll);
     95  }
    9596
    9697  // Read Options
    9798  // ------------
    98   bncSettings settings;
    99 
    10099  int kk = _reqcRnxVersion->findText(settings.value("reqcRnxVersion").toString());
    101100  if (kk != -1) {
    102101    _reqcRnxVersion->setCurrentIndex(kk);
    103102  }
    104   _reqcSampling->setValue(settings.value("reqcSampling").toInt());
     103  _reqcSampling->findText(settings.value("reqcSampling").toString());
    105104  if (settings.value("reqcStartDateTime").toString().isEmpty()) {
    106105    _reqcStartDateTime->setDateTime(QDateTime::fromString("1967-11-02T00:00:00", Qt::ISODate));
    … …  
    231230  // -----------------------------
    232231  _reqcRnxVersion->setWhatsThis(tr("<p>Select version number of emerging new RINEX file.</p><p>Note the following:</p><p>When converting <u>RINEX Version 2 to Version 3 </u>Observation files, the tracking mode or channel information (signal attribute, see RINEX Version 3 documentation) in the (last out of the three characters) observation code is left blank if unknown.</p><p>When converting <u>RINEX Version 3 to Version 2</u>, the mapping of observations follows a 'Signal priority list' with signal attributes as defined in RINEX Version 3.</p>"));
    233   _reqcSampling->setWhatsThis(tr("<p>Select sampling rate of emerging new RINEX Observation file.</p><p>'0 sec' means that observations from all epochs in the RINEX input file will become part of the RINEX output file.</p>"));
     232  _reqcSampling->setWhatsThis(tr("<p>Select sampling rate of emerging new RINEX Observation file.</p>"));
    234233  _reqcV2Priority->setWhatsThis(tr("<p>Specify a priority list of characters defining signal attributes as defined in RINEX Version 3. Priorities will be used to map observations with RINEX Version 3 attributes from incoming streams to Version 2. The underscore character '_' stands for undefined attributes. A question mark '?' can be used as wildcard which represents any one character.</p><p>Signal priorities can be specified as equal for all systems, as system specific or as system and freq. specific. For example: </li><ul><li>'CWPX_?' (General signal priorities valid for all GNSS) </li><li>'C:IQX I:ABCX' (System specific signal priorities for BDS and IRNSS) </li><li>'G:12&PWCSLXYN G:5&IQX R:12&PC R:3&IQX' (System and frequency specific signal priorities) </li></ul>Default is the following priority list 'G:12&PWCSLXYN_ G:5&IQX_ R:12&PC_ R:3&IQX_ E:16&BCX_ E:578&IQX_ J:1&SLXCZ_ J:26&SLX_ J:5&IQX_ C:IQX_ I:ABCX_ S:1&C_ S:5&IQX_'.</p>"));
    235234  _reqcStartDateTime->setWhatsThis(tr("<p>Specify begin of emerging new RINEX Observation file.</p>"));
    … …  
    303302
    304303  settings.setValue("reqcRnxVersion"       , _reqcRnxVersion->currentText());
    305   settings.setValue("reqcSampling"         , _reqcSampling->value());
     304  settings.setValue("reqcSampling"         , _reqcSampling->currentText());
    306305  settings.setValue("reqcV2Priority"       , _reqcV2Priority->text());
    307306  settings.setValue("reqcStartDateTime"    , _reqcStartDateTime->dateTime().toString(Qt::ISODate));

  • branches/BNC_2.12/src/reqcdlg.h

    r6795 r8398  
    5555
    5656   QComboBox*     _reqcRnxVersion;
    57    QSpinBox*      _reqcSampling;
     57   QComboBox*     _reqcSampling;
    5858   QDateTimeEdit* _reqcStartDateTime;
    5959   QDateTimeEdit* _reqcEndDateTime;

  • branches/BNC_2.12/src/rinex/reqcanalyze.cpp

    r8370 r8398  
    819819        << "End Time           : " << _qcFile._endTime.datestr().c_str()           << ' '
    820820                                   << _qcFile._endTime.timestr(1,'.').c_str()      << endl
    821         << "Interval           : " << _qcFile._interval                            << endl;
     821        << "Interval           : " << _qcFile._interval << " sec"                  << endl;
    822822
    823823  // Number of systems

  • branches/BNC_2.12/src/rinex/reqcedit.cpp

    r8373 r8398  
    6969    _rnxVersion = defaultRnxObsVersion3;
    7070  }
    71   _samplingRate   = settings.value("reqcSampling").toInt();
     71  _samplingRate   = settings.value("reqcSampling").toString().split("sec").first().toDouble();
    7272  _begTime        = bncTime(settings.value("reqcStartDateTime").toString().toAscii().data());
    7373  _endTime        = bncTime(settings.value("reqcEndDateTime").toString().toAscii().data());
    … …  
    118118          << _rnxVersion << endl;
    119119    *_log << QByteArray("Sampling").leftJustified(15) << ": "
    120           << _samplingRate << endl;
     120          << _samplingRate << " sec" << endl;
    121121    *_log << QByteArray("Start time").leftJustified(15) << ": "
    122122          << _begTime.datestr().c_str() << ' '
    … …  
    337337
    338338        int sec = int(nint(epo->tt.gpssec()*10));
    339         if (_samplingRate == 0 || sec % (_samplingRate*10) == 0) {
     339        if (sec % (int(_samplingRate)*10) == 0) {
    340340          applyLLI(obsFile, epo);
    341341          outObsFile.writeEpoch(epo);

  • branches/BNC_2.12/src/rinex/reqcedit.h

    r7474 r8398  
    7171  QString                _outNavFileName;
    7272  double                 _rnxVersion;
    73   int                    _samplingRate;
     73  double                 _samplingRate;
    7474  bncTime                _begTime;
    7575  bncTime                _endTime;
Note: See TracChangeset for help on using the changeset viewer.