Changeset 6273 in ntrip for trunk

Timestamp:

Oct 31, 2014, 6:21:52 PM (9 years ago)

Author:

mervart

Message:

 

Location:

trunk/BNC/src/rinex

Files:

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

trunk/BNC/src/rinex/dopplot.cpp

@@ -61 +61 @@
 // Constructor
 //////////////////////////////////////////////////////////////////////////////
-t_dopPlot::t_dopPlot(QWidget* parent, t_obsStat* obsStat) 
+t_dopPlot::t_dopPlot(QWidget* parent, const QMap<t_prn, t_plotData>& plotDataMap) 
 : QwtPlot(parent) {
 
@@ -90 +90 @@
   setAxisTitle(QwtPlot::yLeft,  textNumSat);
   double maxNumSat = 20.0;
-  if (obsStat) {
-    for (int ii = 0; ii < obsStat->_numSat.size(); ii++) {
-      if (maxNumSat < obsStat->_numSat[ii]) {
-        maxNumSat = obsStat->_numSat[ii] + 5;
-      } 
+  if (plotDataMap.size() > 0) {
+    QMapIterator<t_prn, t_plotData> it(plotDataMap);
+    while (it.hasNext()) {
+      it.next();
+      const t_plotData& plotData = it.value();
+      for (int ii = 0; ii < plotData._numSat.size(); ii++) {
+        if (maxNumSat < plotData._numSat[ii]) {
+          maxNumSat = plotData._numSat[ii] + 5;
+        } 
+      }
     }
   }
@@ -106 +111 @@
   // Curves
   // ------
-  if (obsStat) {
+  if (plotDataMap.size() > 0) {
+    QMapIterator<t_prn, t_plotData> it(plotDataMap);
+    while (it.hasNext()) {
+      it.next();
+      const t_plotData& plotData = it.value();
 
-    QwtPlotCurve* curveNumSat = new QwtPlotCurve(textNumSat);
-    curveNumSat->setXAxis(QwtPlot::xBottom);
-    curveNumSat->setYAxis(QwtPlot::yLeft);
-    curveNumSat->setSamples(obsStat->_mjdX24, obsStat->_numSat);
-    curveNumSat->setPen(QPen(textNumSat.color()));
-    curveNumSat->attach(this);
-
-    QwtPlotCurve* curvePDOP = new QwtPlotCurve(textPDOP);
-    curvePDOP->setXAxis(QwtPlot::xBottom);
-    curvePDOP->setYAxis(QwtPlot::yRight);
-    curvePDOP->setSamples(obsStat->_mjdX24, obsStat->_PDOP);
-    curvePDOP->setPen(QPen(textPDOP.color()));
-    curvePDOP->attach(this);
+      QwtPlotCurve* curveNumSat = new QwtPlotCurve(textNumSat);
+      curveNumSat->setXAxis(QwtPlot::xBottom);
+      curveNumSat->setYAxis(QwtPlot::yLeft);
+      curveNumSat->setSamples(plotData._mjdX24, plotData._numSat);
+      curveNumSat->setPen(QPen(textNumSat.color()));
+      curveNumSat->attach(this);
+     
+      QwtPlotCurve* curvePDOP = new QwtPlotCurve(textPDOP);
+      curvePDOP->setXAxis(QwtPlot::xBottom);
+      curvePDOP->setYAxis(QwtPlot::yRight);
+      curvePDOP->setSamples(plotData._mjdX24, plotData._PDOP);
+      curvePDOP->setPen(QPen(textPDOP.color()));
+      curvePDOP->attach(this);
+    }
   }
   

trunk/BNC/src/rinex/dopplot.h

@@ -8 +8 @@
 #include "reqcanalyze.h"
 
-class t_obsStat;
-
 class t_dopPlot: public QwtPlot {
  Q_OBJECT
 
 public:
-  t_dopPlot(QWidget* parent, const QMap<t_prn, t_plotData>& plotData);
+ t_dopPlot(QWidget* parent, const QMap<t_prn, t_plotData>& plotDataMap);
 
 private:

trunk/BNC/src/rinex/reqcanalyze.h

@@ -37 +37 @@
  public:
   QVector<double> _mjdX24;
+  QVector<double> _numSat;
   QVector<double> _PDOP;
   QVector<double> _L1ok;