optimize

Author: andrei47w

gui/include/gui/waterfallplotwidget.h

@@ -23,6 +23,7 @@
 #define WATERFALL_PLOT_WIDGET_H
 
 #include "plotwidget.h"
+#include "toolcomponent.h"
 #include "scopy-gui_export.h"
 
 #include <qwt_plot_spectrogram.h>
@@ -43,7 +44,7 @@ class SCOPY_GUI_EXPORT WaterfallData : public QwtRasterData
 	explicit WaterfallData(int maxRows = 200);
 	~WaterfallData() override;
 
-	void addFFTData(const double *data, size_t size);
+	void addFFTData(const float *data, size_t size);
 	void reset();
 
 	void setXInterval(double minFreq, double maxFreq);
@@ -57,7 +58,7 @@ class SCOPY_GUI_EXPORT WaterfallData : public QwtRasterData
 	double value(double x, double y) const override;
 
 private:
-	std::deque<std::vector<double>> m_data;
+	std::deque<std::vector<float>> m_data;
 	int m_maxRows;
 	size_t m_fftSize;
 
@@ -98,16 +99,15 @@ class SCOPY_GUI_EXPORT WaterfallPlotWidget : public PlotWidget
 	explicit WaterfallPlotWidget(QWidget *parent = nullptr);
 	~WaterfallPlotWidget() override;
 
-	void addFFTData(const double *data, size_t size);
+	void addFFTData(const float *data, size_t size);
 	void clearData();
 
+	void setChannel(ChannelData *ch);
+
 	void setFrequencyRange(double startHz, double stopHz);
 	void setIntensityRange(double minDb, double maxDb);
 	void setNumRows(int rows);
 
-Q_SIGNALS:
-	void newData();
-
 public Q_SLOTS:
 	void updateYAxis();
 
@@ -119,6 +119,8 @@ public Q_SLOTS:
 	QElapsedTimer m_rowTimer;
 	double m_secsPerRow;
 	int m_rowCount;
+
+	ChannelData *m_channel = nullptr;
 };
 
 } // namespace scopy

gui/src/cursorcontroller.cpp

@@ -212,12 +212,14 @@ void CursorController::syncXCursorControllers(CursorController *ctrl1, CursorCon
 		ctrl1->x1Cursor->blockSignals(true);
 		ctrl2->x1Cursor->setPosition(pos);
 		ctrl1->x1Cursor->blockSignals(false);
+		ctrl2->x1Cursor->repaint();
 		ctrl2->m_plot->repaint();
 	});
 	connect(ctrl1->x2Cursor, &PlotAxisHandle::scalePosChanged, ctrl2->x2Cursor, [=](double pos) {
 		ctrl1->x2Cursor->blockSignals(true);
 		ctrl2->x2Cursor->setPosition(pos);
 		ctrl1->x2Cursor->blockSignals(false);
+		ctrl2->x2Cursor->repaint();
 		ctrl2->m_plot->repaint();
 	});
 
@@ -226,12 +228,14 @@ void CursorController::syncXCursorControllers(CursorController *ctrl1, CursorCon
 		ctrl2->x1Cursor->blockSignals(true);
 		ctrl1->x1Cursor->setPosition(pos);
 		ctrl2->x1Cursor->blockSignals(false);
+		ctrl1->x1Cursor->repaint();
 		ctrl1->m_plot->repaint();
 	});
 	connect(ctrl2->x2Cursor, &PlotAxisHandle::scalePosChanged, ctrl1->x2Cursor, [=](double pos) {
 		ctrl2->x2Cursor->blockSignals(true);
 		ctrl1->x2Cursor->setPosition(pos);
 		ctrl2->x2Cursor->blockSignals(false);
+		ctrl1->x2Cursor->repaint();
 		ctrl1->m_plot->repaint();
 	});
 }

gui/src/waterfallplotwidget.cpp

@@ -29,6 +29,7 @@
 
 #include <qwt_scale_widget.h>
 #include <cfloat>
+#include <vector>
 
 using namespace scopy;
 
@@ -47,7 +48,7 @@ WaterfallData::WaterfallData(int maxRows)
 
 WaterfallData::~WaterfallData() {}
 
-void WaterfallData::addFFTData(const double *data, size_t size)
+void WaterfallData::addFFTData(const float *data, size_t size)
 {
 	if(!data || size == 0)
 		return;
@@ -60,7 +61,7 @@ void WaterfallData::addFFTData(const double *data, size_t size)
 		m_fftSize = size;
 	}
 
-	m_data.push_back(std::vector<double>(data, data + size));
+	m_data.push_back(std::vector<float>(data, data + size));
 
 	while(static_cast<int>(m_data.size()) > m_maxRows)
 		m_data.pop_front();
@@ -116,7 +117,7 @@ double WaterfallData::value(double x, double y) const
 	if(bin < 0 || static_cast<size_t>(bin) >= m_fftSize)
 		return -DBL_MAX;
 
-	return m_data[static_cast<size_t>(dataRow)][static_cast<size_t>(bin)];
+	return static_cast<double>(m_data[static_cast<size_t>(dataRow)][static_cast<size_t>(bin)]);
 }
 
 // =============================================================================
@@ -182,7 +183,7 @@ WaterfallPlotWidget::WaterfallPlotWidget(QWidget *parent)
 
 WaterfallPlotWidget::~WaterfallPlotWidget() {}
 
-void WaterfallPlotWidget::addFFTData(const double *data, size_t size)
+void WaterfallPlotWidget::addFFTData(const float *data, size_t size)
 {
 	if(m_rowTimer.isValid()) {
 		const double elapsed = m_rowTimer.elapsed() / 1000.0;
@@ -245,4 +246,18 @@ void WaterfallPlotWidget::setNumRows(int rows)
 	yAxis()->setInterval(rows, 0);
 }
 
+void WaterfallPlotWidget::setChannel(ChannelData *ch)
+{
+	disconnect(m_channel, &ChannelData::newData, this, nullptr);
+	if(m_channel != ch)
+		clearData();
+
+	m_channel = ch;
+	if(ch)
+		connect(m_channel, &ChannelData::newData, this, [this](const float *, const float *yData, size_t size, bool) {
+			addFFTData(yData, size);
+			replot();
+		});
+}
+
 #include "moc_waterfallplotwidget.cpp"

packages/generic-plugins/plugins/adc/src/freq/fftplotcomponent.cpp

@@ -94,10 +94,9 @@ FFTPlotComponent::FFTPlotComponent(QString name, uint32_t uuid, QWidget *parent)
 	m_waterfallCursor = new CursorController(m_waterfallPlot, this);
 	m_waterfallCursor->getPlotCursors()->setXHandlePos((HandlePos)xCursorPos);
 	m_waterfallCursor->getPlotCursors()->setYHandlePos((HandlePos)yCursorPos);
-	CursorController::syncXCursorControllers(m_cursor, m_waterfallCursor);
 
+	CursorController::syncXCursorControllers(m_cursor, m_waterfallCursor);
 	PlotNavigator::syncXNavigators(m_fftPlot->navigator(), m_waterfallPlot->navigator());
-
 }
 
 FFTPlotComponent::~FFTPlotComponent() {}
@@ -122,7 +121,7 @@ void FFTPlotComponent::selectChannel(ChannelComponent *ch)
 		disconnect(m_activeChannel, &ChannelComponent::nameChanged, nullptr, nullptr);
 
 	m_activeChannel = ch;
-	m_waterfallPlot->clearData();
+	m_waterfallPlot->setChannel(ch ? ch->chData() : nullptr);
 
 	if(ch) {
 		m_waterfallDockWrapper->setTitle("Waterfall Plot - " + ch->name());
@@ -139,6 +138,8 @@ void FFTPlotComponent::addChannel(ChannelComponent *c)
 
 void FFTPlotComponent::removeChannel(ChannelComponent *c)
 {
+	if(c == m_activeChannel)
+		selectChannel(nullptr);
 	PlotComponent::removeChannel(c);
 	m_plotMenu->removeChannel(c);
 }

packages/generic-plugins/plugins/adc/src/freq/fftplotcomponentchannel.cpp

@@ -20,16 +20,13 @@
  */
 
 #include "fftplotcomponentchannel.h"
-#include <gui/waterfallplotwidget.h>
 #include <minmaxholdcontroller.hpp>
 #include <pluginbase/preferences.h>
 #include <widgets/menucollapsesection.h>
 #include <widgets/menuplotaxisrangecontrol.h>
 #include <widgets/menuplotchannelcurvestylecontrol.h>
 #include <widgets/menusectionwidget.h>
 
-#include <vector>
-
 using namespace scopy;
 using namespace adc;
 
@@ -139,17 +136,6 @@ void FFTPlotComponentChannel::onNewData(const float *xData_, const float *yData_
 
 	m_minMaxHoldController->update(xData_, yData_, size);
 	m_markerController->computeMarkers();
-
-	// Feed waterfall if this channel is the active one
-	if(m_plotComponent && m_plotComponent->activeChannel() == m_ch) {
-		WaterfallPlotWidget *wf = m_plotComponent->waterfallPlot();
-		std::vector<double> buf(size);
-		for(size_t i = 0; i < size; ++i) {
-			buf[i] = static_cast<double>(yData_[i]);
-		}
-		wf->addFFTData(buf.data(), size);
-		wf->replot();
-	}
 }
 
 void FFTPlotComponentChannel::lockYAxis(bool b)