Index: trunk/BNC/src/reqcdlg.cpp =================================================================== --- trunk/BNC/src/reqcdlg.cpp (revision 8252) +++ trunk/BNC/src/reqcdlg.cpp (revision 8397) @@ -69,5 +69,5 @@ _reqcRnxVersion = new QComboBox(this); - _reqcSampling = new QSpinBox(this); + _reqcSampling = new QComboBox(this); _reqcStartDateTime = new QDateTimeEdit(this); _reqcStartDateTime->setDisplayFormat(timeFmtString); @@ -94,24 +94,23 @@ _reqcNewReceiverNumber = new QLineEdit(this); - _reqcRnxVersion->setEditable(false); _reqcRnxVersion->addItems(QString("2,3").split(",")); _reqcRnxVersion->setMaximumWidth(7*ww); - _reqcSampling->setMinimum(0); - _reqcSampling->setMaximum(60); - _reqcSampling->setSingleStep(5); - _reqcSampling->setSuffix(" sec"); - _reqcSampling->setMaximumWidth(7*ww); + _reqcSampling->setEditable(false); + _reqcSampling->addItems(QString("0.1 sec,1 sec,5 sec,10 sec,15 sec,30 sec,60 sec").split(",")); + bncSettings settings; + int ll = _reqcSampling->findText(settings.value("reqcSampl").toString()); + if (ll != -1) { + _reqcSampling->setCurrentIndex(ll); + } // Read Options // ------------ - bncSettings settings; - int kk = _reqcRnxVersion->findText(settings.value("reqcRnxVersion").toString()); if (kk != -1) { _reqcRnxVersion->setCurrentIndex(kk); } - _reqcSampling->setValue(settings.value("reqcSampling").toInt()); + _reqcSampling->findText(settings.value("reqcSampling").toString()); if (settings.value("reqcStartDateTime").toString().isEmpty()) { _reqcStartDateTime->setDateTime(QDateTime::fromString("1967-11-02T00:00:00", Qt::ISODate)); @@ -242,5 +241,5 @@ // ----------------------------- _reqcRnxVersion->setWhatsThis(tr("
Select version number of emerging new RINEX file.
Note the following:
When converting RINEX Version 2 to Version 3 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.
When converting RINEX Version 3 to Version 2, the mapping of observations follows a 'Signal priority list' with signal attributes as defined in RINEX Version 3. [key: reqcRnxVersion]
")); - _reqcSampling->setWhatsThis(tr("Select sampling rate of emerging new RINEX Observation file.
'0 sec' means that observations from all epochs in the RINEX input file will become part of the RINEX output file. [key: reqcSampling]
")); + _reqcSampling->setWhatsThis(tr("Select sampling rate of emerging new RINEX Observation file. [key: reqcSampling]
")); _reqcV2Priority->setWhatsThis(tr("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.
Signal priorities can be specified as equal for all systems, as system specific or as system and freq. specific. For example:
Specify begin of emerging new RINEX Observation file. [key: reqcStartDateTime]
")); @@ -314,5 +313,5 @@ settings.setValue("reqcRnxVersion" , _reqcRnxVersion->currentText()); - settings.setValue("reqcSampling" , _reqcSampling->value()); + settings.setValue("reqcSampling" , _reqcSampling->currentText()); settings.setValue("reqcV2Priority" , _reqcV2Priority->text()); settings.setValue("reqcStartDateTime" , _reqcStartDateTime->dateTime().toString(Qt::ISODate));