Changeset 8403 in ntrip

Timestamp:

Jul 5, 2018, 12:51:40 PM (6 years ago)

Author:

stuerze

Message:

additional changes to allow 10 Hz observation data processing

Location:

trunk/BNC/src

Files:

• bncmain.cpp (modified) (1 diff)
• bncsinextro.cpp (modified) (1 diff)
• bncwindow.cpp (modified) (1 diff)
• pppRun.cpp (modified) (1 diff)
• pppWidgets.cpp (modified) (4 diffs)
• pppWidgets.h (modified) (1 diff)

trunk/BNC/src/bncmain.cpp

@@ -208 +208 @@
       "   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"

trunk/BNC/src/bncsinextro.cpp

@@ -32 +32 @@
 
   _opt       = opt;
-  (!sampl) ? _sampl = 1 : _sampl =  sampl;
+  _sampl =  sampl;
 
   _antex = 0;

trunk/BNC/src/bncwindow.cpp

@@ -1386 +1386 @@
   _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>"));
   _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>"));
-  _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>"));
+  _pppWidgets._snxtroSampl->setWhatsThis(tr("<p>Select a 'Sampling' rate for saving troposphere parameters. <i>[key: PPP/snxtroSampl]</i></p>"));
   _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>"));
   _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

@@ -225 +225 @@
       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);

trunk/BNC/src/pppWidgets.cpp

@@ -72 +72 @@
   _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;
@@ -151 +151 @@
 #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);
@@ -368 +366 @@
   _minEle->setValue(settings.value(_minEle->objectName()).toInt());
   _corrWaitTime->setValue(settings.value(_corrWaitTime->objectName()).toInt());
-  _snxtroSampl->setValue(settings.value(_snxtroSampl->objectName()).toInt());
+
+
+  ii = _snxtroSampl->findText(settings.value(_snxtroSampl->objectName()).toString());
+  if (ii != -1) {
+    _snxtroSampl->setCurrentIndex(ii);
+  }
 
   // Table with stations
@@ -421 +424 @@
   settings.setValue(_nmeaPath    ->objectName(), _nmeaPath    ->text());
   settings.setValue(_snxtroPath  ->objectName(), _snxtroPath  ->text());
-  settings.setValue(_snxtroSampl ->objectName(), _snxtroSampl ->value());
+  settings.setValue(_snxtroSampl ->objectName(), _snxtroSampl ->currentText());
   settings.setValue(_snxtroIntr  ->objectName(), _snxtroIntr  ->currentText());
   settings.setValue(_snxtroAc    ->objectName(), _snxtroAc    ->text());

trunk/BNC/src/pppWidgets.h

@@ -56 +56 @@
   QLineEdit*     _nmeaPath;
   QLineEdit*     _snxtroPath;
-  QSpinBox*      _snxtroSampl;
+  QComboBox*     _snxtroSampl;
   QComboBox*     _snxtroIntr;
   QLineEdit*     _snxtroAc;