Changeset 6244 in ntrip

Timestamp:

Oct 16, 2014, 11:04:37 AM (10 years ago)

Author:

mervart

Message:

 

Location:

trunk/BNC/src/rinex

Files:

• rnxobsfile.cpp (modified) (5 diffs)
• rnxobsfile.h (modified) (1 diff)

trunk/BNC/src/rinex/rnxobsfile.cpp

@@ -49 +49 @@
 using namespace std;
 
-const QString t_rnxObsHeader::defaultSystems = "GRES";
-
 // Constructor
 ////////////////////////////////////////////////////////////////////////////
 t_rnxObsHeader::t_rnxObsHeader() {
+  _defaultSystems = "GRES";
   _antNEU.ReSize(3); _antNEU = 0.0;
   _antXYZ.ReSize(3); _antXYZ = 0.0;
@@ -166 +165 @@
       int nTypes;
       *in >> nTypes;
-      char sys0 = defaultSystems[0].toAscii();
+      char sys0 = _defaultSystems[0].toAscii();
       _obsTypes[sys0].clear();
       for (int ii = 0; ii < nTypes; ii++) {
@@ -178 +177 @@
         _obsTypes[sys0].append(hlp);
       }
-      for (int ii = 1; ii < defaultSystems.length(); ii++) {
-        char sysI = defaultSystems[ii].toAscii();
+      for (int ii = 1; ii < _defaultSystems.length(); ii++) {
+        char sysI = _defaultSystems[ii].toAscii();
         _obsTypes[sysI] = _obsTypes[sys0];
       }
@@ -328 +327 @@
       }
       else {
-        for (int iSys = 0; iSys < t_rnxObsHeader::defaultSystems.length(); iSys++) {
-          char sys = t_rnxObsHeader::defaultSystems[iSys].toAscii();
+        for (int iSys = 0; iSys < t_rnxObsHeader::_defaultSystems.length(); iSys++) {
+          char sys = t_rnxObsHeader::_defaultSystems[iSys].toAscii();
           _obsTypes[sys].push_back(useObsTypes->at(iType));
         }
       }
+    }
+    _defaultSystems.clear();
+    QMapIterator<char, QStringList> it(_obsTypes);
+    while (it.hasNext()) {
+      it.next();
+      _defaultSystems += QChar(it.key());
     }
   }
@@ -522 +527 @@
 
   if (_version < 3.0) {
-    char sys0 = defaultSystems[0].toAscii();
+    char sys0 = _defaultSystems[0].toAscii();
     QString hlp;
     QTextStream(&hlp) << QString("%1").arg(_obsTypes[sys0].size(), 6);

trunk/BNC/src/rinex/rnxobsfile.h

@@ -64 +64 @@
  private:
   QStringList obsTypesStrings() const;
+  QString                 _defaultSystems;
   double                  _version;
   double                  _interval;