diff options
Diffstat (limited to 'gr-qtgui/lib/spectrumUpdateEvents.cc')
| -rw-r--r-- | gr-qtgui/lib/spectrumUpdateEvents.cc | 44 |
1 files changed, 25 insertions, 19 deletions
diff --git a/gr-qtgui/lib/spectrumUpdateEvents.cc b/gr-qtgui/lib/spectrumUpdateEvents.cc index 6906c1af9e..8a1d631686 100644 --- a/gr-qtgui/lib/spectrumUpdateEvents.cc +++ b/gr-qtgui/lib/spectrumUpdateEvents.cc @@ -150,7 +150,7 @@ double SpectrumFrequencyRangeEvent::GetStopFrequency() const { return _stopFrequ /***************************************************************************/ -TimeUpdateEvent::TimeUpdateEvent(const std::vector<double*> timeDomainPoints, +TimeUpdateEvent::TimeUpdateEvent(const std::vector<volk::vector<double>> timeDomainPoints, const uint64_t numTimeDomainDataPoints, const std::vector<std::vector<gr::tag_t>> tags) : QEvent(QEvent::Type(SpectrumUpdateEventType)) @@ -161,12 +161,13 @@ TimeUpdateEvent::TimeUpdateEvent(const std::vector<double*> timeDomainPoints, _numTimeDomainDataPoints = numTimeDomainDataPoints; } + // TODO: make this whole thing a vector copy. _nplots = timeDomainPoints.size(); for (size_t i = 0; i < _nplots; i++) { _dataTimeDomainPoints.push_back(new double[_numTimeDomainDataPoints]); if (numTimeDomainDataPoints > 0) { memcpy(_dataTimeDomainPoints[i], - timeDomainPoints[i], + timeDomainPoints[i].data(), _numTimeDomainDataPoints * sizeof(double)); } } @@ -199,7 +200,7 @@ const std::vector<std::vector<gr::tag_t>> TimeUpdateEvent::getTags() const /***************************************************************************/ -FreqUpdateEvent::FreqUpdateEvent(const std::vector<double*> dataPoints, +FreqUpdateEvent::FreqUpdateEvent(const std::vector<volk::vector<double>> dataPoints, const uint64_t numDataPoints) : QEvent(QEvent::Type(SpectrumUpdateEventType)) { @@ -210,10 +211,11 @@ FreqUpdateEvent::FreqUpdateEvent(const std::vector<double*> dataPoints, } _nplots = dataPoints.size(); + // TODO: do a vector copy. for (size_t i = 0; i < _nplots; i++) { _dataPoints.push_back(new double[_numDataPoints]); if (numDataPoints > 0) { - memcpy(_dataPoints[i], dataPoints[i], _numDataPoints * sizeof(double)); + memcpy(_dataPoints[i], dataPoints[i].data(), _numDataPoints * sizeof(double)); } } } @@ -247,8 +249,8 @@ double SetFreqEvent::getBandwidth() const { return _bandwidth; } /***************************************************************************/ -ConstUpdateEvent::ConstUpdateEvent(const std::vector<double*> realDataPoints, - const std::vector<double*> imagDataPoints, +ConstUpdateEvent::ConstUpdateEvent(const std::vector<volk::vector<double>> realDataPoints, + const std::vector<volk::vector<double>> imagDataPoints, const uint64_t numDataPoints) : QEvent(QEvent::Type(SpectrumUpdateEventType)) { @@ -258,15 +260,18 @@ ConstUpdateEvent::ConstUpdateEvent(const std::vector<double*> realDataPoints, _numDataPoints = numDataPoints; } + // Todo: do vector copies. _nplots = realDataPoints.size(); for (size_t i = 0; i < _nplots; i++) { _realDataPoints.push_back(new double[_numDataPoints]); _imagDataPoints.push_back(new double[_numDataPoints]); if (numDataPoints > 0) { - memcpy( - _realDataPoints[i], realDataPoints[i], _numDataPoints * sizeof(double)); - memcpy( - _imagDataPoints[i], imagDataPoints[i], _numDataPoints * sizeof(double)); + memcpy(_realDataPoints[i], + realDataPoints[i].data(), + _numDataPoints * sizeof(double)); + memcpy(_imagDataPoints[i], + imagDataPoints[i].data(), + _numDataPoints * sizeof(double)); } } } @@ -295,9 +300,10 @@ uint64_t ConstUpdateEvent::getNumDataPoints() const { return _numDataPoints; } /***************************************************************************/ -WaterfallUpdateEvent::WaterfallUpdateEvent(const std::vector<double*> dataPoints, - const uint64_t numDataPoints, - const gr::high_res_timer_type dataTimestamp) +WaterfallUpdateEvent::WaterfallUpdateEvent( + const std::vector<volk::vector<double>> dataPoints, + const uint64_t numDataPoints, + const gr::high_res_timer_type dataTimestamp) : QEvent(QEvent::Type(SpectrumUpdateEventType)) { if (numDataPoints < 1) { @@ -310,7 +316,7 @@ WaterfallUpdateEvent::WaterfallUpdateEvent(const std::vector<double*> dataPoints for (size_t i = 0; i < _nplots; i++) { _dataPoints.push_back(new double[_numDataPoints]); if (numDataPoints > 0) { - memcpy(_dataPoints[i], dataPoints[i], _numDataPoints * sizeof(double)); + memcpy(_dataPoints[i], dataPoints[i].data(), _numDataPoints * sizeof(double)); } } @@ -337,8 +343,8 @@ gr::high_res_timer_type WaterfallUpdateEvent::getDataTimestamp() const /***************************************************************************/ -TimeRasterUpdateEvent::TimeRasterUpdateEvent(const std::vector<double*> dataPoints, - const uint64_t numDataPoints) +TimeRasterUpdateEvent::TimeRasterUpdateEvent( + const std::vector<volk::vector<double>> dataPoints, const uint64_t numDataPoints) : QEvent(QEvent::Type(SpectrumUpdateEventType)) { if (numDataPoints < 1) { @@ -351,7 +357,7 @@ TimeRasterUpdateEvent::TimeRasterUpdateEvent(const std::vector<double*> dataPoin for (size_t i = 0; i < _nplots; i++) { _dataPoints.push_back(new double[_numDataPoints]); if (numDataPoints > 0) { - memcpy(_dataPoints[i], dataPoints[i], _numDataPoints * sizeof(double)); + memcpy(_dataPoints[i], dataPoints[i].data(), _numDataPoints * sizeof(double)); } } } @@ -385,7 +391,7 @@ double TimeRasterSetSize::nCols() const { return _ncols; } /***************************************************************************/ -HistogramUpdateEvent::HistogramUpdateEvent(const std::vector<double*> points, +HistogramUpdateEvent::HistogramUpdateEvent(const std::vector<volk::vector<double>> points, const uint64_t npoints) : QEvent(QEvent::Type(SpectrumUpdateEventType)) { @@ -399,7 +405,7 @@ HistogramUpdateEvent::HistogramUpdateEvent(const std::vector<double*> points, for (size_t i = 0; i < _nplots; i++) { _points.push_back(new double[_npoints]); if (npoints > 0) { - memcpy(_points[i], points[i], _npoints * sizeof(double)); + memcpy(_points[i], points[i].data(), _npoints * sizeof(double)); } } } |