Changeset 6308 in ntrip

Timestamp:

Nov 7, 2014, 11:41:43 AM (9 years ago)

Author:

mervart

Message:

 

File:

• trunk/BNC/src/rinex/reqcanalyze.cpp (modified) (3 diffs)

trunk/BNC/src/rinex/reqcanalyze.cpp

@@ -783 +783 @@
     QString prefixSys = QString("  ") + sys + QString(": ");
     *_log << prefixSys << "Number of Satellites  : " << qcSatVec.size() << endl; 
-    int numObs           = 0;
-    int numSlipsFlagged  = 0;
-    int numSlipsFound    = 0;
-    int numGaps          = 0;
     QMap<QString, QVector<const t_qcFrqSum*> > frqMap; 
     for (int ii = 0; ii < qcSatVec.size(); ii++) {
@@ -796 +792 @@
         const t_qcFrqSum& qcFrqSum = itFrq.value();
         frqMap[frqType].push_back(&qcFrqSum);
-        numObs          += qcFrqSum._numObs         ;
-        numSlipsFlagged += qcFrqSum._numSlipsFlagged;
-        numSlipsFound   += qcFrqSum._numSlipsFound  ;
-        numGaps         += qcFrqSum._numGaps        ;
-      }
-    }
-    *_log << prefixSys << "Observations          : " << numObs << endl
-          << prefixSys << "Slips (file+found)    : " << numSlipsFlagged << " + " << numSlipsFound << endl
-          << prefixSys << "Gaps                  : " << numGaps << endl
-          << prefixSys << "Tracking Modes        : " << frqMap.size() << endl;
+      }
+    }
+    *_log << prefixSys << "Tracking Modes        : " << frqMap.size() << "   ";
     QMapIterator<QString, QVector<const t_qcFrqSum*> > itFrq(frqMap); 
+    while (itFrq.hasNext()) {
+      itFrq.next();
+      const QString& frqType = itFrq.key();
+      *_log << ' ' << frqType;
+    }
+    *_log << endl;
+    itFrq.toFront();
     while (itFrq.hasNext()) {
       itFrq.next();
@@ -812 +808 @@
       const QVector<const t_qcFrqSum*> qcFrqVec = itFrq.value();
       QString prefixFrq = QString("  ") + frqType + QString(": ");
-      *_log << prefixSys << prefixFrq << endl;
+
+      int numObs           = 0;
+      int numSlipsFlagged  = 0;
+      int numSlipsFound    = 0;
+      int numGaps          = 0;
+      for (int ii = 0; ii < qcFrqVec.size(); ii++) {
+        const t_qcFrqSum* qcFrqSum = qcFrqVec[ii];
+        numObs          += qcFrqSum->_numObs         ;
+        numSlipsFlagged += qcFrqSum->_numSlipsFlagged;
+        numSlipsFound   += qcFrqSum->_numSlipsFound  ;
+        numGaps         += qcFrqSum->_numGaps        ;
+      }
+      *_log << prefixSys << prefixFrq << "Observations          : " << numObs << endl
+            << prefixSys << prefixFrq << "Slips (file+found)    : " << numSlipsFlagged << " + " << numSlipsFound << endl
+            << prefixSys << prefixFrq << "Gaps                  : " << numGaps << endl;
     }
   }