VE7UWU/sdrangel
1
0
Fork 0
mirror of https://github.com/f4exb/sdrangel.git synced 2025-02-03 09:44:01 -05:00
Code Issues Projects Releases Wiki Activity

SoapySDR support: individual gains GUIs fixes

Browse Source
This commit is contained in:
f4exb 2018-11-07 20:06:07 +01:00
parent e636d448a7
commit b316af2d1d
3 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
plugins/samplesink/soapysdroutput/soapysdroutputgui.cpp
View File

@ -58,6 +58,7 @@ SoapySDROutputGui::SoapySDROutputGui(DeviceUISet *deviceUISet, QWidget* parent)
createRangesControl(&m_bandwidthGUI, m_sampleSink->getBandwidthRanges(), "BW", "Hz"); createRangesControl(&m_bandwidthGUI, m_sampleSink->getBandwidthRanges(), "BW", "Hz");
createTunableElementsControl(m_sampleSink->getTunableElements()); createTunableElementsControl(m_sampleSink->getTunableElements());
createGlobalGainControl(); createGlobalGainControl();
createIndividualGainsControl(m_sampleSink->getIndividualGainsRanges());
if (m_sampleRateGUI) { if (m_sampleRateGUI) {
connect(m_sampleRateGUI, SIGNAL(valueChanged(double)), this, SLOT(sampleRateChanged(double))); connect(m_sampleRateGUI, SIGNAL(valueChanged(double)), this, SLOT(sampleRateChanged(double)));
@ -205,6 +206,7 @@ void SoapySDROutputGui::createIndividualGainsControl(const std::vector<DeviceSoa
return; return;
} }
QVBoxLayout *layout = (QVBoxLayout *) ui->scrollAreaWidgetContents->layout();
std::vector<DeviceSoapySDRParams::GainSetting>::const_iterator it = individualGainsList.begin(); std::vector<DeviceSoapySDRParams::GainSetting>::const_iterator it = individualGainsList.begin();
for (int i = 0; it != individualGainsList.end(); ++it, i++) for (int i = 0; it != individualGainsList.end(); ++it, i++)
@ -214,6 +216,7 @@ void SoapySDROutputGui::createIndividualGainsControl(const std::vector<DeviceSoa
gainGUI->setLabel(QString("%1 gain").arg(it->m_name.c_str())); gainGUI->setLabel(QString("%1 gain").arg(it->m_name.c_str()));
gainGUI->setUnits(QString("")); gainGUI->setUnits(QString(""));
DynamicItemSettingGUI *gui = new DynamicItemSettingGUI(gainGUI, QString(it->m_name.c_str())); DynamicItemSettingGUI *gui = new DynamicItemSettingGUI(gainGUI, QString(it->m_name.c_str()));
layout->addWidget(gainGUI);
m_individualGainsGUIs.push_back(gui); m_individualGainsGUIs.push_back(gui);
connect(m_individualGainsGUIs.back(), SIGNAL(valueChanged(QString, double)), this, SLOT(individualGainChanged(QString, double))); connect(m_individualGainsGUIs.back(), SIGNAL(valueChanged(QString, double)), this, SLOT(individualGainChanged(QString, double)));
} }

3
plugins/samplesource/soapysdrinput/soapysdrinputgui.cpp
View File

@ -59,6 +59,7 @@ SoapySDRInputGui::SoapySDRInputGui(DeviceUISet *deviceUISet, QWidget* parent) :
createRangesControl(&m_bandwidthGUI, m_sampleSource->getBandwidthRanges(), "BW", "Hz"); createRangesControl(&m_bandwidthGUI, m_sampleSource->getBandwidthRanges(), "BW", "Hz");
createTunableElementsControl(m_sampleSource->getTunableElements()); createTunableElementsControl(m_sampleSource->getTunableElements());
createGlobalGainControl(); createGlobalGainControl();
createIndividualGainsControl(m_sampleSource->getIndividualGainsRanges());
if (m_sampleRateGUI) { if (m_sampleRateGUI) {
connect(m_sampleRateGUI, SIGNAL(valueChanged(double)), this, SLOT(sampleRateChanged(double))); connect(m_sampleRateGUI, SIGNAL(valueChanged(double)), this, SLOT(sampleRateChanged(double)));
@ -206,6 +207,7 @@ void SoapySDRInputGui::createIndividualGainsControl(const std::vector<DeviceSoap
return; return;
} }
QVBoxLayout *layout = (QVBoxLayout *) ui->scrollAreaWidgetContents->layout();
std::vector<DeviceSoapySDRParams::GainSetting>::const_iterator it = individualGainsList.begin(); std::vector<DeviceSoapySDRParams::GainSetting>::const_iterator it = individualGainsList.begin();
for (int i = 0; it != individualGainsList.end(); ++it, i++) for (int i = 0; it != individualGainsList.end(); ++it, i++)
@ -215,6 +217,7 @@ void SoapySDRInputGui::createIndividualGainsControl(const std::vector<DeviceSoap
gainGUI->setLabel(QString("%1 gain").arg(it->m_name.c_str())); gainGUI->setLabel(QString("%1 gain").arg(it->m_name.c_str()));
gainGUI->setUnits(QString("")); gainGUI->setUnits(QString(""));
DynamicItemSettingGUI *gui = new DynamicItemSettingGUI(gainGUI, QString(it->m_name.c_str())); DynamicItemSettingGUI *gui = new DynamicItemSettingGUI(gainGUI, QString(it->m_name.c_str()));
layout->addWidget(gainGUI);
m_individualGainsGUIs.push_back(gui); m_individualGainsGUIs.push_back(gui);
connect(m_individualGainsGUIs.back(), SIGNAL(valueChanged(QString, double)), this, SLOT(individualGainChanged(QString, double))); connect(m_individualGainsGUIs.back(), SIGNAL(valueChanged(QString, double)), this, SLOT(individualGainChanged(QString, double)));
} }

12
sdrgui/soapygui/intervalslidergui.ui
View File

@ -6,7 +6,7 @@
<rect> <rect>
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>203</width> <width>266</width>
<height>30</height> <height>30</height>
</rect> </rect>
</property> </property>
@ -30,13 +30,19 @@
<rect> <rect>
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>179</width> <width>256</width>
<height>29</height> <height>21</height>
</rect> </rect>
</property> </property>
<layout class="QHBoxLayout" name="horizontalLayout"> <layout class="QHBoxLayout" name="horizontalLayout">
<item> <item>
<widget class="QLabel" name="intervalLabel"> <widget class="QLabel" name="intervalLabel">
<property name="minimumSize">
<size>
<width>80</width>
<height>0</height>
</size>
</property>
<property name="text"> <property name="text">
<string>Label</string> <string>Label</string>
</property> </property>