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

Timestamp:

Aug 30, 2012, 12:14:37 PM (12 years ago)

Author:

mervart

Message:

 

Location:

trunk/BNC/src/rinex

Files:

• availplot.cpp (modified) (1 diff)
• reqcanalyze.cpp (modified) (6 diffs)
• reqcanalyze.h (modified) (1 diff)

trunk/BNC/src/rinex/availplot.cpp

@@ -56 +56 @@
     const QString&         prn       = it.key();
     const t_availData&     availData = it.value();
-    const QVector<double>& epochs    = availData._epoL1;
+    const QVector<double>& epochs    = availData._L1ok;
 
     scaleDrawPrn->_yLabels[iC] = prn;

trunk/BNC/src/rinex/reqcanalyze.cpp

@@ -375 +375 @@
   t_allObs& allObs = _allObsMap[prn];
 
-  bncTime currTime;
-  bncTime prevTime;
-
+  // Loop over all Chunks of Data
+  // ----------------------------
   for (int chunkStart = 0; chunkStart + numEpo < allObs._oneObsVec.size();
        chunkStart += chunkStep) {
 
-
-    // Compute Mean
-    // ------------
+    // Chunk-Speicific Variables 
+    // -------------------------
+    bncTime currTime;
+    bncTime prevTime;
     bncTime chunkStartTime;
     bool    availL1  = false;
     bool    availL2  = false;
-    bool    missL1   = false;
-    bool    missL2   = false;
+    bool    gapL1    = false;
+    bool    gapL2    = false;
     bool    slipFlag = false;
     double  meanMP1  = 0.0;
@@ -397 +397 @@
     double  zenDeg   = 0.0;
 
+    // Loop over all Epochs within one Chunk of Data
+    // ---------------------------------------------
     for (int ii = 0; ii < numEpo; ii++) {
       int iEpo = chunkStart + ii;
@@ -433 +435 @@
       // Check Interval
       // --------------
-      double dt = 0.0;
       if (prevTime.valid()) {
-        dt = currTime - prevTime;
-      }
-      if (dt != obsInterval) {
-        missL1 = true;
-        missL2 = true;
+        double dt = currTime - prevTime;
+        if (dt != obsInterval) {
+          gapL1 = true;
+          gapL2 = true;
+        }
       }
       prevTime = currTime;
@@ -449 +450 @@
       }
       else {
-        missL1 = true;
+        gapL1 = true;
       }
       if (oneObs->_hasL2) {
@@ -455 +456 @@
       }
       else {
-        missL2 = true;
+        gapL2 = true;
       }
 
@@ -483 +484 @@
     // Availability Plot Data
     // ----------------------
+    double mjd = chunkStartTime.mjddec();
     if (availL1) {
-      _availDataMap[prn]._epoL1 << chunkStartTime.mjddec();
+      if      (slipFlag) {
+        _availDataMap[prn]._L1slip << mjd;
+      }
+      else if (gapL1) {
+        _availDataMap[prn]._L1gap << mjd;
+      }
+      else {
+        _availDataMap[prn]._L1ok << mjd;
+      }
+    }
+    if (availL2) {
+      if      (slipFlag) {
+        _availDataMap[prn]._L2slip << mjd;
+      }
+      else if (gapL2) {
+        _availDataMap[prn]._L2gap << mjd;
+      }
+      else {
+        _availDataMap[prn]._L2ok << mjd;
+      }
     }
 

trunk/BNC/src/rinex/reqcanalyze.h

@@ -36 +36 @@
 class t_availData {
  public:
-  QVector<double> _epoL1;
+  QVector<double> _L1ok;
+  QVector<double> _L2ok;
+  QVector<double> _L1slip;
+  QVector<double> _L2slip;
+  QVector<double> _L1gap;
+  QVector<double> _L2gap;
 };