Changeset 11200 in ntrip for trunk/BNC/src/rinex/rnxobsfile.cpp

Timestamp:

Nov 11, 2026, 11:17:08 AM (less than one hour ago)

Author:

stuerze

Message:

RINEX concatenation checked and improved

File:

• trunk/BNC/src/rinex/rnxobsfile.cpp (modified) (2 diffs)

trunk/BNC/src/rinex/rnxobsfile.cpp

@@ -701 +701 @@
 }
 
+// Station records of the header (marker, observer, receiver, antenna,
+// position), also used for the header changes between concatenated files
+////////////////////////////////////////////////////////////////////////////
+QStringList t_rnxObsHeader::stationRecords(double version) const {
+  if (version == 0.0) {
+    version = _version;
+  }
+  QStringList records;
+  // RINEX 3/4: MARKER NAME A60, RINEX 2: 4-character station ID
+  QString markerName = _markerName;
+  if (version < 3.0) {
+    markerName = _markerName.left(4);
+  }
+  records << QString("%1")
+    .arg(markerName, -60)
+    .leftJustified(60)
+           + "MARKER NAME";
+
+
+  if (!_markerNumber.isEmpty()) {
+    records << QString("%1")
+      .arg(_markerNumber, -20)
+      .leftJustified(60)
+             + "MARKER NUMBER";
+  }
+
+  if (version >= 3.0) {
+    records << QString("%1")
+      .arg(_markerType, -60)
+      .leftJustified(60)
+             + "MARKER TYPE";
+  }
+
+  records << QString("%1%2")
+    .arg(_observer, -20)
+    .arg(_agency,   -40)
+    .leftJustified(60)
+           + "OBSERVER / AGENCY";
+
+  records << QString("%1%2%3")
+    .arg(_receiverNumber,  -20)
+    .arg(_receiverType,    -20)
+    .arg(_receiverVersion, -20)
+    .leftJustified(60)
+           + "REC # / TYPE / VERS";
+
+  records << QString("%1%2")
+    .arg(_antennaNumber, -20)
+    .arg(_antennaName,   -20)
+    .leftJustified(60)
+           + "ANT # / TYPE";
+
+  records << QString("%1%2%3")
+    .arg(_xyz(1), 14, 'f', 4)
+    .arg(_xyz(2), 14, 'f', 4)
+    .arg(_xyz(3), 14, 'f', 4)
+    .leftJustified(60)
+           + "APPROX POSITION XYZ";
+
+  records << QString("%1%2%3")
+    .arg(_antNEU(3), 14, 'f', 4)
+    .arg(_antNEU(2), 14, 'f', 4)
+    .arg(_antNEU(1), 14, 'f', 4)
+    .leftJustified(60)
+           + "ANTENNA: DELTA H/E/N";
+
+  if (_rcvClkOffsAppl >= 0) {
+    records << QString("%1")
+      .arg(_rcvClkOffsAppl, 6)
+      .leftJustified(60)
+             + "RCV CLOCK OFFS APPL";
+  }
+  return records;
+}
+
 // Write Header
 ////////////////////////////////////////////////////////////////////////////
@@ -764 +839 @@
     *stream << itCmnt.next().trimmed().left(60).leftJustified(60) << "COMMENT\n";
   }
-  QString markerName = _markerName.left(9);
-  if (_version < 3.0) {
-    markerName = _markerName.left(4);
-  }
-  *stream << QString("%1")
-    .arg(markerName, -60)
-    .leftJustified(60)
-           << "MARKER NAME\n";
-
-
-  if (!_markerNumber.isEmpty()) {
-    *stream << QString("%1")
-      .arg(_markerNumber, -20)
-      .leftJustified(60)
-             << "MARKER NUMBER\n";
-  }
-
-  if (_version >= 3.0) {
-    *stream << QString("%1")
-      .arg(_markerType, -60)
-      .leftJustified(60)
-             << "MARKER TYPE\n";
-  }
-
-  *stream << QString("%1%2")
-    .arg(_observer, -20)
-    .arg(_agency,   -40)
-    .leftJustified(60)
-           << "OBSERVER / AGENCY\n";
-
-  *stream << QString("%1%2%3")
-    .arg(_receiverNumber,  -20)
-    .arg(_receiverType,    -20)
-    .arg(_receiverVersion, -20)
-    .leftJustified(60)
-           << "REC # / TYPE / VERS\n";
-
-  *stream << QString("%1%2")
-    .arg(_antennaNumber, -20)
-    .arg(_antennaName,   -20)
-    .leftJustified(60)
-           << "ANT # / TYPE\n";
-
-  *stream << QString("%1%2%3")
-    .arg(_xyz(1), 14, 'f', 4)
-    .arg(_xyz(2), 14, 'f', 4)
-    .arg(_xyz(3), 14, 'f', 4)
-    .leftJustified(60)
-           << "APPROX POSITION XYZ\n";
-
-  *stream << QString("%1%2%3")
-    .arg(_antNEU(3), 14, 'f', 4)
-    .arg(_antNEU(2), 14, 'f', 4)
-    .arg(_antNEU(1), 14, 'f', 4)
-    .leftJustified(60)
-           << "ANTENNA: DELTA H/E/N\n";
-
-  if (_rcvClkOffsAppl >= 0) {
-    *stream << QString("%1")
-      .arg(_rcvClkOffsAppl, 6)
-      .leftJustified(60)
-             << "RCV CLOCK OFFS APPL\n";
-  }
+  *stream << stationRecords().join("\n") << "\n";
 
   if (_version < 3.0) {