VE7UWU/sdrangel
1
0
Fork 0
mirror of https://github.com/f4exb/sdrangel.git synced 2026-06-28 06:23:21 -04:00
Code Issues Projects Releases Wiki Activity

Merge pull request #2770 from rgetz/rgetz-dont-list-inuse-devices

Browse Source 
Show devices in use in device selection dialog
This commit is contained in:
Edouard Griffiths
2026-06-22 08:37:12 +02:00
committed by GitHub
parent 7f6c7a447d a94f3c491e
commit 964bc0994d
2 changed files with 47 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
sdrbase/device/deviceenumerator.cpp
+3 -3
View File
@@ -332,7 +332,7 @@ void DeviceEnumerator::listRxDeviceNames(QList<QString>& list, std::vector<int>&
{
for (DevicesEnumeration::const_iterator it = m_rxEnumeration.begin(); it != m_rxEnumeration.end(); ++it)
{
if (((it->m_samplingDevice.claimed < 0) && (!it->m_samplingDevice.removed)) || (it->m_samplingDevice.type == PluginInterface::SamplingDevice::BuiltInDevice))
if (((!it->m_samplingDevice.removed)) || (it->m_samplingDevice.type == PluginInterface::SamplingDevice::BuiltInDevice))
{
list.append(it->m_samplingDevice.displayedName);
indexes.push_back(it->m_index);
@@ -344,7 +344,7 @@ void DeviceEnumerator::listTxDeviceNames(QList<QString>& list, std::vector<int>&
{
for (DevicesEnumeration::const_iterator it = m_txEnumeration.begin(); it != m_txEnumeration.end(); ++it)
{
if (((it->m_samplingDevice.claimed < 0) && (!it->m_samplingDevice.removed)) || (it->m_samplingDevice.type == PluginInterface::SamplingDevice::BuiltInDevice))
if (((!it->m_samplingDevice.removed)) || (it->m_samplingDevice.type == PluginInterface::SamplingDevice::BuiltInDevice))
{
list.append(it->m_samplingDevice.displayedName);
indexes.push_back(it->m_index);
@@ -356,7 +356,7 @@ void DeviceEnumerator::listMIMODeviceNames(QList<QString>& list, std::vector<int
{
for (DevicesEnumeration::const_iterator it = m_mimoEnumeration.begin(); it != m_mimoEnumeration.end(); ++it)
{
if (((it->m_samplingDevice.claimed < 0) && (!it->m_samplingDevice.removed)) || (it->m_samplingDevice.type == PluginInterface::SamplingDevice::BuiltInDevice))
if (((!it->m_samplingDevice.removed)) || (it->m_samplingDevice.type == PluginInterface::SamplingDevice::BuiltInDevice))
{
list.append(it->m_samplingDevice.displayedName);
indexes.push_back(it->m_index);
sdrgui/gui/samplingdevicedialog.cpp
+44
View File
@@ -23,6 +23,9 @@
///////////////////////////////////////////////////////////////////////////////////
#include <QThread>
#include <QPushButton>
#include <QStandardItemModel>
#include <QStandardItem>
#include "samplingdevicedialog.h"
#include "ui_samplingdevicedialog.h"
@@ -70,6 +73,47 @@ void SamplingDeviceDialog::displayDevices()
ui->deviceSelect->clear();
ui->deviceSelect->addItems(deviceDisplayNames);
// --- Disable, but still list CLAIMED/BUSY hardware ---
QStandardItemModel *model = qobject_cast<QStandardItemModel*>(ui->deviceSelect->model());
int firstEnabled = -1;
if (model) {
for (int idx = 0; idx < deviceDisplayNames.size(); ++idx) {
if (idx < static_cast<int>(m_deviceIndexes.size())) {
int coreDeviceIndex = m_deviceIndexes[idx];
const PluginInterface::SamplingDevice *samplingDevice = nullptr;
if (m_deviceType == 0) {
samplingDevice = DeviceEnumerator::instance()->getRxSamplingDevice(coreDeviceIndex);
} else if (m_deviceType == 1) {
samplingDevice = DeviceEnumerator::instance()->getTxSamplingDevice(coreDeviceIndex);
} else if (m_deviceType == 2) {
samplingDevice = DeviceEnumerator::instance()->getMIMOSamplingDevice(coreDeviceIndex);
}
if (samplingDevice && samplingDevice->claimed >= 0) {
QStandardItem *item = model->item(idx);
if (item) {
// Deactivate to block selection clicks
item->setEnabled(false);
// change the name, rather than a tooltip in case of touchscreen
item->setText(item->text() + tr(" [in use]"));
}
} else if (firstEnabled < 0) {
firstEnabled = idx;
}
}
}
// Allow acceptance only when at least one selectable device exists
if (QPushButton *okButton = ui->buttonBox->button(QDialogButtonBox::Ok)) {
okButton->setEnabled(firstEnabled >= 0);
}
// Select the first available device
if (firstEnabled >= 0) {
ui->deviceSelect->setCurrentIndex(firstEnabled);
}
}
}
void SamplingDeviceDialog::setSelectedDeviceIndex(int deviceIndex)