Changeset 7488 in ntrip for trunk

Timestamp:

Oct 8, 2015, 12:20:28 PM (9 years ago)

Author:

stuerze

Message:

snx tro interval is added in GUI

Location:

trunk/BNC/src

Files:

• bncsettings.cpp (modified) (1 diff)
• bncwindow.cpp (modified) (1 diff)
• pppWidgets.cpp (modified) (16 diffs)
• pppWidgets.h (modified) (3 diffs)

trunk/BNC/src/bncsettings.cpp

@@ -235 +235 @@
 ////////////////////////////////////////////////////////////////////////////
 void bncSettings::setValue_p(const QString &key, const QVariant& value) {
+//  qDebug() << "key: " << key << " value: " << value;
   BNC_CORE->_settings[key] = value;
 }

trunk/BNC/src/bncwindow.cpp

@@ -894 +894 @@
   pppLayout1->addWidget(new QLabel("   SNX TRO file"),       ir, 3);
   pppLayout1->addWidget(_pppWidgets._snxtroFile,             ir, 4);
-  pppLayout1->addWidget(new QLabel("   Sampling"),           ir, 5);
+  ++ir;
+  pppLayout1->addWidget(new QLabel("   SNX Interval"),       ir, 3);
+  pppLayout1->addWidget(_pppWidgets._snxtroIntr,             ir, 4);
+  pppLayout1->addWidget(new QLabel("Sampling"),              ir, 5);
   pppLayout1->addWidget(_pppWidgets._snxtroSampl,            ir, 6);
   ++ir;

trunk/BNC/src/pppWidgets.cpp

@@ -35 +35 @@
  * Created:    29-Jul-2014
  *
- * Changes:    
+ * Changes:
  *
  * -----------------------------------------------------------------------*/
@@ -52 +52 @@
 t_pppWidgets::t_pppWidgets() {
 
-  _dataSource   = new QComboBox();     _dataSource  ->setObjectName("PPP/dataSource");   _widgets << _dataSource;  
-  _rinexObs     = new qtFileChooser(); _rinexObs    ->setObjectName("PPP/rinexObs");     _widgets << _rinexObs;    
-  _rinexNav     = new qtFileChooser(); _rinexNav    ->setObjectName("PPP/rinexNav");     _widgets << _rinexNav;    
+  _dataSource   = new QComboBox();     _dataSource  ->setObjectName("PPP/dataSource");   _widgets << _dataSource;
+  _rinexObs     = new qtFileChooser(); _rinexObs    ->setObjectName("PPP/rinexObs");     _widgets << _rinexObs;
+  _rinexNav     = new qtFileChooser(); _rinexNav    ->setObjectName("PPP/rinexNav");     _widgets << _rinexNav;
   _corrMount    = new QLineEdit();     _corrMount   ->setObjectName("PPP/corrMount");    _widgets << _corrMount;
-  _corrFile     = new qtFileChooser(); _corrFile    ->setObjectName("PPP/corrFile");     _widgets << _corrFile;    
-  _crdFile      = new qtFileChooser(); _crdFile     ->setObjectName("PPP/crdFile");      _widgets << _crdFile;     
-  _antexFile    = new qtFileChooser(); _antexFile   ->setObjectName("PPP/antexFile");    _widgets << _antexFile;   
-  _logFile      = new QLineEdit();     _logFile     ->setObjectName("PPP/logFilePPP");   _widgets << _logFile;     
-  _nmeaFile     = new QLineEdit();     _nmeaFile    ->setObjectName("PPP/nmeaFile");     _widgets << _nmeaFile;    
+  _corrFile     = new qtFileChooser(); _corrFile    ->setObjectName("PPP/corrFile");     _widgets << _corrFile;
+  _crdFile      = new qtFileChooser(); _crdFile     ->setObjectName("PPP/crdFile");      _widgets << _crdFile;
+  _antexFile    = new qtFileChooser(); _antexFile   ->setObjectName("PPP/antexFile");    _widgets << _antexFile;
+  _logFile      = new QLineEdit();     _logFile     ->setObjectName("PPP/logFilePPP");   _widgets << _logFile;
+  _nmeaFile     = new QLineEdit();     _nmeaFile    ->setObjectName("PPP/nmeaFile");     _widgets << _nmeaFile;
   _snxtroFile   = new QLineEdit();     _snxtroFile  ->setObjectName("PPP/snxtroFile");   _widgets << _snxtroFile;
   _snxtroSampl  = new QSpinBox();      _snxtroSampl ->setObjectName("PPP/snxtroSampl");  _widgets << _snxtroSampl;
-  _staTable     = new QTableWidget();  _staTable    ->setObjectName("PPP/staTable");     _widgets << _staTable;    
-  _lcGPS        = new QComboBox();     _lcGPS       ->setObjectName("PPP/lcGPS");        _widgets << _lcGPS;       
-  _lcGLONASS    = new QComboBox();     _lcGLONASS   ->setObjectName("PPP/lcGLONASS");    _widgets << _lcGLONASS;   
-  _lcGalileo    = new QComboBox();     _lcGalileo   ->setObjectName("PPP/lcGalileo");    _widgets << _lcGalileo;   
+  _snxtroIntr   = new QComboBox();     _snxtroIntr  ->setObjectName("PPP/_snxtroIntr");  _widgets << _snxtroIntr;
+  _staTable     = new QTableWidget();  _staTable    ->setObjectName("PPP/staTable");     _widgets << _staTable;
+  _lcGPS        = new QComboBox();     _lcGPS       ->setObjectName("PPP/lcGPS");        _widgets << _lcGPS;
+  _lcGLONASS    = new QComboBox();     _lcGLONASS   ->setObjectName("PPP/lcGLONASS");    _widgets << _lcGLONASS;
+  _lcGalileo    = new QComboBox();     _lcGalileo   ->setObjectName("PPP/lcGalileo");    _widgets << _lcGalileo;
   _lcBDS        = new QComboBox();     _lcBDS       ->setObjectName("PPP/lcBDS");        _widgets << _lcBDS;
-  _sigmaC1      = new QLineEdit();     _sigmaC1     ->setObjectName("PPP/sigmaC1");      _widgets << _sigmaC1;     
-  _sigmaL1      = new QLineEdit();     _sigmaL1     ->setObjectName("PPP/sigmaL1");      _widgets << _sigmaL1;     
-  _maxResC1     = new QLineEdit();     _maxResC1    ->setObjectName("PPP/maxResC1");     _widgets << _maxResC1;     
-  _maxResL1     = new QLineEdit();     _maxResL1    ->setObjectName("PPP/maxResL1");     _widgets << _maxResL1;     
+  _sigmaC1      = new QLineEdit();     _sigmaC1     ->setObjectName("PPP/sigmaC1");      _widgets << _sigmaC1;
+  _sigmaL1      = new QLineEdit();     _sigmaL1     ->setObjectName("PPP/sigmaL1");      _widgets << _sigmaL1;
+  _maxResC1     = new QLineEdit();     _maxResC1    ->setObjectName("PPP/maxResC1");     _widgets << _maxResC1;
+  _maxResL1     = new QLineEdit();     _maxResL1    ->setObjectName("PPP/maxResL1");     _widgets << _maxResL1;
   _minObs       = new QSpinBox();      _minObs      ->setObjectName("PPP/minObs");       _widgets << _minObs;
   _minEle       = new QSpinBox();      _minEle      ->setObjectName("PPP/minEle");       _widgets << _minEle;
@@ -98 +99 @@
   connect(_dataSource, SIGNAL(currentIndexChanged(const QString&)), this, SLOT(slotEnableWidgets()));
 
-  connect(_snxtroFile, SIGNAL(textChanged(const QString &)), 
+  connect(_snxtroFile, SIGNAL(textChanged(const QString &)),
          this, SLOT(slotPPPTextChanged()));
 
@@ -135 +136 @@
   _snxtroSampl->setSingleStep(30);
   _snxtroSampl->setSuffix(" sec");
+
+  _snxtroIntr->setEditable(false);
+  _snxtroIntr->addItems(QString("1 min,2 min,5 min,10 min,15 min,30 min,1 hour,1 day").split(","));
 
   _minObs->setMinimum(4);
@@ -159 +163 @@
   _staTable->horizontalHeader()->setResizeMode(QHeaderView::Interactive);
   _staTable->horizontalHeader()->setDefaultAlignment(Qt::AlignLeft);
-  
+
   connect(_addStaButton, SIGNAL(clicked()), this, SLOT(slotAddStation()));
   connect(_delStaButton, SIGNAL(clicked()), this, SLOT(slotDelStation()));
@@ -199 +203 @@
 }
 
-// 
+//
 ////////////////////////////////////////////////////////////////////////////
 void t_pppWidgets::readOptions() {
@@ -226 +230 @@
   if (ii != -1) {
     _lcBDS->setCurrentIndex(ii);
+  }
+  ii = _snxtroIntr->findText(settings.value(_snxtroIntr->objectName()).toString());
+  if (ii != -1) {
+    _snxtroIntr->setCurrentIndex(ii);
   }
 
@@ -267 +275 @@
     _maxResL1->setText(settings.value(_maxResL1->objectName()).toString());
   }
-  else { 
+  else {
     _maxResL1->setText("0.03");
   }
@@ -324 +332 @@
 }
 
-// 
+//
 ////////////////////////////////////////////////////////////////////////////
 void t_pppWidgets::saveOptions() {
@@ -341 +349 @@
   settings.setValue(_snxtroFile  ->objectName(), _snxtroFile  ->text());
   settings.setValue(_snxtroSampl ->objectName(), _snxtroSampl ->value());
+  settings.setValue(_snxtroIntr  ->objectName(), _snxtroIntr  ->currentText());
   settings.setValue(_lcGPS       ->objectName(), _lcGPS       ->currentText());
   settings.setValue(_lcGLONASS   ->objectName(), _lcGLONASS   ->currentText());
@@ -379 +388 @@
 }
 
-// 
+//
 ////////////////////////////////////////////////////////////////////////////
 void t_pppWidgets::slotEnableWidgets() {
@@ -397 +406 @@
 
   if      (realTime) {
-    _rinexObs->setEnabled(false);    
-    _rinexNav->setEnabled(false);    
-    _corrFile->setEnabled(false);    
+    _rinexObs->setEnabled(false);
+    _rinexNav->setEnabled(false);
+    _corrFile->setEnabled(false);
   }
   else if (rinexFiles) {
@@ -408 +417 @@
 
   if ( _snxtroFile->text() != "" && !allDisabled) {
-    _snxtroSampl->setEnabled(true);    
+    _snxtroSampl->setEnabled(true);
+    _snxtroIntr ->setEnabled(true);
   }
   else {
-    _snxtroSampl->setEnabled(false);    
+    _snxtroSampl->setEnabled(false);
+    _snxtroIntr ->setEnabled(false);
   }
 
@@ -428 +439 @@
 }
 
-// 
+//
 ////////////////////////////////////////////////////////////////////////////
 void t_pppWidgets::slotAddStation() {
@@ -447 +458 @@
 }
 
-// 
+//
 ////////////////////////////////////////////////////////////////////////////
 void t_pppWidgets::slotDelStation() {
@@ -477 +488 @@
   // ---------------------
   if (sender() == 0 || sender() == _snxtroFile) {
-    if ( _snxtroFile->text() != "" ) {  
-      _snxtroSampl->setEnabled(true);    
+    if ( _snxtroFile->text() != "" ) {
+      _snxtroSampl->setEnabled(true);
+      _snxtroIntr->setEnabled(true);
       _snxtroSampl->setPalette(paletteWhite);
+      _snxtroIntr->setPalette(paletteWhite);
     }
     else {
-    _snxtroSampl->setEnabled(false);    
+    _snxtroSampl->setEnabled(false);
+    _snxtroIntr->setEnabled(false);
     _snxtroSampl->setPalette(paletteGray);
-    }
-  }
-}
+    _snxtroIntr->setPalette(paletteGray);
+    }
+  }
+}

trunk/BNC/src/pppWidgets.h

@@ -40 +40 @@
   qtFileChooser* _rinexObs;
   qtFileChooser* _rinexNav;
-  QLineEdit*     _corrMount;  
-  qtFileChooser* _corrFile;  
+  QLineEdit*     _corrMount;
+  qtFileChooser* _corrFile;
   qtFileChooser* _crdFile;
   qtFileChooser* _antexFile;
@@ -48 +48 @@
   QLineEdit*     _snxtroFile;
   QSpinBox*      _snxtroSampl;
+  QComboBox*     _snxtroIntr;
   QTableWidget*  _staTable;
   QComboBox*     _lcGPS;
@@ -77 +78 @@
 
  private slots:
-  void slotEnableWidgets();  
+  void slotEnableWidgets();
   void slotAddStation();
   void slotDelStation();