Changeset 9770 in ntrip

Timestamp:

Jun 22, 2022, 3:18:32 PM (3 years ago)

Author:

stuerze

Message:

minor changes to handle RINEX 2,3,4

Location:

trunk/BNC/src

Files:

• bnccore.cpp (modified) (2 diffs)
• rinex/reqcedit.cpp (modified) (1 diff)
• rinex/rnxobsfile.cpp (modified) (5 diffs)
• rinex/rnxobsfile.h (modified) (1 diff)

trunk/BNC/src/bnccore.cpp

@@ -493 +493 @@
                                const QString& strV2, const QString& strV3,
                                const QString& strV4) {
+  QString strVx;
+  if     (_rinexVers == 2) {
+    strVx = strV2;
+  }
+  else if (_rinexVers == 3) {
+    strVx = strV3;
+  }
+  else if (_rinexVers == 4) {
+    strVx = strV4;
+  }
 
   // Output into file
   // ----------------
   if (printFile && stream) {
-    if     (_rinexVers == 2) {
-      *stream << strV2.toLatin1();
-    }
-    else if (_rinexVers == 3) {
-      *stream << strV3.toLatin1();
-    }
-    else if (_rinexVers == 4) {
-      *stream << strV4.toLatin1();
-    }
+    *stream << strVx.toLatin1();
     stream->flush();
   }
@@ -516 +518 @@
       QTcpSocket* sock = is.next();
       if (sock->state() == QAbstractSocket::ConnectedState) {
-        if (sock->write(strV3.toLatin1()) == -1) {
+        if (sock->write(strVx.toLatin1()) == -1) {
           delete sock;
           is.remove();

trunk/BNC/src/rinex/reqcedit.cpp

@@ -66 +66 @@
     _rnxVersion = defaultRnxObsVersion2;
   }
-  if (version == 3) {
+  else if (version == 3) {
     _rnxVersion = defaultRnxObsVersion3;
   }
-  if (version == 4) {
+  else if (version == 4) {
     _rnxVersion = defaultRnxObsVersion4;
   }

trunk/BNC/src/rinex/rnxobsfile.cpp

@@ -65 +65 @@
   bncSettings settings;
   _writeRinexOnlyWithSklObsTypes = settings.value("rnxOnlyWithSKL").toBool();
+
 }
 
@@ -71 +72 @@
 t_rnxObsHeader::~t_rnxObsHeader() {
 }
+
+double t_rnxObsHeader::versionFromInt(int version) {
+  switch (version) {
+    case 2:
+      return defaultRnxObsVersion2;
+    case 3:
+      return defaultRnxObsVersion3;
+    case 4:
+      return defaultRnxObsVersion4;
+    default:
+      return defaultRnxObsVersion3;
+  }
+}
+
 
 // Read Header
@@ -175 +190 @@
     else if (key == "# / TYPES OF OBSERV") {
       if (_version == 0.0) {
-        _version = defaultRnxObsVersion3;
+        _version = defaultRnxObsVersion2;
       }
       QTextStream* in = new QTextStream(value.toLatin1(), QIODevice::ReadOnly);
@@ -199 +214 @@
     else if (key == "SYS / # / OBS TYPES") {
       if (_version == 0.0) {
-        _version = defaultRnxObsVersion3;
+        bncSettings settings;
+        _version = versionFromInt(settings.value("rnxVersion").toInt());
       }
       QTextStream* in = new QTextStream(value.toLatin1(), QIODevice::ReadOnly);
@@ -315 +331 @@
   _markerName = markerName;
 
-  if (version == 2) {
-    _version = defaultRnxObsVersion2;
-  }
-  else if (version == 3) {
-    _version = defaultRnxObsVersion3;
-  }
-  else if (version == 4) {
-    _version = defaultRnxObsVersion4;
-  }
+  _version = versionFromInt(version);
 
   _comments << "Default set of observation types used";

trunk/BNC/src/rinex/rnxobsfile.h

@@ -52 +52 @@
 
   double      version() const {return _version;}
+  double      versionFromInt(int version);
   t_irc       read(QTextStream* stream, int maxLines = 0);
   void        setDefault(const QString& markerName, int version);