Index: /branches/BNC_2.12/src/bncmain.cpp =================================================================== --- /branches/BNC_2.12/src/bncmain.cpp (revision 8403) +++ /branches/BNC_2.12/src/bncmain.cpp (revision 8404) @@ -206,5 +206,5 @@ " PPP/snxtroPath {Directory for SINEX troposphere output files [character string]}\n" " 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" - " PPP/snxtroSampl {SINEX troposphere file sampling rate [integer number of seconds: 0|30|60|90|120|150|180|210|240|270|300]}\n" + " PPP/snxtroSampl {SINEX troposphere file sampling rate [character string: 1 sec|5 sec|10 sec|30 sec|60 sec|300 sec]}\n" " PPP/snxtroAc {SINEX troposphere Analysis Center [character string]}\n" " PPP/snxtroSol {SINEX troposphere solution ID [character string]}\n" Index: /branches/BNC_2.12/src/bncsinextro.cpp =================================================================== --- /branches/BNC_2.12/src/bncsinextro.cpp (revision 8403) +++ /branches/BNC_2.12/src/bncsinextro.cpp (revision 8404) @@ -32,5 +32,5 @@ _opt = opt; - (!sampl) ? _sampl = 1 : _sampl = sampl; + _sampl = sampl; _antex = 0; Index: /branches/BNC_2.12/src/bncwindow.cpp =================================================================== --- /branches/BNC_2.12/src/bncwindow.cpp (revision 8403) +++ /branches/BNC_2.12/src/bncwindow.cpp (revision 8404) @@ -1326,5 +1326,5 @@ _pppWidgets._snxtroPath->setWhatsThis(tr("
Specify a directory for saving SINEX Troposphere files. If the specified directory does not exist, BNC will not create such files.
Default is an empty option field, meaning that no SINEX Troposphere files shall be produced.
")); _pppWidgets._snxtroIntr->setWhatsThis(tr("Select a length for SINEX Troposphere files.
Default 'SNX TRO interval' for saving SINEX Troposphere files on disk is '1 hour'.
")); - _pppWidgets._snxtroSampl->setWhatsThis(tr("Select a 'Sampling' rate for saving troposphere parameters.
Default 'SNX TRO sampling' rate is '0', meaning that all troposphere estimates will be saved on disk.
")); + _pppWidgets._snxtroSampl->setWhatsThis(tr("Select a 'Sampling' rate for saving troposphere parameters.
")); _pppWidgets._snxtroAc->setWhatsThis(tr("Specify a 3-character abbreviation describing you as the generating Analysis Center (AC) in your SINEX troposphere files.
")); _pppWidgets._snxtroSol->setWhatsThis(tr("Specify a 4-character solution ID to allow a distingtion between different solutions per AC.
")); Index: /branches/BNC_2.12/src/pppRun.cpp =================================================================== --- /branches/BNC_2.12/src/pppRun.cpp (revision 8403) +++ /branches/BNC_2.12/src/pppRun.cpp (revision 8404) @@ -225,5 +225,5 @@ snxtroFileSkl = snxtroFileSkl + ID4 + "${GPSWD}" + distStr + ".tro"; } - sampl = settings.value("PPP/snxtroSampl").toInt(); + sampl = settings.value("PPP/snxtroSampl").toString().split("sec").first().toInt(); intr = settings.value("PPP/snxtroIntr").toString(); _snxtroFile = new bncSinexTro(_opt, snxtroFileSkl, intr, sampl); Index: /branches/BNC_2.12/src/pppWidgets.cpp =================================================================== --- /branches/BNC_2.12/src/pppWidgets.cpp (revision 8403) +++ /branches/BNC_2.12/src/pppWidgets.cpp (revision 8404) @@ -62,5 +62,5 @@ _nmeaPath = new QLineEdit(); _nmeaPath ->setObjectName("PPP/nmeaPath"); _widgets << _nmeaPath; _snxtroPath = new QLineEdit(); _snxtroPath ->setObjectName("PPP/snxtroPath"); _widgets << _snxtroPath; - _snxtroSampl = new QSpinBox(); _snxtroSampl ->setObjectName("PPP/snxtroSampl"); _widgets << _snxtroSampl; + _snxtroSampl = new QComboBox(); _snxtroSampl->setObjectName("PPP/snxtroSampl"); _widgets << _snxtroSampl; _snxtroIntr = new QComboBox(); _snxtroIntr ->setObjectName("PPP/snxtroIntr"); _widgets << _snxtroIntr; _snxtroAc = new QLineEdit(); _snxtroAc ->setObjectName("PPP/snxtroAc"); _widgets << _snxtroAc; @@ -141,8 +141,6 @@ #endif - _snxtroSampl->setMinimum(0); - _snxtroSampl->setMaximum(300); - _snxtroSampl->setSingleStep(30); - _snxtroSampl->setSuffix(" sec"); + _snxtroSampl->setEditable(false); + _snxtroSampl->addItems(QString("1 sec,5 sec,10 sec,30 sec,60 sec,300 sec").split(",")); _snxtroIntr->setEditable(false); Index: /branches/BNC_2.12/src/pppWidgets.h =================================================================== --- /branches/BNC_2.12/src/pppWidgets.h (revision 8403) +++ /branches/BNC_2.12/src/pppWidgets.h (revision 8404) @@ -48,5 +48,5 @@ QLineEdit* _nmeaPath; QLineEdit* _snxtroPath; - QSpinBox* _snxtroSampl; + QComboBox* _snxtroSampl; QComboBox* _snxtroIntr; QLineEdit* _snxtroAc;