Changeset 6250 in ntrip for trunk

Timestamp:

Oct 20, 2014, 12:54:31 PM (10 years ago)

Author:

mervart

Message:

 

File:

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

trunk/BNC/src/rinex/rnxobsfile.cpp

@@ -317 +317 @@
     }
     else {
-      for (int iSys = 0; iSys < header.numSys(); iSys++) {
-        char sys = header.system(iSys);
-        for (int iType = 0; iType < header.nTypes(sys); iType++) {
-          QString type = header.obsType(sys, iType, _version);
-          if (_version >= 3.0) {
-            _obsTypes[sys].push_back(type);
+      if (_version >= 3.0) {
+        for (int iSys = 0; iSys < header.numSys(); iSys++) {
+          char sys = header.system(iSys);
+          for (int iType = 0; iType < header.nTypes(sys); iType++) {
+            QString type = header.obsType(sys, iType, _version);
+            if (!_obsTypes[sys].contains(type)) {
+              _obsTypes[sys].push_back(type);
+            }
           }
-          else {
+        }
+      }
+      else {
+        for (int iSys = 0; iSys < header.numSys(); iSys++) {
+          char sys = header.system(iSys);
+          for (int iType = 0; iType < header.nTypes(sys); iType++) {
+            QString type = header.obsType(sys, iType, _version);
             for (int jSys = 0; jSys < _usedSystems.length(); jSys++) {
               char thisSys  = _usedSystems[jSys].toAscii();
@@ -333 +341 @@
           }
         }
-        _obsTypes[sys].removeDuplicates();
       }
     }