Changeset 9760 in ntrip for trunk/BNC/src/bncwindow.cpp

Timestamp:

Jun 9, 2022, 5:10:10 PM (23 months ago)

Author:

stuerze

Message:

initial changes to consider RINEX Version 4 in future

File:

• trunk/BNC/src/bncwindow.cpp (modified) (19 diffs)

trunk/BNC/src/bncwindow.cpp

@@ -210 +210 @@
   _onTheFlyComboBox->setEditable(false);
   _onTheFlyComboBox->addItems(QString("no,1 day,1 hour,5 min,1 min").split(","));
-  int ii = _onTheFlyComboBox->findText(settings.value("onTheFlyInterval").toString());
-  if (ii != -1) {
-    _onTheFlyComboBox->setCurrentIndex(ii);
+  int go = _onTheFlyComboBox->findText(settings.value("onTheFlyInterval").toString());
+  if (go != -1) {
+    _onTheFlyComboBox->setCurrentIndex(go);
   }
   _autoStartCheckBox  = new QCheckBox();
@@ -220 +220 @@
   // RINEX Observations Options
   // --------------------------
-  _rnxPathLineEdit    = new QLineEdit(settings.value("rnxPath").toString());
-  _rnxIntrComboBox    = new QComboBox();
+  _rnxPathLineEdit = new QLineEdit(settings.value("rnxPath").toString());
+  _rnxIntrComboBox = new QComboBox();
   _rnxIntrComboBox->setEditable(false);
   _rnxIntrComboBox->addItems(QString("1 min,2 min,5 min,10 min,15 min,30 min,1 hour,1 day").split(","));
-  ii = _rnxIntrComboBox->findText(settings.value("rnxIntr").toString());
+  int ii = _rnxIntrComboBox->findText(settings.value("rnxIntr").toString());
   if (ii != -1) {
     _rnxIntrComboBox->setCurrentIndex(ii);
   }
-  _rnxSamplComboBox    = new QComboBox();
+  _rnxSamplComboBox = new QComboBox();
   _rnxSamplComboBox->setEditable(false);
   _rnxSamplComboBox->addItems(QString("0.1 sec,1 sec,5 sec,10 sec,15 sec,30 sec,60 sec").split(","));
@@ -240 +240 @@
   _rnxSkelExtComboBox->setEditable(false);
   _rnxSkelExtComboBox->addItems(QString("skl, SKL").split(","));
-  int il = _rnxSkelExtComboBox->findText(settings.value("rnxSkel").toString());
+  int ik = _rnxSkelExtComboBox->findText(settings.value("rnxSkel").toString());
+  if (ik != -1) {
+    _rnxSkelExtComboBox->setCurrentIndex(ik);
+  }
+  _rnxSkelPathLineEdit = new QLineEdit(settings.value("rnxSkelPath").toString());
+  _rnxScrpLineEdit = new QLineEdit(settings.value("rnxScript").toString());
+  _rnxVersComboBox = new QComboBox();
+  _rnxVersComboBox->setEditable(false);
+  _rnxVersComboBox->addItems(QString("4,3,2").split(","));
+  _rnxVersComboBox->setMaximumWidth(7*ww);
+  int il = _rnxVersComboBox->findText(settings.value("rnxVersion").toString());
   if (il != -1) {
-    _rnxSkelExtComboBox->setCurrentIndex(il);
-  }
-  _rnxSkelPathLineEdit  = new QLineEdit(settings.value("rnxSkelPath").toString());
-  _rnxScrpLineEdit    = new QLineEdit(settings.value("rnxScript").toString());
-  _rnxV2CheckBox      = new QCheckBox();
-  _rnxV2CheckBox->setCheckState(Qt::CheckState(settings.value("rnxV2").toInt()));
+    _rnxVersComboBox->setCurrentIndex(il);
+  }
   QString hlp = settings.value("rnxV2Priority").toString();
   if (hlp.isEmpty()) {
@@ -256 +262 @@
   connect(_rnxPathLineEdit, SIGNAL(textChanged(const QString &)), this, SLOT(slotBncTextChanged()));
   connect(_rnxSkelPathLineEdit, SIGNAL(textChanged(const QString &)), this, SLOT(slotBncTextChanged()));
-  connect(_rnxV2CheckBox, SIGNAL(stateChanged(int)), this, SLOT(slotBncTextChanged()));
+  connect(_rnxVersComboBox, SIGNAL(currentIndexChanged(const QString &)), this, SLOT(slotBncTextChanged()));
 
   // RINEX Ephemeris Options
   // -----------------------
-  _ephPathLineEdit    = new QLineEdit(settings.value("ephPath").toString());
-  _ephIntrComboBox    = new QComboBox();
+  _ephPathLineEdit = new QLineEdit(settings.value("ephPath").toString());
+  _ephIntrComboBox = new QComboBox();
   _ephIntrComboBox->setEditable(false);
   _ephIntrComboBox->addItems(QString("1 min,2 min,5 min,10 min,15 min,30 min,1 hour,1 day").split(","));
-  int jj = _ephIntrComboBox->findText(settings.value("ephIntr").toString());
-  if (jj != -1) {
-    _ephIntrComboBox->setCurrentIndex(jj);
-  }
-  _ephOutPortLineEdit    = new QLineEdit(settings.value("ephOutPort").toString());
-  _ephV2CheckBox = new QCheckBox();
-  _ephV2CheckBox->setCheckState(Qt::CheckState(settings.value("ephV2").toInt()));
+  int ji = _ephIntrComboBox->findText(settings.value("ephIntr").toString());
+  if (ji != -1) {
+    _ephIntrComboBox->setCurrentIndex(ji);
+  }
+  _ephOutPortLineEdit = new QLineEdit(settings.value("ephOutPort").toString());
+  _ephVersComboBox = new QComboBox();
+  _ephVersComboBox->setEditable(false);
+  _ephVersComboBox->addItems(QString("4,3,2").split(","));
+  _ephVersComboBox->setMaximumWidth(7*ww);
+  int jk = _ephVersComboBox->findText(settings.value("ephVersion").toString());
+  if (jk != -1) {
+    _ephVersComboBox->setCurrentIndex(jk);
+  }
 
   connect(_ephOutPortLineEdit, SIGNAL(textChanged(const QString &)),
@@ -284 +296 @@
   _corrIntrComboBox->setEditable(false);
   _corrIntrComboBox->addItems(QString("1 min,2 min,5 min,10 min,15 min,30 min,1 hour,1 day").split(","));
-  int mm = _corrIntrComboBox->findText(settings.value("corrIntr").toString());
-  if (mm != -1) {
-    _corrIntrComboBox->setCurrentIndex(mm);
+  int bi = _corrIntrComboBox->findText(settings.value("corrIntr").toString());
+  if (bi != -1) {
+    _corrIntrComboBox->setCurrentIndex(bi);
   }
   _corrPortLineEdit    = new QLineEdit(settings.value("corrPort").toString());
@@ -298 +310 @@
   // Feed Engine Options
   // -------------------
-  _outPortLineEdit    = new QLineEdit(settings.value("outPort").toString());
-  _outWaitSpinBox   = new QSpinBox();
+  _outPortLineEdit = new QLineEdit(settings.value("outPort").toString());
+  _outWaitSpinBox = new QSpinBox();
   _outWaitSpinBox->setMinimum(0);
   _outWaitSpinBox->setMaximum(30);
@@ -305 +317 @@
   _outWaitSpinBox->setSuffix(" sec");
   _outWaitSpinBox->setValue(settings.value("outWait").toInt());
-  _outSamplComboBox    = new QComboBox();
+  _outSamplComboBox = new QComboBox();
   _outSamplComboBox->addItems(QString("0.1 sec,1 sec,5 sec,10 sec,15 sec,30 sec,60 sec").split(","));
   int nn = _outSamplComboBox->findText(settings.value("outSampl").toString());
@@ -311 +323 @@
       _outSamplComboBox->setCurrentIndex(nn);
     }
-  _outFileLineEdit    = new QLineEdit(settings.value("outFile").toString());
-  _outUPortLineEdit   = new QLineEdit(settings.value("outUPort").toString());
+  _outFileLineEdit = new QLineEdit(settings.value("outFile").toString());
+  _outUPortLineEdit = new QLineEdit(settings.value("outUPort").toString());
   _outLockTimeCheckBox = new QCheckBox();
   _outLockTimeCheckBox->setCheckState(Qt::CheckState(settings.value("outLockTime").toInt()));
@@ -497 +509 @@
   _cmbMethodComboBox->setEditable(false);
   _cmbMethodComboBox->addItems(QString("Kalman Filter,Single-Epoch").split(","));
-  int im = _cmbMethodComboBox->findText(settings.value("cmbMethod").toString());
-  if (im != -1) {
-    _cmbMethodComboBox->setCurrentIndex(im);
+  int cm = _cmbMethodComboBox->findText(settings.value("cmbMethod").toString());
+  if (cm != -1) {
+    _cmbMethodComboBox->setCurrentIndex(cm);
   }
 
@@ -802 +814 @@
   oLayout->addWidget(new QLabel("Script (full path)"),             5, 0);
   oLayout->addWidget(_rnxScrpLineEdit,                             5, 1, 1, 15);
-  oLayout->addWidget(new QLabel("Version 2"),                      6, 0);
-  oLayout->addWidget(_rnxV2CheckBox,                               6, 1);
+  oLayout->addWidget(new QLabel("Version"),                        6, 0);
+  oLayout->addWidget(_rnxVersComboBox,                             6, 1);
   oLayout->addWidget(new QLabel("Signal priority"),                6, 2, Qt::AlignRight);
   oLayout->addWidget(_rnxV2Priority,                               6, 3, 1, 13);
@@ -825 +837 @@
   eLayout->addWidget(new QLabel("Port"),                          3, 0);
   eLayout->addWidget(_ephOutPortLineEdit,                         3, 1);
-  eLayout->addWidget(new QLabel("Version 2"),                     4, 0);
-  eLayout->addWidget(_ephV2CheckBox,                              4, 1);
+  eLayout->addWidget(new QLabel("Version"),                       4, 0);
+  eLayout->addWidget(_ephVersComboBox,                            4, 1);
   eLayout->setRowStretch(5, 999);
 
@@ -1131 +1143 @@
   _reqcActionComboBox->setEditable(false);
   _reqcActionComboBox->addItems(QString(",Edit/Concatenate,Analyze").split(","));
-  int ik = _reqcActionComboBox->findText(settings.value("reqcAction").toString());
-  if (ik != -1) {
-    _reqcActionComboBox->setCurrentIndex(ik);
+  int ip = _reqcActionComboBox->findText(settings.value("reqcAction").toString());
+  if (ip != -1) {
+    _reqcActionComboBox->setCurrentIndex(ip);
   }
   connect(_reqcActionComboBox, SIGNAL(currentIndexChanged(const QString &)),
@@ -1379 +1391 @@
   _rnxScrpLineEdit->setWhatsThis(tr("<p>Whenever a RINEX Observation file is finally saved, you may want to compress, copy or upload it immediately, for example via FTP. BNC allows you to execute a script/batch file to carry out such operation.</p><p>Specify the full path of a script or batch file. BNC will pass the full RINEX Observation file path to the script as command line parameter (%1 on Windows systems, $1 on Unix/Linux/Mac systems). <i>[key: rnxScript]</i></p>"));
   _rnxV2Priority->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>'I:ABCX' (System specific signal priorities for IRNSS) </li><li>'G:12&PWCSLX 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&PWCSLX G:5&IQX R:12&PC R:3&IQX R:46&ABX E:16&BCXZ E:578&IQX J:1&SLXCZ J:26&SLX J:5&IQX C:267&IQX C:128&DPX C:7&DPZ I:ABCX S:1&C S:5&IQX'. <i>[key: rnxV2Priority]</i></p>"));
-  _rnxV2CheckBox->setWhatsThis(tr("<p>The default format for RINEX Observation files is RINEX Version 3.</p><p>Select 'Version 2' if you want to save observations in RINEX Version 2 format. <i>[key: rnxV2]</i></p>"));
+  _rnxVersComboBox->setWhatsThis(tr("<p>Select the format for RINEX Observation files. <i>[key: rnxVersion]</i></p>"));
 
   // WhatsThis, RINEX Ephemeris
@@ -1386 +1398 @@
   _ephIntrComboBox->setWhatsThis(tr("<p>Select the length of the RINEX Navigation file. <i>[key: ephIntr]</i></p>"));
   _ephOutPortLineEdit->setWhatsThis(tr("<p>BNC can produce ephemeris data in RINEX Navigation ASCII format on your local host through an IP port.</p><p>Specify a port number here to activate this function. <i>[key: ephOutPort]</i></p>"));
-  _ephV2CheckBox->setWhatsThis(tr("<p>The default format for output of RINEX Navigation data containing Broadcast Ephemeris is RINEX Version 3.</p><p>Select 'Version 2' if you want to output ephemeris in RINEX Version 2 format. <i>[key: ephV2]</i></p>"));
+  _ephVersComboBox->setWhatsThis(tr("<p>Select the format for RINEX Navigation files. <i>[key: ephVersion]</i></p>"));
 
   // WhatsThis, RINEX Editing & QC
@@ -1593 +1605 @@
   delete _rnxFileCheckBox;
   delete _rnxScrpLineEdit;
-  delete _rnxV2CheckBox;
+  delete _rnxVersComboBox;
   delete _rnxV2Priority;
   delete _ephPathLineEdit;
   delete _ephIntrComboBox;
   delete _ephOutPortLineEdit;
-  delete _ephV2CheckBox;
+  delete _ephVersComboBox;
   delete _corrPathLineEdit;
   delete _corrIntrComboBox;
@@ -2058 +2070 @@
   settings.setValue("rnxScript",    _rnxScrpLineEdit->text());
   settings.setValue("rnxV2Priority",_rnxV2Priority->text());
-  settings.setValue("rnxV2",        _rnxV2CheckBox->checkState());
+  settings.setValue("rnxVersion",   _rnxVersComboBox->currentText());
 // RINEX Ephemeris
   settings.setValue("ephPath",       _ephPathLineEdit->text());
   settings.setValue("ephIntr",       _ephIntrComboBox->currentText());
   settings.setValue("ephOutPort",    _ephOutPortLineEdit->text());
-  settings.setValue("ephV2",         _ephV2CheckBox->checkState());
+  settings.setValue("ephVersion",    _ephVersComboBox->currentText());
 // Broadcast Corrections
   settings.setValue("corrPath",    _corrPathLineEdit->text());
@@ -2555 +2567 @@
     enableWidget(enable, _rnxScrpLineEdit);
     enableWidget(enable, _rnxV2Priority);
-    enableWidget(enable, _rnxV2CheckBox);
+    enableWidget(enable, _rnxVersComboBox);
 
     bool enable1 = true;
-    enable1 = _rnxV2CheckBox->isChecked();
+    enable1 = _rnxVersComboBox->currentText() == "2";
     if (enable && enable1) {
       enableWidget(true, _rnxV2Priority);
@@ -2569 +2581 @@
   // RINEX Observations, Signal Priority
   // -----------------------------------
-  if (sender() == 0 || sender() == _rnxV2CheckBox) {
+  if (sender() == 0 || sender() == _rnxVersComboBox) {
     if (!_rnxPathLineEdit->text().isEmpty()) {
       enableWidget(enable, _rnxIntrComboBox);
-      enable = _rnxV2CheckBox->isChecked();
+      enable = _rnxVersComboBox->currentText() == "2";
       enableWidget(enable, _rnxV2Priority);
     }
@@ -2582 +2594 @@
     enable = !_ephPathLineEdit->text().isEmpty() || !_ephOutPortLineEdit->text().isEmpty();
     enableWidget(enable, _ephIntrComboBox);
-    enableWidget(enable, _ephV2CheckBox);
+    enableWidget(enable, _ephVersComboBox);
   }