fix cursors

Author: andrei47w

gui/include/gui/cursorcontroller.h

@@ -23,6 +23,7 @@
 #define CURSORCONTROLLER_H
 
 #include "scopy-gui_export.h"
+#include <plotaxis.h>
 #include <plotcursors.h>
 #include <widgets/cursorsettings.h>
 #include <widgets/plotcursorreadouts.h>
@@ -38,6 +39,7 @@ class SCOPY_GUI_EXPORT CursorController : public QObject
 
 	PlotCursors *getPlotCursors();
 	void connectSignals(CursorSettings *cursorSettings);
+	void setAxes(PlotAxis *xAxis, PlotAxis *yAxis);
 
 	void static syncXCursorControllers(CursorController *ctrl1, CursorController *ctrl2);
 	void static unsyncXCursorControllers(CursorController *ctrl1, CursorController *ctrl2);

gui/src/cursorcontroller.cpp

@@ -201,6 +201,21 @@ void CursorController::updateTracking()
 	}
 }
 
+void CursorController::setAxes(PlotAxis *xAxis, PlotAxis *yAxis)
+{
+	// Bootstrap the readouts with the current formatter and units of each axis.
+	plotCursorReadouts->setXFormatter(xAxis->getFormatter());
+	plotCursorReadouts->setYFormatter(yAxis->getFormatter());
+	plotCursorReadouts->setXUnits(xAxis->getUnits());
+	plotCursorReadouts->setYUnits(yAxis->getUnits());
+
+	// Stay in sync whenever the axes change.
+	connect(xAxis, &PlotAxis::formatterChanged, plotCursorReadouts, &PlotCursorReadouts::setXFormatter);
+	connect(xAxis, &PlotAxis::unitsChanged, plotCursorReadouts, &PlotCursorReadouts::setXUnits);
+	connect(yAxis, &PlotAxis::formatterChanged, plotCursorReadouts, &PlotCursorReadouts::setYFormatter);
+	connect(yAxis, &PlotAxis::unitsChanged, plotCursorReadouts, &PlotCursorReadouts::setYUnits);
+}
+
 void CursorController::syncXCursorControllers(CursorController *ctrl1, CursorController *ctrl2)
 {
 	ctrl2->setVisible(ctrl1->isVisible());

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

@@ -94,6 +94,7 @@ 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);
+	m_waterfallCursor->setAxes(m_waterfallPlot->xAxis(), m_waterfallPlot->yAxis());
 
 	CursorController::syncXCursorControllers(m_cursor, m_waterfallCursor);
 	PlotNavigator::syncXNavigators(m_fftPlot->navigator(), m_waterfallPlot->navigator());

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

@@ -145,7 +145,7 @@ QWidget *FFTPlotManagerSettings::createXAxisMenu(QWidget *parent)
 	connect(xcb, qOverload<int>(&QComboBox::currentIndexChanged), this, [=](int idx) {
 		for(PlotComponent *plt : m_plotManager->plots()) {
 			auto p = dynamic_cast<FFTPlotComponent *>(plt);
-			updateXMode(idx, p->fftPlot()->xAxis());
+			updateXMode(idx, p->fftPlot()->xAxis(), p->waterfallPlot()->xAxis());
 		}
 	});
 
@@ -186,7 +186,7 @@ QWidget *FFTPlotManagerSettings::createXAxisMenu(QWidget *parent)
 	return section;
 }
 
-void FFTPlotManagerSettings::updateXMode(int mode, PlotAxis *axis)
+void FFTPlotManagerSettings::updateXMode(int mode, PlotAxis *fftAxis, PlotAxis *waterfallAxis)
 {
 	QComboBox *xcb = m_xModeCb->combo();
 	m_sampleRateSpin->setVisible(false);
@@ -198,10 +198,11 @@ void FFTPlotManagerSettings::updateXMode(int mode, PlotAxis *axis)
 		m_plotManager->setXUnit("samples");
 		m_sampleRateSpin->setValue(m_samplingInfo.bufferSize);
 
-		axis->scaleDraw()->setUnitType("");
-		axis->scaleDraw()->setFloatPrecision(3);
-		axis->scaleDraw()->setUnitsEnabled(false);
-		axis->getFormatter()->setTwoDecimalMode(false);
+		fftAxis->scaleDraw()->setUnitType("");
+		fftAxis->scaleDraw()->setFloatPrecision(3);
+		fftAxis->scaleDraw()->setUnitsEnabled(false);
+		fftAxis->getFormatter()->setTwoDecimalMode(false);
+		waterfallAxis->setUnits("samples");
 	}
 
 	if(xcb->itemData(mode) == XMODE_TIME) {
@@ -214,10 +215,11 @@ void FFTPlotManagerSettings::updateXMode(int mode, PlotAxis *axis)
 		m_freqOffsetSpin->setVisible(true);
 		m_freqOffsetSpin->setEnabled(true);
 
-		axis->scaleDraw()->setUnitType("Hz");
-		axis->scaleDraw()->setUnitsEnabled(true);
-		axis->scaleDraw()->setFloatPrecision(3);
-		axis->getFormatter()->setTwoDecimalMode(false);
+		fftAxis->scaleDraw()->setUnitType("Hz");
+		fftAxis->scaleDraw()->setUnitsEnabled(true);
+		fftAxis->scaleDraw()->setFloatPrecision(3);
+		fftAxis->getFormatter()->setTwoDecimalMode(false);
+		waterfallAxis->setUnits("Hz");
 	}
 	if(xcb->itemData(mode) == XMODE_OVERRIDE) {
 		m_xmin->setUnit("Hz");
@@ -229,10 +231,11 @@ void FFTPlotManagerSettings::updateXMode(int mode, PlotAxis *axis)
 		m_freqOffsetSpin->setVisible(true);
 		m_freqOffsetSpin->setEnabled(true);
 
-		axis->scaleDraw()->setUnitType("Hz");
-		axis->scaleDraw()->setUnitsEnabled(true);
-		axis->scaleDraw()->setFloatPrecision(3);
-		axis->getFormatter()->setTwoDecimalMode(false);
+		fftAxis->scaleDraw()->setUnitType("Hz");
+		fftAxis->scaleDraw()->setUnitsEnabled(true);
+		fftAxis->scaleDraw()->setFloatPrecision(3);
+		fftAxis->getFormatter()->setTwoDecimalMode(false);
+		waterfallAxis->setUnits("Hz");
 	}
 	updateXAxis();
 	m_plotManager->updateAxisScales();
@@ -326,7 +329,7 @@ void FFTPlotManagerSettings::addPlot(FFTPlotComponent *p)
 	// Set initial complex mode state
 	p->plotMenu()->setComplexMode(m_samplingInfo.complexMode);
 
-	updateXMode(m_xModeCb->combo()->currentIndex(), p->fftPlot()->xAxis());
+	updateXMode(m_xModeCb->combo()->currentIndex(), p->fftPlot()->xAxis(), p->waterfallPlot()->xAxis());
 }
 
 void FFTPlotManagerSettings::setPlotComboVisible()

packages/generic-plugins/plugins/adc/src/freq/fftplotmanagersettings.h

@@ -103,7 +103,7 @@ private Q_SLOTS:
 private:
 	FFTPlotManager *m_plotManager;
 
-	void updateXMode(int mode, PlotAxis *axis);
+	void updateXMode(int mode, PlotAxis *fftAxis, PlotAxis *waterfallAxis);
 	QWidget *createMenu(QWidget *parent = nullptr);
 	QWidget *createXAxisMenu(QWidget *parent = nullptr);
 	QWidget *createYAxisMenu(QWidget *parent = nullptr);