Changeset 4675 in ntrip for trunk

Timestamp:

Sep 9, 2012, 10:48:39 AM (12 years ago)

Author:

mervart

Message:

 

Location:

trunk/BNC/src/rinex

Files:

• dopplot.cpp (modified) (4 diffs)
• dopplot.h (modified) (1 diff)
• reqcanalyze.cpp (modified) (10 diffs)
• reqcanalyze.h (modified) (1 diff)

trunk/BNC/src/rinex/dopplot.cpp

@@ -70 +70 @@
   setAxisLabelRotation(QwtPlot::xBottom, -10.0);
   setAxisLabelAlignment(QwtPlot::xBottom, Qt::AlignLeft | Qt::AlignBottom);
-  setAxisScale(QwtPlot::yLeft, 0.0, 90.0);
 
   // Legend
@@ -79 +78 @@
   // Curves
   // ------
+  if (obsStat) {
+    addCurve("# Sat", obsStat->_mjdX24, obsStat->_numSat);
+  }
   
   // Important !!!
@@ -88 +90 @@
 //////////////////////////////////////////////////////////////////////////////
 QwtPlotCurve* t_dopPlot::addCurve(const QString& name, 
-                                    const QwtSymbol& symbol,
-                                    const QVector<double>& xData,
-                                    const QVector<double>& yData) {
+                                  const QVector<double>& xData,
+                                  const QVector<double>& yData) {
+
   QwtPlotCurve* curve = new QwtPlotCurve(name);
-  curve->setSymbol(new QwtSymbol(symbol));
-  curve->setStyle(QwtPlotCurve::NoCurve);
   curve->setXAxis(QwtPlot::xBottom);
   curve->setYAxis(QwtPlot::yLeft);
@@ -99 +99 @@
   curve->attach(this);
 
-  if (xData.size() > 0 && yData.size() > 0) {
-    QwtPlotMarker* marker = new QwtPlotMarker();
-    int ii = xData.size() / 2;
-    marker->setValue(xData[ii], yData[ii]);
-    QwtText text(name);
-    text.setColor(symbol.pen().color());
-    marker->setLabel(text);
-    marker->setLabelAlignment(Qt::AlignTop);
-    marker->attach(this);
-  }
-
   return curve;
 }

trunk/BNC/src/rinex/dopplot.h

@@ -16 +16 @@
 
 private:
-  QwtPlotCurve* addCurve(const QString& name, const QwtSymbol& symbol,
+  QwtPlotCurve* addCurve(const QString& name,
                          const QVector<double>& xData, 
                          const QVector<double>& yData);

trunk/BNC/src/rinex/reqcanalyze.cpp

@@ -221 +221 @@
   // --------------------
   try {
+    unsigned iEpo = 0;
     while ( (_currEpo = obsFile->nextEpoch()) != 0) {
   
@@ -238 +239 @@
   
         _allObsMap[prn].addObs(obs);
+
+        prepareObsStat(iEpo, obsFile->interval());
       }
   
@@ -260 +263 @@
 
   QMutableMapIterator<QString, t_allObs> it(_allObsMap);
-  bool firstPrn = true;
   while (it.hasNext()) {
     it.next();
     QString    prn     = it.key();
     preparePlotData(prn, xyz, obsFile->interval(), 
-                    dataMP1, dataMP2, dataSNR1, dataSNR2, firstPrn);
-    firstPrn = false;
+                    dataMP1, dataMP2, dataSNR1, dataSNR2);
   }
 
@@ -379 +380 @@
 //  
 ////////////////////////////////////////////////////////////////////////////
+void t_reqcAnalyze::prepareObsStat(unsigned iEpo, double obsInterval) {
+  const int numEpo = int(600.0 / obsInterval); // # epochs in one chunk (10 min)
+  if (iEpo % numEpo == 0) {
+    _obsStat._mjdX24 << _currEpo->tt.mjddec() * 24.0;
+    _obsStat._numSat << _currEpo->rnxSat.size();
+  }
+}
+
+//  
+////////////////////////////////////////////////////////////////////////////
 void t_reqcAnalyze::preparePlotData(const QString& prn, const ColumnVector& xyz,
                                     double obsInterval,
@@ -384 +395 @@
                                     QVector<t_polarPoint*>* dataMP2,
                                     QVector<t_polarPoint*>* dataSNR1, 
-                                    QVector<t_polarPoint*>* dataSNR2,
-                                    bool firstPrn) {
+                                    QVector<t_polarPoint*>* dataSNR2) {
 
   const int chunkStep = int( 30.0 / obsInterval); // chunk step (30 sec)  
@@ -391 +401 @@
 
   t_allObs& allObs = _allObsMap[prn];
-
-  if (firstPrn) {
-    _obsStat.reset();
-  }
 
   // Loop over all Chunks of Data
@@ -401 +407 @@
        chunkStart += chunkStep) {
 
-    // Chunk-Speicific Variables 
-    // -------------------------
+    // Chunk-Specific Variables 
+    // ------------------------
     bncTime currTime;
     bncTime prevTime;
     bncTime chunkStartTime;
+    double  mjdX24  = 0.0;
     bool    availL1 = false;
     bool    availL2 = false;
@@ -433 +440 @@
       if (ii == 0) {
         chunkStartTime = currTime;
+        mjdX24 = chunkStartTime.mjddec() * 24.0;
 
         if (xyz.size()) {
@@ -457 +465 @@
         }
       }
-
+ 
       // Check Interval
       // --------------
@@ -518 +526 @@
     // Availability Plot Data
     // ----------------------
-    double mjdX24 = chunkStartTime.mjddec() * 24.0;
     if (availL1) {
       if      (slipL1) {

trunk/BNC/src/rinex/reqcanalyze.h

@@ -138 +138 @@
                        QVector<t_polarPoint*>* dataMP2,
                        QVector<t_polarPoint*>* dataSNR1, 
-                       QVector<t_polarPoint*>* dataSNR2, bool firstPrn);
+                       QVector<t_polarPoint*>* dataSNR2);
+  void prepareObsStat(unsigned iEpo, double obsInterval);
 
   QString                    _logFileName;