Changeset 8558 in ntrip

Timestamp:

Dec 12, 2018, 3:28:46 PM (6 years ago)

Author:

mervart

Message:

Analyze more than two signals

Location:

trunk/BNC/src/rinex

Files:

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

trunk/BNC/src/rinex/reqcanalyze.cpp

@@ -560 +560 @@
               const t_qcFrq& qcFrq = qcSat._qcFrq[iFrq];
               if (QString(it1.value()[ii]) == qcFrq._rnxType2ch.left(1)) {
-                dataMP._data << (new t_polarPoint(qcSat._azDeg, 90.0 - qcSat._eleDeg, qcFrq._stdMP));
-                dataSN._data << (new t_polarPoint(qcSat._azDeg, 90.0 - qcSat._eleDeg, qcFrq._SNR));
+                (*dataMP._data) << (new t_polarPoint(qcSat._azDeg, 90.0 - qcSat._eleDeg, qcFrq._stdMP));
+                (*dataSN._data) << (new t_polarPoint(qcSat._azDeg, 90.0 - qcSat._eleDeg, qcFrq._SNR));
               }
             }
@@ -593 +593 @@
       while (it.hasNext()) {
         const t_skyPlotData&          plotData = it.next();
-        const QVector<t_polarPoint*>& data     = plotData._data;
-        for (int ii = 0; ii < data.size(); ii++) {
-          double val = data.at(ii)->_value;
+        const QVector<t_polarPoint*>* data     = plotData._data;
+        for (int ii = 0; ii < data->size(); ii++) {
+          double val = data->at(ii)->_value;
           if (maxValue < val) {
             maxValue = val;
@@ -609 +609 @@
     while (it.hasNext()) {
       t_skyPlotData&          plotData = it.next();
-      QVector<t_polarPoint*>& data     = plotData._data;
+      QVector<t_polarPoint*>* data     = plotData._data;
       QwtText title(plotData._title);
       QFont font = title.font(); font.setPointSize(font.pointSize()-1); title.setFont(font);
       t_polarPlot* plot = new t_polarPlot(title, scaleInterval, BNC_CORE->mainWindow());
-      plot->addCurve(&data);
+      plot->addCurve(data);
       plots << plot;
     }

trunk/BNC/src/rinex/reqcanalyze.h

@@ -59 +59 @@
   class t_skyPlotData {
    public:
-    t_skyPlotData() {}
+    t_skyPlotData() {
+      _data = new QVector<t_polarPoint*>;
+    }
     ~t_skyPlotData() {}
     void clear() {
-      for (int ii = 0; ii < _data.size(); ii++) {
-        delete _data.at(ii);
+      for (int ii = 0; ii < _data->size(); ii++) {
+        delete _data->at(ii);
       }
     }
-    QString                _title;
-    QVector<t_polarPoint*> _data;
+    QString                 _title;
+    QVector<t_polarPoint*>* _data;
   };