VE7UWU/sdrangel
1
0
Fork 0
mirror of https://github.com/f4exb/sdrangel.git synced 2026-06-02 22:14:45 -04:00
Code Issues Projects Releases Wiki Activity

Device user arguments: implemented non discoverable devices specification in GUI

Browse Source
This commit is contained in:
f4exb
2019-12-15 00:19:50 +01:00
parent 4abeefff82
commit 8d2f65f967
5 changed files with 150 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files
sdrbase/device/deviceuserargs.cpp
+10 -8
View File
@@ -22,13 +22,13 @@
QDataStream &operator<<(QDataStream &ds, const DeviceUserArgs::Args &inObj)
{
ds << inObj.m_id << inObj.m_sequence << inObj.m_args;
ds << inObj.m_id << inObj.m_sequence << inObj.m_args << inObj.m_nonDiscoverable;
return ds;
}
QDataStream &operator>>(QDataStream &ds, DeviceUserArgs::Args &outObj)
{
ds >> outObj.m_id >> outObj.m_sequence >> outObj.m_args;
ds >> outObj.m_id >> outObj.m_sequence >> outObj.m_args >> outObj.m_nonDiscoverable;
return ds;
}
@@ -78,7 +78,7 @@ QString DeviceUserArgs::findUserArgs(const QString& id, int sequence)
return "";
}
void DeviceUserArgs::addDeviceArgs(const QString& id, int sequence, const QString& deviceArgs)
void DeviceUserArgs::addDeviceArgs(const QString& id, int sequence, const QString& deviceArgs, bool nonDiscoverable)
{
int i = 0;
@@ -90,11 +90,11 @@ void DeviceUserArgs::addDeviceArgs(const QString& id, int sequence, const QStrin
}
if (i == m_argsByDevice.size()) {
m_argsByDevice.push_back(Args(id, sequence, deviceArgs));
m_argsByDevice.push_back(Args(id, sequence, deviceArgs, nonDiscoverable));
}
}
void DeviceUserArgs::addOrUpdateDeviceArgs(const QString& id, int sequence, const QString& deviceArgs)
void DeviceUserArgs::addOrUpdateDeviceArgs(const QString& id, int sequence, const QString& deviceArgs, bool nonDiscoverable)
{
int i = 0;
@@ -106,18 +106,20 @@ void DeviceUserArgs::addOrUpdateDeviceArgs(const QString& id, int sequence, cons
}
if (i == m_argsByDevice.size()) {
m_argsByDevice.push_back(Args(id, sequence, deviceArgs));
m_argsByDevice.push_back(Args(id, sequence, deviceArgs, nonDiscoverable));
}
}
void DeviceUserArgs::updateDeviceArgs(const QString& id, int sequence, const QString& deviceArgs)
void DeviceUserArgs::updateDeviceArgs(const QString& id, int sequence, const QString& deviceArgs, bool nonDiscoverable)
{
int i = 0;
for (; i < m_argsByDevice.size(); i++)
{
if ((m_argsByDevice.at(i).m_id == id) && (m_argsByDevice.at(i).m_sequence == sequence)) {
if ((m_argsByDevice.at(i).m_id == id) && (m_argsByDevice.at(i).m_sequence == sequence))
{
m_argsByDevice[i].m_args = deviceArgs;
m_argsByDevice[i].m_nonDiscoverable = nonDiscoverable;
}
}
}