Changeset 9760 in ntrip for trunk/BNC/src/rinex

Timestamp:

Jun 9, 2022, 5:10:10 PM (23 months ago)

Author:

stuerze

Message:

initial changes to consider RINEX Version 4 in future

Location:

trunk/BNC/src/rinex

Files:

• rnxnavfile.h (modified) (1 diff)
• rnxobsfile.cpp (modified) (4 diffs)
• rnxobsfile.h (modified) (5 diffs)

trunk/BNC/src/rinex/rnxnavfile.h

@@ -38 +38 @@
 #define defaultRnxNavVersion2 2.11
 #define defaultRnxNavVersion3 3.05
+#define defaultRnxNavVersion4 4.00
 
 class t_rnxNavFile {

trunk/BNC/src/rinex/rnxobsfile.cpp

@@ -164 +164 @@
       in >> _antBSG[0] >> _antBSG[1] >> _antBSG[2];
     }
+    else if (key == "DOI") {
+      _digitalObjectId = line.mid(0,60).trimmed();
+    }
+    else if (key == "LICENSE OF USE") {
+      _licenseOfUse.append(line.mid(0,60).trimmed());
+    }
+    else if (key == "STATION INFORMATION") {
+     _stationInformation.append(line.mid(0,60).trimmed());
+    }
     else if (key == "# / TYPES OF OBSERV") {
       if (_version == 0.0) {
-        _version = defaultRnxObsVersion2;
+        _version = defaultRnxObsVersion3;
       }
       QTextStream* in = new QTextStream(value.toLatin1(), QIODevice::ReadOnly);
@@ -306 +315 @@
   _markerName = markerName;
 
-  if (version <= 2) {
+  if (version == 2) {
     _version = defaultRnxObsVersion2;
   }
-  else {
+  else if (version == 3) {
     _version = defaultRnxObsVersion3;
+  }
+  else if (version == 4) {
+    _version = defaultRnxObsVersion4;
   }
 
@@ -389 +401 @@
                          const QStringList* gloSlots) {
 
-  if (version <= 2) {
+  if (version == 2) {
     _version = defaultRnxObsVersion2;
   }
-  else {
+  else if (version == 3) {
     _version = defaultRnxObsVersion3;
+  }
+  else if (version == 4) {
+    _version = defaultRnxObsVersion4;
   }
   _interval        = header._interval;
@@ -914 +929 @@
       return t_rnxObsFile::type3to2(sys, origType);
     }
-    else if (int(version) == 3) {
+    else {
       return t_rnxObsFile::type2to3(sys, origType);
     }

trunk/BNC/src/rinex/rnxobsfile.h

@@ -40 +40 @@
 #define defaultRnxObsVersion2 2.11
 #define defaultRnxObsVersion3 3.05
+#define defaultRnxObsVersion4 4.00
 
 class t_rnxObsHeader {
@@ -80 +81 @@
   QString         _markerName;
   QString         _markerNumber;
+
   QString         _markerType;
   QString         _observer;
@@ -86 +88 @@
   QString         _receiverType;
   QString         _receiverVersion;
+  QString         _digitalObjectId;
+  QStringList     _licenseOfUse;
+  QStringList     _stationInformation;
   QStringList     _comments;
   ColumnVector    _antNEU;
@@ -162 +167 @@
   const QString& receiverType() const {return _header._receiverType;}
   const QString& receiverNumber() const {return _header._receiverNumber;}
+  const QString& digitalObjectId() const {return _header._digitalObjectId;}
+  const QStringList licenseOfUse() const {return _header._licenseOfUse;}
+  const QStringList stationInformation() const {return _header._stationInformation;}
 
   void setInterval(double interval) {_header._interval = interval;}
@@ -173 +181 @@
   void setReceiverType(const QString& receiverType) {_header._receiverType = receiverType;}
   void setReceiverNumber(const QString& receiverNumber) {_header._receiverNumber = receiverNumber;}
+
+  void setDigitalObjectId(const QString& digitalObjectId) {_header._digitalObjectId = digitalObjectId;}
+  void setLicenseOfUse(const QString& licenseOfUse) {_header._licenseOfUse.append(licenseOfUse);}
+  void setStationInformation(const QString& stationInformation) {_header._stationInformation.append(stationInformation);}
 
   const ColumnVector& xyz() const {return _header._xyz;}