Changeset 4501 in ntrip for trunk/BNC

Timestamp:

Aug 12, 2012, 12:06:59 PM (12 years ago)

Author:

mervart

Message:

 

Location:

trunk/BNC/src

Files:

• bncrinex.cpp (modified) (4 diffs)
• bncrinex.h (modified) (1 diff)

trunk/BNC/src/bncrinex.cpp

@@ -177 +177 @@
 // Read Skeleton Header File
 ////////////////////////////////////////////////////////////////////////////
-void bncRinex::readSkeleton() {
+void bncRinex::readSkeleton(bool& obsTypesFound) {
 
   // Read the local file
@@ -206 +206 @@
   }
 
+  obsTypesFound = true;
+
   // Default RINEX v2 Types
   // -------------------------
   if (_header._obsTypesV2.size() == 0) {
+    if (_header._version < 3.0) {
+      obsTypesFound = false;
+    }
     _header._obsTypesV2 << "C1" << "P1" << "L1" << "S1" 
                         << "C2" << "P2" << "L2" << "S2";
@@ -216 +221 @@
   // -------------------------
   if (_header._obsTypesV3.size() == 0) {
+    if (_header._version >= 3.0) {
+      obsTypesFound = false;
+    }
     _header._obsTypesV3['G'] << "C1C" << "L1C" << "D1C" << "S1C" 
                              << "C1P" << "L1P" << "D1P" << "S1P" 
@@ -383 +391 @@
   // Copy Skeleton Header
   // --------------------
-  readSkeleton();
+  bool obsTypesFound;
+  readSkeleton(obsTypesFound);
   if (_header._markerName.isEmpty()) {
     _header._markerName = _statID;

trunk/BNC/src/bncrinex.h

@@ -55 +55 @@
    static std::string obsToStr(double val, int width = 14, int precision = 3);
    void resolveFileName(const QDateTime& datTim);
-   void readSkeleton();
+   void readSkeleton(bool& obsTypesFound);
    void writeHeader(const QByteArray& format, const QDateTime& datTimNom);
    void closeFile();