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

Timestamp:

Oct 11, 2014, 2:11:14 PM (10 years ago)

Author:

mervart

Message:

 

Location:

trunk/BNC/src/rinex

Files:

• reqcedit.cpp (modified) (1 diff)
• rnxobsfile.cpp (modified) (2 diffs)

trunk/BNC/src/rinex/reqcedit.cpp

@@ -254 +254 @@
     }
     if (ii == 0) {
-      outObsFile.setHeader(obsFile->header(), _rnxVersion, useObsTypes);
+      outObsFile.setHeader(obsFile->header(), _rnxVersion, &useObsTypes);
       if (_begTime.valid() && _begTime > outObsFile.startTime()) {
         outObsFile.setStartTime(_begTime);

trunk/BNC/src/rinex/rnxobsfile.cpp

@@ -159 +159 @@
     }
     else if (key == "# / TYPES OF OBSERV") {
+      if (_version == 0.0) {
+        _version = t_rnxObsHeader::defaultRnxObsVersion2;
+      }
       QTextStream* in = new QTextStream(value.toAscii(), QIODevice::ReadOnly);
       int nTypes;
@@ -180 +183 @@
     }
     else if (key == "SYS / # / OBS TYPES") {
+      if (_version == 0.0) {
+        _version = t_rnxObsHeader::defaultRnxObsVersion2;
+      }
       QTextStream* in = new QTextStream(value.toAscii(), QIODevice::ReadOnly);
       char sys;