VE7UWU/sdrangel
1
0
Fork 0
mirror of https://github.com/f4exb/sdrangel.git synced 2025-06-02 23:12:26 -04:00
Code Issues Projects Releases Wiki Activity

Device user arguments (3)

Browse Source
This commit is contained in:
f4exb 2019-06-13 01:23:05 +02:00
parent 6ebccb5b64
commit d79926e91b
3 changed files with 77 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

58
sdrgui/gui/deviceuserargsdialog.cpp
View File

@ -28,7 +28,8 @@ DeviceUserArgsDialog::DeviceUserArgsDialog(
QDialog(parent), QDialog(parent),
ui(new Ui::DeviceUserArgsDialog), ui(new Ui::DeviceUserArgsDialog),
m_deviceEnumerator(deviceEnumerator), m_deviceEnumerator(deviceEnumerator),
m_hardwareDeviceUserArgs(hardwareDeviceUserArgs) m_hardwareDeviceUserArgs(hardwareDeviceUserArgs),
m_argsByDeviceCopy(hardwareDeviceUserArgs.m_argsByDevice)
{ {
qDebug("DeviceUserArgsDialog::DeviceUserArgsDialog"); qDebug("DeviceUserArgsDialog::DeviceUserArgsDialog");
ui->setupUi(this); ui->setupUi(this);
@ -51,28 +52,13 @@ DeviceUserArgsDialog::DeviceUserArgsDialog(
treeItem->setText(0, hwItem.m_hardwareId); treeItem->setText(0, hwItem.m_hardwareId);
treeItem->setText(1, tr("%1").arg(hwItem.m_sequence)); treeItem->setText(1, tr("%1").arg(hwItem.m_sequence));
treeItem->setText(2, hwItem.m_description); treeItem->setText(2, hwItem.m_description);
qDebug("DeviceUserArgsDialog::DeviceUserArgsDialog: available %s:%d", qPrintable(hwItem.m_hardwareId), hwItem.m_sequence);
} }
ui->deviceTree->resizeColumnToContents(0); ui->deviceTree->resizeColumnToContents(0);
ui->deviceTree->resizeColumnToContents(1); ui->deviceTree->resizeColumnToContents(1);
ui->deviceTree->resizeColumnToContents(2); ui->deviceTree->resizeColumnToContents(2);
for (auto& deviceKey : hardwareDeviceUserArgs.m_argsByDevice) displayArgsByDevice();
{
QString hardwareId;
int sequence;
DeviceUserArgs::splitDeviceKey(deviceKey, hardwareId, sequence);
QTreeWidgetItem *treeItem = new QTreeWidgetItem(ui->argsTree);
treeItem->setText(0, hardwareId);
treeItem->setText(1, tr("%1").arg(sequence));
treeItem->setText(2, hardwareDeviceUserArgs.m_argsByDevice.value(deviceKey));
qDebug("DeviceUserArgsDialog::DeviceUserArgsDialog: args %s:%d", qPrintable(hardwareId), sequence);
}
ui->argsTree->resizeColumnToContents(0);
ui->argsTree->resizeColumnToContents(1);
ui->argsTree->resizeColumnToContents(2);
} }
DeviceUserArgsDialog::~DeviceUserArgsDialog() DeviceUserArgsDialog::~DeviceUserArgsDialog()
@ -80,6 +66,29 @@ DeviceUserArgsDialog::~DeviceUserArgsDialog()
delete ui; delete ui;
} }
void DeviceUserArgsDialog::displayArgsByDevice()
{
ui->argsTree->clear();
ui->argStringEdit->clear();
QMap<QString, QString>::iterator it = m_argsByDeviceCopy.begin();
for (; it != m_argsByDeviceCopy.end(); ++it)
{
QString hardwareId;
int sequence;
DeviceUserArgs::splitDeviceKey(it.key(), hardwareId, sequence);
QTreeWidgetItem *treeItem = new QTreeWidgetItem(ui->argsTree);
treeItem->setText(0, hardwareId);
treeItem->setText(1, tr("%1").arg(sequence));
treeItem->setText(2, m_argsByDeviceCopy.value(it.value()));
}
ui->argsTree->resizeColumnToContents(0);
ui->argsTree->resizeColumnToContents(1);
ui->argsTree->resizeColumnToContents(2);
}
void DeviceUserArgsDialog::pushHWDeviceReference(const PluginInterface::SamplingDevice *samplingDevice) void DeviceUserArgsDialog::pushHWDeviceReference(const PluginInterface::SamplingDevice *samplingDevice)
{ {
HWDeviceReference hw; HWDeviceReference hw;
@ -104,6 +113,7 @@ void DeviceUserArgsDialog::pushHWDeviceReference(const PluginInterface::Sampling
void DeviceUserArgsDialog::accept() void DeviceUserArgsDialog::accept()
{ {
m_hardwareDeviceUserArgs.m_argsByDevice = m_argsByDeviceCopy;
QDialog::accept(); QDialog::accept();
} }
@ -114,7 +124,21 @@ void DeviceUserArgsDialog::reject()
void DeviceUserArgsDialog::on_importDevice_clicked(bool checked) void DeviceUserArgsDialog::on_importDevice_clicked(bool checked)
{ {
(void) checked;
QTreeWidgetItem *deviceItem = ui->deviceTree->currentItem();
QStringList strList;
strList.append(deviceItem->text(0));
strList.append(deviceItem->text(1));
QString key = strList.join('-');
qDebug("DeviceUserArgsDialog::on_importDevice_clicked: key: %s", qPrintable(key));
QMap<QString, QString>::iterator it = m_argsByDeviceCopy.find(key);
if (it == m_argsByDeviceCopy.end()) {
m_argsByDeviceCopy[key] = "";
}
displayArgsByDevice();
} }
void DeviceUserArgsDialog::on_deleteArgs_clicked(bool checked) void DeviceUserArgsDialog::on_deleteArgs_clicked(bool checked)

2
sdrgui/gui/deviceuserargsdialog.h
View File

@ -57,8 +57,10 @@ private:
DeviceEnumerator* m_deviceEnumerator; DeviceEnumerator* m_deviceEnumerator;
DeviceUserArgs& m_hardwareDeviceUserArgs; DeviceUserArgs& m_hardwareDeviceUserArgs;
std::vector<HWDeviceReference> m_availableHWDevices; std::vector<HWDeviceReference> m_availableHWDevices;
QMap<QString, QString> m_argsByDeviceCopy;
void pushHWDeviceReference(const PluginInterface::SamplingDevice *samplingDevice); void pushHWDeviceReference(const PluginInterface::SamplingDevice *samplingDevice);
void displayArgsByDevice();
private slots: private slots:
void accept(); void accept();

35
sdrgui/gui/deviceuserargsdialog.ui
View File

@ -203,5 +203,38 @@
<resources> <resources>
<include location="../resources/res.qrc"/> <include location="../resources/res.qrc"/>
</resources> </resources>
<connections/> <connections>
<connection>
<sender>buttonBox</sender>
<signal>accepted()</signal>
<receiver>DeviceUserArgsDialog</receiver>
<slot>accept()</slot>
<hints>
<hint type="sourcelabel">
<x>240</x>
<y>441</y>
</hint>
<hint type="destinationlabel">
<x>238</x>
<y>230</y>
</hint>
</hints>
</connection>
<connection>
<sender>buttonBox</sender>
<signal>rejected()</signal>
<receiver>DeviceUserArgsDialog</receiver>
<slot>reject()</slot>
<hints>
<hint type="sourcelabel">
<x>240</x>
<y>441</y>
</hint>
<hint type="destinationlabel">
<x>238</x>
<y>230</y>
</hint>
</hints>
</connection>
</connections>
</ui> </ui>