Changeset 3971 in ntrip

Timestamp:

Apr 20, 2012, 3:03:42 PM (12 years ago)

Author:

mervart

Message:

 

File:

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

trunk/BNC/rinex/rnxobsfile.cpp

@@ -624 +624 @@
               if (_header._obsTypesV2[i2] == typeV2) {
                 found = true;
-                map<int, int>::const_iterator it2 = _indexMap2to3[sys].find(i2);
-                if (it2 == _indexMap2to3[sys].end()) {
+                if (_indexMap2to3[sys].find(i2) == _indexMap2to3[sys].end()) {
                   _indexMap2to3[sys][i2] = i3;
                 }
@@ -812 +811 @@
 
     const t_rnxSat& rnxSat = epo->rnxSat[iSat];
-
-    for (int iTypeV2 = 0; iTypeV2 < nTypes(rnxSat.satSys); iTypeV2++) {
+    char            sys    = rnxSat.satSys;
+
+    for (int iTypeV2 = 0; iTypeV2 < nTypes(sys); iTypeV2++) {
 
       if (iTypeV2 > 0 && iTypeV2 % 5 == 0) {
@@ -819 +819 @@
       }
 
-      int iType;
+      int iType = -1;
       if   (_trafo == trafoNone) {
         iType = iTypeV2;
       }
       else {
-        iType = _indexMap2to3[rnxSat.satSys][iTypeV2];
-      }
-
-      if (rnxSat.obs[iType] == 0.0) {
+        if (_indexMap2to3[sys].find(iTypeV2) != _indexMap2to3[sys].end()) {
+          iType = _indexMap2to3[sys][iTypeV2];
+        }
+      }
+
+      if (iType == -1 || rnxSat.obs[iType] == 0.0) {
         *_stream << QString().leftJustified(16);
       }
@@ -865 +867 @@
   for (unsigned iSat = 0; iSat < epo->rnxSat.size(); iSat++) {
     const t_rnxSat& rnxSat = epo->rnxSat[iSat];
-    *_stream << rnxSat.satSys 
+    char            sys    = rnxSat.satSys;
+    *_stream << sys 
              << QString("%1").arg(rnxSat.satNum, 2, 10, QChar('0'));
 
-    for (int iTypeV3 = 0; iTypeV3 < nTypes(rnxSat.satSys); iTypeV3++) {
-
-      int iType;
+    for (int iTypeV3 = 0; iTypeV3 < nTypes(sys); iTypeV3++) {
+
+      int iType = -1;
       if   (_trafo == trafoNone) {
         iType = iTypeV3;
       }
       else {
-        iType = _indexMap3to2[rnxSat.satSys][iTypeV3];
-      }
-
-      if (rnxSat.obs[iType] == 0.0) {
+        if (_indexMap3to2[sys].find(iTypeV3) != _indexMap3to2[sys].end()) {
+          iType = _indexMap3to2[sys][iTypeV3];
+        }
+      }
+
+      if (iType == -1 || rnxSat.obs[iType] == 0.0) {
         *_stream << QString().leftJustified(16);
       }