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

Timestamp:

Oct 16, 2014, 11:09:35 AM (10 years ago)

Author:

mervart

Message:

 

File:

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

trunk/BNC/src/rinex/rnxobsfile.cpp

@@ -52 +52 @@
 ////////////////////////////////////////////////////////////////////////////
 t_rnxObsHeader::t_rnxObsHeader() {
-  _defaultSystems = "GRES";
+  _usedSystems = "GRES";
   _antNEU.ReSize(3); _antNEU = 0.0;
   _antXYZ.ReSize(3); _antXYZ = 0.0;
@@ -165 +165 @@
       int nTypes;
       *in >> nTypes;
-      char sys0 = _defaultSystems[0].toAscii();
+      char sys0 = _usedSystems[0].toAscii();
       _obsTypes[sys0].clear();
       for (int ii = 0; ii < nTypes; ii++) {
@@ -177 +177 @@
         _obsTypes[sys0].append(hlp);
       }
-      for (int ii = 1; ii < _defaultSystems.length(); ii++) {
-        char sysI = _defaultSystems[ii].toAscii();
+      for (int ii = 1; ii < _usedSystems.length(); ii++) {
+        char sysI = _usedSystems[ii].toAscii();
         _obsTypes[sysI] = _obsTypes[sys0];
       }
@@ -213 +213 @@
       break;
     }
+  }
+
+  // Systems used
+  // ------------
+  _usedSystems.clear();
+  QMapIterator<char, QStringList> it(_obsTypes);
+  while (it.hasNext()) {
+    it.next();
+    _usedSystems += QChar(it.key());
   }
 
@@ -294 +303 @@
   _startTime       = header._startTime;   
   _comments        = header._comments;
+  _usedSystems     = header._usedSystems;
   for (unsigned iPrn = 1; iPrn <= t_prn::MAXPRN_GPS; iPrn++) {
     _wlFactorsL1[iPrn] =  header._wlFactorsL1[iPrn]; 
@@ -327 +337 @@
       }
       else {
-        for (int iSys = 0; iSys < t_rnxObsHeader::_defaultSystems.length(); iSys++) {
-          char sys = t_rnxObsHeader::_defaultSystems[iSys].toAscii();
+        for (int iSys = 0; iSys < _usedSystems.length(); iSys++) {
+          char sys = _usedSystems[iSys].toAscii();
           _obsTypes[sys].push_back(useObsTypes->at(iType));
         }
       }
     }
-    _defaultSystems.clear();
+    _usedSystems.clear();
     QMapIterator<char, QStringList> it(_obsTypes);
     while (it.hasNext()) {
       it.next();
-      _defaultSystems += QChar(it.key());
+      _usedSystems += QChar(it.key());
     }
   }
@@ -527 +537 @@
 
   if (_version < 3.0) {
-    char sys0 = _defaultSystems[0].toAscii();
+    char sys0 = _usedSystems[0].toAscii();
     QString hlp;
     QTextStream(&hlp) << QString("%1").arg(_obsTypes[sys0].size(), 6);