Changeset 10532 in ntrip for trunk/BNC

Timestamp:

Sep 13, 2024, 5:43:34 PM (2 months ago)

Author:

stuerze

Message:

bug fixed: obs types from skl file are used now to write them into RINEX version 3 or 4 observation files as configured

Location:

trunk/BNC/src

Files:

• bncrinex.cpp (modified) (3 diffs)
• bncrinex.h (modified) (1 diff)
• bncwindow.cpp (modified) (1 diff)
• rinex/rnxobsfile.cpp (modified) (2 diffs)
• rinex/rnxobsfile.h (modified) (1 diff)

trunk/BNC/src/bncrinex.cpp

@@ -78 +78 @@
 
   bncSettings settings;
-  _rnxScriptName = settings.value("rnxScript").toString();
-  expandEnvVar(_rnxScriptName);
-
+  _rnxScriptName = settings.value("rnxScript").toString(); expandEnvVar(_rnxScriptName);
+  _sklExt        = settings.value("rnxSkel").toString();
+  _sklPath       = settings.value("rnxSkelPath").toString();
   _pgmName  = QString(BNCPGMNAME).leftJustified(20, ' ', true);
 #ifdef WIN32
@@ -173 +173 @@
     QUrl url;
     int stIdLength = _mountPoint.path().length()-2;
-    staID =            _mountPoint.path().mid(1,stIdLength).toUpper() + ".skl";
-    staIDalternative = _mountPoint.path().mid(1,stIdLength).toLower() + ".skl";
+    staID =            _mountPoint.path().mid(1,stIdLength).toUpper() + "." + _sklExt;
+    staIDalternative = _mountPoint.path().mid(1,stIdLength).toLower() + "." + _sklExt;
     if (url.port() == -1) {
       if (sklDir.contains("https", Qt::CaseInsensitive)) {
@@ -377 +377 @@
   // Local Skeleton file
   // -------------------
-  QString sklExt  = settings.value("rnxSkel").toString();
-  QString sklPath = settings.value("rnxSkelPath").toString();
-  expandEnvVar(sklPath);
-  if (sklPath.length() > 0 &&
-      sklPath[sklPath.length()-1] != QDir::separator()) {
-    sklPath += QDir::separator();
-  }
-  if (sklPath.isEmpty()) {
-    sklPath = rnxPath;
-  }
-  _localSklName            = sklPath + ID           + distStr + "." + sklExt;
-  _localSklNameAlternative = sklPath + ID.toLower() + distStr + "." + sklExt;
+  expandEnvVar(_sklPath);
+  if (_sklPath.length() > 0 &&
+      _sklPath[_sklPath.length()-1] != QDir::separator()) {
+    _sklPath += QDir::separator();
+  }
+  if (_sklPath.isEmpty()) {
+    _sklPath = rnxPath;
+  }
+  _localSklName            = _sklPath + ID           + distStr + "." + _sklExt;
+  _localSklNameAlternative = _sklPath + ID.toLower() + distStr + "." + _sklExt;
 
   if (_rnxVersion > 2) {

trunk/BNC/src/bncrinex.h

@@ -65 +65 @@
    QDateTime       _nextCloseEpoch;
    QString         _rnxScriptName;
+   QString         _sklExt;
+   QString         _sklPath;
    QUrl            _mountPoint;
    QString         _pgmName;

trunk/BNC/src/bncwindow.cpp

@@ -236 +236 @@
   _rnxSkelExtComboBox  = new QComboBox();
   _rnxSkelExtComboBox->setEditable(false);
-  _rnxSkelExtComboBox->addItems(QString("skl, SKL").split(","));
+  _rnxSkelExtComboBox->addItems(QString("skl,SKL").split(","));
   int ik = _rnxSkelExtComboBox->findText(settings.value("rnxSkel").toString());
   if (ik != -1) {

trunk/BNC/src/rinex/rnxobsfile.cpp

@@ -65 +65 @@
   bncSettings settings;
   _writeRinexOnlyWithSklObsTypes = settings.value("rnxOnlyWithSKL").toBool();
-
+  _configuredVersion = settings.value("rnxVersion").toInt();
 }
 
@@ -217 +217 @@
     else if (key == "SYS / # / OBS TYPES") {
       if (_version == 0.0) {
-        _version = defaultRnxObsVersion3;
+        _version = versionFromInt(_configuredVersion);
       }
       QTextStream* in = new QTextStream(value.toLatin1(), QIODevice::ReadOnly);

trunk/BNC/src/rinex/rnxobsfile.h

@@ -79 +79 @@
   QString         _usedSystems;
   double          _version;
+  int             _configuredVersion;
   double          _interval;
   QString         _antennaNumber;