ADC: added info icons

Signed-off-by: Andrei Popa <[email protected]>

Author: andrei47w

gui/include/gui/widgets/menucombo.h

@@ -44,6 +44,7 @@ class SCOPY_GUI_EXPORT MenuCombo : public QWidget
 	virtual ~MenuCombo();
 
 	QComboBox *combo();
+	QLabel *label() const;
 
 	QString title() const;
 	void setTitle(const QString &newTitle);

gui/include/gui/widgets/menuonoffswitch.h

@@ -41,6 +41,7 @@ class SCOPY_GUI_EXPORT MenuOnOffSwitch : public QWidget
 	virtual ~MenuOnOffSwitch();
 
 	QAbstractButton *onOffswitch();
+	QLabel *label() const;
 
 private:
 	QLabel *m_label;

gui/include/gui/widgets/menuspinbox.h

@@ -157,6 +157,7 @@ class SCOPY_GUI_EXPORT MenuSpinbox : public QWidget
 	QString unit() const;
 	IncrementStrategy *incrementStrategy() const;
 	QString name() const;
+	QLabel *label() const;
 
 	void setScaleRange(double min, double max);
 

gui/src/widgets/menucollapsesection.cpp

@@ -113,7 +113,7 @@ MenuCollapseSection::MenuCollapseSection(QString title, MenuCollapseSection::Men
 	m_contLayout = new QVBoxLayout(container);
 	container->setLayout(m_contLayout);
 	m_contLayout->setMargin(0);
-	m_contLayout->setSpacing(0);
+	m_contLayout->setSpacing(5);
 
 	connect(m_header, &QAbstractButton::toggled, container, &QWidget::setVisible);
 }

gui/src/widgets/menucombo.cpp

@@ -85,6 +85,8 @@ MenuCombo::MenuCombo(QString title, QWidget *parent)
 MenuCombo::~MenuCombo() {}
 QComboBox *MenuCombo::combo() { return m_combo; }
 
+QLabel *MenuCombo::label() const { return m_label; }
+
 QString MenuCombo::title() const { return m_label->text(); }
 
 void MenuCombo::setTitle(const QString &newTitle) { m_label->setText(newTitle); }

gui/src/widgets/menuonoffswitch.cpp

@@ -54,4 +54,6 @@ MenuOnOffSwitch::~MenuOnOffSwitch() {}
 
 QAbstractButton *MenuOnOffSwitch::onOffswitch() { return m_switch; }
 
+QLabel *MenuOnOffSwitch::label() const { return m_label; }
+
 #include "moc_menuonoffswitch.cpp"

gui/src/widgets/menuspinbox.cpp

@@ -377,6 +377,8 @@ double MenuSpinbox::clamp(double val, double min, double max)
 
 QString MenuSpinbox::name() const { return m_name; }
 
+QLabel *MenuSpinbox::label() const { return m_label; }
+
 void MenuSpinbox::setName(const QString &newName)
 {
 	if(m_name == newName)

plugins/adc/src/freq/fftplotcomponentsettings.cpp

@@ -97,10 +97,13 @@ FFTPlotComponentSettings::FFTPlotComponentSettings(FFTPlotComponent *plt, QWidge
 	m_plotComponent->fftPlot()->yAxis()->getFormatter()->setTwoDecimalMode(false);
 
 	m_yPwrOffset = new MenuSpinbox("Power Offset", 0, "dB", -300, 300, true, false, yaxis);
+	InfoIconWidget::addHoveringInfoToWidget(m_yPwrOffset->label(),
+						"Offsets all channels' Y axis by set a amout units", m_yPwrOffset);
 	m_yPwrOffset->setScaleRange(1, 1);
 	m_yPwrOffset->setIncrementMode(MenuSpinbox::IS_FIXED);
 
 	m_windowCb = new MenuCombo("Window", yaxis);
+	InfoIconWidget::addHoveringInfoToWidget(m_windowCb->label(), "Set applied FFT window function", m_windowCb);
 
 	m_windowCb->combo()->addItem("Hann", gr::fft::window::WIN_HANN);
 	m_windowCb->combo()->addItem("Hanning", gr::fft::window::WIN_HANNING);

plugins/adc/src/freq/fftplotmanagersettings.cpp

@@ -107,7 +107,7 @@ QWidget *FFTPlotManagerSettings::createXAxisMenu(QWidget *parent)
 	MenuSectionCollapseWidget *section = new MenuSectionCollapseWidget("X-AXIS", MenuCollapseSection::MHCW_NONE,
 									   MenuCollapseSection::MHW_BASEWIDGET, parent);
 
-	m_bufferSizeSpin = new MenuSpinbox("Buffer Size", 16, "samples", 0, 4000000, true, false, section);
+	m_bufferSizeSpin = new MenuSpinbox("FFT Size", 16, "samples", 0, 4000000, true, false, section);
 	m_bufferSizeSpin->setScaleRange(1, 1e6);
 	connect(m_bufferSizeSpin, &MenuSpinbox::valueChanged, this, [=](double val) { setBufferSize((uint32_t)val); });
 
@@ -131,7 +131,9 @@ QWidget *FFTPlotManagerSettings::createXAxisMenu(QWidget *parent)
 	xMinMaxLayout->addWidget(m_xmin);
 	xMinMaxLayout->addWidget(m_xmax);
 
-	m_xModeCb = new MenuCombo("XMode", section);
+	m_xModeCb = new MenuCombo("XMODE", section);
+	InfoIconWidget::addHoveringInfoToWidget(m_xModeCb->label(),
+						"Set X axis scaling mode\nThis does not affect the data", m_xModeCb);
 	auto xcb = m_xModeCb->combo();
 
 	xcb->addItem("Samples", XMODE_SAMPLES);
@@ -197,12 +199,17 @@ QWidget *FFTPlotManagerSettings::createXAxisMenu(QWidget *parent)
 	m_sampleRateSpin = new MenuSpinbox("Sample Rate", 1, "Hz", 1, DBL_MAX, true, false, section);
 	m_sampleRateSpin->setIncrementMode(MenuSpinbox::IS_125);
 	InfoIconWidget::addHoveringInfoToWidget(
+		m_sampleRateSpin->label(),
+		"Controls how the X-axis is scaled when in Time XMode\nThis only affects the x scale, not the data",
+		section);
 
 	m_sampleRateSpin->setValue(10);
 	m_sampleRateSpin->setEnabled(false);
 	connect(m_sampleRateSpin, &MenuSpinbox::valueChanged, this, [=](double val) { setSampleRate(val); });
 
 	m_freqOffsetSpin = new MenuSpinbox("Frequency Offset", 1, "Hz", 0, DBL_MAX, true, false, section);
+	InfoIconWidget::addHoveringInfoToWidget(m_freqOffsetSpin->label(),
+						"Offsets all channels' X axis by set amout of Hz", m_freqOffsetSpin);
 	m_freqOffsetSpin->setIncrementMode(MenuSpinbox::IS_125);
 
 	m_freqOffsetSpin->setValue(0);

plugins/adc/src/time/grtimechannelcomponent.cpp

@@ -86,6 +86,8 @@ QWidget *GRTimeChannelComponent::createYAxisMenu(QWidget *parent)
 
 	// Y-MODE
 	m_ymodeCb = new MenuCombo("YMODE", m_yaxisMenu);
+	InfoIconWidget::addHoveringInfoToWidget(m_ymodeCb->label(),
+						"Set Y axis scaling mode\nThis does not affect the data", m_ymodeCb);
 	auto cb = m_ymodeCb->combo();
 	cb->addItem("ADC Counts", YMODE_COUNT);
 	cb->addItem("% Full Scale", YMODE_FS);