Changeset 6279 in ntrip

Timestamp:

Oct 31, 2014, 7:11:02 PM (9 years ago)

Author:

mervart

Message:

 

Location:

trunk/BNC/src/rinex

Files:

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

trunk/BNC/src/rinex/dopplot.cpp

@@ -61 +61 @@
 // Constructor
 //////////////////////////////////////////////////////////////////////////////
-t_dopPlot::t_dopPlot(QWidget* parent, const QMap<t_prn, t_plotData>& plotDataMap) 
+t_dopPlot::t_dopPlot(QWidget* parent, const t_plotData& plotData) 
 : QwtPlot(parent) {
 
@@ -90 +90 @@
   setAxisTitle(QwtPlot::yLeft,  textNumSat);
   double maxNumSat = 20.0;
-  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;
-        } 
-      }
-    }
+  for (int ii = 0; ii < plotData._numSat.size(); ii++) {
+    if (maxNumSat < plotData._numSat[ii]) {
+      maxNumSat = plotData._numSat[ii] + 5;
+    } 
   }
   setAxisScale(QwtPlot::yLeft,  0,  maxNumSat);
@@ -111 +104 @@
   // Curves
   // ------
-  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(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);
-    }
+  if (plotData._mjdX24.size() > 0) {
+    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

@@ -12 +12 @@
 
 public:
- t_dopPlot(QWidget* parent, const QMap<t_prn, t_plotData>& plotDataMap);
+ t_dopPlot(QWidget* parent, const t_plotData& plotData);
 
 private:

trunk/BNC/src/rinex/reqcanalyze.cpp

@@ -667 +667 @@
   }
 
+  t_plotData plotData;
+
   if (BNC_CORE->GUIenabled()) {
     t_availPlot* plotA = new t_availPlot(0, plotDataMap);
@@ -673 +675 @@
     t_elePlot* plotZ = new t_elePlot(0, plotDataMap);
 
-    t_dopPlot* plotD = new t_dopPlot(0, plotDataMap);
+    t_dopPlot* plotD = new t_dopPlot(0, plotData);
 
     QVector<QWidget*> plots;