Changeset 8403 in ntrip


Ignore:
Timestamp:
Jul 5, 2018, 12:51:40 PM (3 months ago)
Author:
stuerze
Message:

additional changes to allow 10 Hz observation data processing

Location:
trunk/BNC/src
Files:
6 edited

Legend:

Unmodified
Added
Removed
  • trunk/BNC/src/bncmain.cpp

    r8397 r8403  
    208208      "   PPP/snxtroPath  {Directory for SINEX troposphere output files [character string]}\n"
    209209      "   PPP/snxtroIntr  {SINEX troposphere file interval [character string: 1 min|2 min|5 min|10 min|15 min|30 min|1 hour|1 day]}\n"
    210       "   PPP/snxtroSampl {SINEX troposphere file sampling rate [integer number of seconds: 0|30|60|90|120|150|180|210|240|270|300]}\n"
     210      "   PPP/snxtroSampl {SINEX troposphere file sampling rate [character string: 1 sec|5 sec|10 sec|30 sec|60 sec|300 sec]}\n"
    211211      "   PPP/snxtroAc    {SINEX troposphere Analysis Center [character string]}\n"
    212212      "   PPP/snxtroSol   {SINEX troposphere solution ID [character string]}\n"
  • trunk/BNC/src/bncsinextro.cpp

    r8134 r8403  
    3232
    3333  _opt       = opt;
    34   (!sampl) ? _sampl = 1 : _sampl =  sampl;
     34  _sampl =  sampl;
    3535
    3636  _antex = 0;
  • trunk/BNC/src/bncwindow.cpp

    r8397 r8403  
    13861386  _pppWidgets._snxtroPath->setWhatsThis(tr("<p>Specify a directory for saving SINEX Troposphere files. If the specified directory does not exist, BNC will not create such files.</p><p>Default is an empty option field, meaning that no SINEX Troposphere files shall be produced. <i>[key: PPP/snxtroPath]</i></p>"));
    13871387  _pppWidgets._snxtroIntr->setWhatsThis(tr("<p>Select a length for SINEX Troposphere files.</p><p>Default 'SNX TRO interval' for saving SINEX Troposphere files on disk is '1 hour'. <i>[key: PPP/snxtroIntr]</i></p>"));
    1388   _pppWidgets._snxtroSampl->setWhatsThis(tr("<p>Select a 'Sampling' rate for saving troposphere parameters.</p><p>Default 'SNX TRO sampling' rate is '0', meaning that all troposphere estimates will be saved on disk. <i>[key: PPP/snxtroSampl]</i></p>"));
     1388  _pppWidgets._snxtroSampl->setWhatsThis(tr("<p>Select a 'Sampling' rate for saving troposphere parameters. <i>[key: PPP/snxtroSampl]</i></p>"));
    13891389  _pppWidgets._snxtroAc->setWhatsThis(tr("<p>Specify a 3-character abbreviation describing you as the generating Analysis Center (AC) in your SINEX troposphere files. <i>[key: PPP/snxtroAc]</i></p>"));
    13901390  _pppWidgets._snxtroSol->setWhatsThis(tr("<p>Specify a 4-character solution ID to allow a distingtion between different solutions per AC. <i>[key: PPP/snxtroSol]</i></p>"));
  • trunk/BNC/src/pppRun.cpp

    r8320 r8403  
    225225      snxtroFileSkl = snxtroFileSkl + ID4 + "${GPSWD}" + distStr + ".tro";
    226226    }
    227     sampl = settings.value("PPP/snxtroSampl").toInt();
     227    sampl = settings.value("PPP/snxtroSampl").toString().split("sec").first().toInt();
    228228    intr  = settings.value("PPP/snxtroIntr").toString();
    229229    _snxtroFile = new bncSinexTro(_opt, snxtroFileSkl, intr, sampl);
  • trunk/BNC/src/pppWidgets.cpp

    r8252 r8403  
    7272  _nmeaPath     = new QLineEdit();     _nmeaPath    ->setObjectName("PPP/nmeaPath");     _widgets << _nmeaPath;
    7373  _snxtroPath   = new QLineEdit();     _snxtroPath  ->setObjectName("PPP/snxtroPath");   _widgets << _snxtroPath;
    74   _snxtroSampl  = new QSpinBox();      _snxtroSampl ->setObjectName("PPP/snxtroSampl");  _widgets << _snxtroSampl;
     74  _snxtroSampl  = new QComboBox();      _snxtroSampl->setObjectName("PPP/snxtroSampl");  _widgets << _snxtroSampl;
    7575  _snxtroIntr   = new QComboBox();     _snxtroIntr  ->setObjectName("PPP/snxtroIntr");   _widgets << _snxtroIntr;
    7676  _snxtroAc     = new QLineEdit();     _snxtroAc    ->setObjectName("PPP/snxtroAc");     _widgets << _snxtroAc;
     
    151151#endif
    152152
    153   _snxtroSampl->setMinimum(0);
    154   _snxtroSampl->setMaximum(300);
    155   _snxtroSampl->setSingleStep(30);
    156   _snxtroSampl->setSuffix(" sec");
     153  _snxtroSampl->setEditable(false);
     154  _snxtroSampl->addItems(QString("1 sec,5 sec,10 sec,30 sec,60 sec,300 sec").split(","));
    157155
    158156  _snxtroIntr->setEditable(false);
     
    368366  _minEle->setValue(settings.value(_minEle->objectName()).toInt());
    369367  _corrWaitTime->setValue(settings.value(_corrWaitTime->objectName()).toInt());
    370   _snxtroSampl->setValue(settings.value(_snxtroSampl->objectName()).toInt());
     368
     369
     370  ii = _snxtroSampl->findText(settings.value(_snxtroSampl->objectName()).toString());
     371  if (ii != -1) {
     372    _snxtroSampl->setCurrentIndex(ii);
     373  }
    371374
    372375  // Table with stations
     
    421424  settings.setValue(_nmeaPath    ->objectName(), _nmeaPath    ->text());
    422425  settings.setValue(_snxtroPath  ->objectName(), _snxtroPath  ->text());
    423   settings.setValue(_snxtroSampl ->objectName(), _snxtroSampl ->value());
     426  settings.setValue(_snxtroSampl ->objectName(), _snxtroSampl ->currentText());
    424427  settings.setValue(_snxtroIntr  ->objectName(), _snxtroIntr  ->currentText());
    425428  settings.setValue(_snxtroAc    ->objectName(), _snxtroAc    ->text());
  • trunk/BNC/src/pppWidgets.h

    r8252 r8403  
    5656  QLineEdit*     _nmeaPath;
    5757  QLineEdit*     _snxtroPath;
    58   QSpinBox*      _snxtroSampl;
     58  QComboBox*     _snxtroSampl;
    5959  QComboBox*     _snxtroIntr;
    6060  QLineEdit*     _snxtroAc;
Note: See TracChangeset for help on using the changeset viewer.