Changeset 6796 in ntrip

Timestamp:

Apr 24, 2015, 4:53:57 PM (10 years ago)

Author:

stuerze

Message:

add an option to write only RINEX files if the respective SKL file is available

Location:

trunk/BNC/src

Files:

• bncrinex.cpp (modified) (4 diffs)
• bncrinex.h (modified) (1 diff)
• bncwindow.cpp (modified) (5 diffs)
• bncwindow.h (modified) (1 diff)

trunk/BNC/src/bncrinex.cpp

@@ -91 +91 @@
 
   _samplingRate = settings.value("rnxSampl").toInt();
+
+  _writeRinexFileOnlyWithSkl = settings.value("rnxOnlyWithSKL").toBool();
 }
 
@@ -323 +325 @@
   bncSettings settings;
 
+  // Set RINEX Version
+  // -----------------
+  int intHeaderVers = (Qt::CheckState(settings.value("rnxV3").toInt()) == Qt::Checked ? 3 : 2);
+
+  // Read Skeleton Header
+  // --------------------
+  if (readSkeleton()) {
+    _header.set(_sklHeader, intHeaderVers);
+  }
+  else {
+    if (_writeRinexFileOnlyWithSkl) {
+      return;
+    }
+    _header.setDefault(_statID, intHeaderVers);
+  }
+
   // Open the Output File
   // --------------------
@@ -343 +361 @@
 
   _out.setf(ios::showpoint | ios::fixed);
-
-  // Set RINEX Version
-  // -----------------
-  int intHeaderVers = (Qt::CheckState(settings.value("rnxV3").toInt()) == Qt::Checked ? 3 : 2);
-
-  // Read Skeleton Header
-  // --------------------
-  if (readSkeleton()) {
-    _header.set(_sklHeader, intHeaderVers);
-  }
-  else {
-    _header.setDefault(_statID, intHeaderVers);
-  }
 
   // A Few Additional Comments
@@ -429 +434 @@
     writeHeader(format, fObs._time);
   }
+  if (!_headerWritten) {
+    return;
+  }
 
   // Prepare structure t_rnxEpo

trunk/BNC/src/bncrinex.h

@@ -68 +68 @@
    QString         _userName;
    QString         _sklName;
+   bool            _writeRinexFileOnlyWithSkl;
    QByteArray      _latitude;
    QByteArray      _longitude;

trunk/BNC/src/bncwindow.cpp

@@ -211 +211 @@
   _rnxSamplSpinBox->setSingleStep(5);
   _rnxSamplSpinBox->setValue(settings.value("rnxSampl").toInt());
+  _rnxFileCheckBox = new QCheckBox();
+  _rnxFileCheckBox->setCheckState(Qt::CheckState(settings.value("rnxOnlyWithSKL").toInt()));
   _rnxSamplSpinBox->setSuffix(" sec");
   _rnxSkelLineEdit    = new QLineEdit(settings.value("rnxSkel").toString());
@@ -673 +675 @@
   oLayout->setColumnMinimumWidth(0,14*ww);
   _rnxIntrComboBox->setMaximumWidth(9*ww);
-//_rnxSamplSpinBox->setMaximumWidth(9*ww);
+  _rnxSamplSpinBox->setMaximumWidth(9*ww);
 
   oLayout->addWidget(new QLabel("Saving RINEX observation files.<br>"),0, 0, 1,50);
@@ -684 +686 @@
   oLayout->addWidget(new QLabel("Skeleton extension"),             3, 0);
   oLayout->addWidget(_rnxSkelLineEdit,                             3, 1, Qt::AlignLeft);
+  oLayout->addWidget(new QLabel("RINEX File generation only with SKL file"),3, 2);
+  oLayout->addWidget(_rnxFileCheckBox,                             3, 3);
   oLayout->addWidget(new QLabel("Script (full path)"),             4, 0);
   oLayout->addWidget(_rnxScrpLineEdit,                             4, 1, 1, 15);
@@ -1704 +1708 @@
   settings.setValue("rnxSampl",    _rnxSamplSpinBox->value());
   settings.setValue("rnxSkel",     _rnxSkelLineEdit->text());
+  settings.setValue("rnxOnlyWithSKL",_rnxFileCheckBox->checkState());
   settings.setValue("rnxScript",   _rnxScrpLineEdit->text());
   settings.setValue("rnxV3",       _rnxV3CheckBox->checkState());
@@ -2189 +2194 @@
     enableWidget(enable, _rnxSamplSpinBox);
     enableWidget(enable, _rnxSkelLineEdit);
+    enableWidget(enable, _rnxFileCheckBox);
     enableWidget(enable, _rnxScrpLineEdit);
     enableWidget(enable, _rnxV2Priority);

trunk/BNC/src/bncwindow.h

@@ -159 +159 @@
     QCheckBox* _ephV3CheckBox;
     QLineEdit* _rnxSkelLineEdit;
+    QCheckBox* _rnxFileCheckBox;
     QLineEdit* _rnxScrpLineEdit;
     QLineEdit* _logFileLineEdit;