Changeset 4701 in ntrip for trunk/BNC/src/rinex

Timestamp:

Sep 9, 2012, 6:40:12 PM (12 years ago)

Author:

mervart

Message:

 

Location:

trunk/BNC/src/rinex

Files:

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

trunk/BNC/src/rinex/reqcanalyze.cpp

@@ -208 +208 @@
     *_log << "\nAnalyze File\n"
           <<   "------------\n"
-          << "File:        " << obsFile->fileName().toAscii().data() << endl;
+          << "File:            " << obsFile->fileName().toAscii().data() << endl;
   }
 
@@ -255 +255 @@
           }
           if (newObs->_slipL1 && newObs->_slipL2) {
-            _obsStat._prnStat[prn]._numSlips += 1;
+            _obsStat._prnStat[prn]._numSlipsFlagged += 1;
           }
         }
@@ -570 +570 @@
         slipL1 = true;
         slipL2 = true;
-        _obsStat._prnStat[prn]._numSlips += 1;
+        _obsStat._prnStat[prn]._numSlipsFound += 1;
       } 
       else {
@@ -717 +717 @@
   }
 
-  *_log << "Marker name: " << _obsStat._markerName   << endl 
-        << "Receiver:    " << _obsStat._receiverType << endl
-        << "Antenna:     " << _obsStat._antennaName  << endl
-        << "Start time:  " << _obsStat._startTime.datestr().c_str() << ' '
-                           << _obsStat._startTime.timestr().c_str() << endl
-        << "End time:    " << _obsStat._endTime.datestr().c_str() << ' '
-                           << _obsStat._endTime.timestr().c_str() << endl
-        << "Interval:    " << _obsStat._interval << endl
-        << "# Sat.:      " << _obsStat._prnStat.size() << endl;
-
-  int numObs   = 0;
-  int numSlips = 0;
+  *_log << "Marker name:     " << _obsStat._markerName   << endl 
+        << "Receiver:        " << _obsStat._receiverType << endl
+        << "Antenna:         " << _obsStat._antennaName  << endl
+        << "Start time:      " << _obsStat._startTime.datestr().c_str() << ' '
+                               << _obsStat._startTime.timestr().c_str() << endl
+        << "End time:        " << _obsStat._endTime.datestr().c_str() << ' '
+                               << _obsStat._endTime.timestr().c_str() << endl
+        << "Interval:        " << _obsStat._interval << endl
+        << "# Sat.:          " << _obsStat._prnStat.size() << endl;
+
+  int numObs          = 0;
+  int numSlipsFlagged = 0;
+  int numSlipsFound   = 0;
   QMapIterator<QString, t_prnStat> it(_obsStat._prnStat);
   while (it.hasNext()) {
     it.next();
     const t_prnStat& prnStat = it.value();
-    numObs   += prnStat._numObs;
-    numSlips += prnStat._numSlips;
-  }
-  *_log << "# Obs.:      " << numObs   << endl
-        << "# Slips:     " << numSlips << endl;
+    numObs          += prnStat._numObs;
+    numSlipsFlagged += prnStat._numSlipsFlagged;
+    numSlipsFound   += prnStat._numSlipsFound;
+  }
+  *_log << "# Obs.:          " << numObs          << endl
+        << "# Slips (file):  " << numSlipsFlagged << endl
+        << "# Slips (found): " << numSlipsFound   << endl;
 
   for (int kk = 1; kk <= 4; kk++) {
@@ -744 +747 @@
     if      (kk == 1) {
       data = dataMP1;
-      text = "Mean MP1:    ";
+      text = "Mean MP1:        ";
     }
     else if (kk == 2) {
       data = dataMP2;
-      text = "Mean MP2:    ";
+      text = "Mean MP2:        ";
     }
     else if (kk == 3) {
       data = dataSNR1;
-      text = "Mean SNR1:   ";
+      text = "Mean SNR1:       ";
     }
     else if (kk == 4) {
       data = dataSNR2;
-      text = "Mean SNR2:   ";
+      text = "Mean SNR2:       ";
     }
     double mean = 0.0;

trunk/BNC/src/rinex/reqcanalyze.h

@@ -49 +49 @@
  public:
   t_prnStat() {
-    _numObs   = 0;
-    _numSlips = 0;
-    _numGaps  = 0;
+    _numObs          = 0;
+    _numSlipsFlagged = 0;
+    _numSlipsFound   = 0;
+    _numGaps         = 0;
   }
   int _numObs;
-  int _numSlips;
+  int _numSlipsFlagged;
+  int _numSlipsFound;
   int _numGaps;
 };