mirror of
https://github.com/f4exb/sdrangel.git
synced 2024-09-28 15:56:33 -04:00
Web API: instanceDevices: added index in registered devices
This commit is contained in:
parent
8c3eeb1c3a
commit
41378fff04
@ -161,6 +161,7 @@ int WebAPIAdapterGUI::instanceDevices(
|
|||||||
devices->back()->setTx(!samplingDevice.rxElseTx);
|
devices->back()->setTx(!samplingDevice.rxElseTx);
|
||||||
devices->back()->setNbStreams(samplingDevice.deviceNbItems);
|
devices->back()->setNbStreams(samplingDevice.deviceNbItems);
|
||||||
devices->back()->setDeviceSetIndex(samplingDevice.claimed);
|
devices->back()->setDeviceSetIndex(samplingDevice.claimed);
|
||||||
|
devices->back()->setIndex(i);
|
||||||
}
|
}
|
||||||
|
|
||||||
return 200;
|
return 200;
|
||||||
|
@ -482,7 +482,6 @@ definitions:
|
|||||||
description: "Summarized information about attached hardware device"
|
description: "Summarized information about attached hardware device"
|
||||||
required:
|
required:
|
||||||
- hwType
|
- hwType
|
||||||
|
|
||||||
properties:
|
properties:
|
||||||
displayedName:
|
displayedName:
|
||||||
description: "Displayable name that uniquely identifies this device instance"
|
description: "Displayable name that uniquely identifies this device instance"
|
||||||
@ -508,6 +507,9 @@ definitions:
|
|||||||
deviceSetIndex:
|
deviceSetIndex:
|
||||||
description: "Index of the device set that claimed this device (-1 if not claimed)"
|
description: "Index of the device set that claimed this device (-1 if not claimed)"
|
||||||
type: integer
|
type: integer
|
||||||
|
index:
|
||||||
|
description: "Index of the device in the list of registered devices"
|
||||||
|
type: integer
|
||||||
ChannelListItem:
|
ChannelListItem:
|
||||||
description: "Summarized information about channel plugin"
|
description: "Summarized information about channel plugin"
|
||||||
required:
|
required:
|
||||||
|
@ -45,6 +45,7 @@ SWGDeviceListItem::init() {
|
|||||||
nb_streams = 0;
|
nb_streams = 0;
|
||||||
stream_index = 0;
|
stream_index = 0;
|
||||||
device_set_index = 0;
|
device_set_index = 0;
|
||||||
|
index = 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
void
|
void
|
||||||
@ -66,6 +67,7 @@ SWGDeviceListItem::cleanup() {
|
|||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
SWGDeviceListItem*
|
SWGDeviceListItem*
|
||||||
@ -87,6 +89,7 @@ SWGDeviceListItem::fromJsonObject(QJsonObject &pJson) {
|
|||||||
::Swagger::setValue(&nb_streams, pJson["nbStreams"], "qint32", "");
|
::Swagger::setValue(&nb_streams, pJson["nbStreams"], "qint32", "");
|
||||||
::Swagger::setValue(&stream_index, pJson["streamIndex"], "qint32", "");
|
::Swagger::setValue(&stream_index, pJson["streamIndex"], "qint32", "");
|
||||||
::Swagger::setValue(&device_set_index, pJson["deviceSetIndex"], "qint32", "");
|
::Swagger::setValue(&device_set_index, pJson["deviceSetIndex"], "qint32", "");
|
||||||
|
::Swagger::setValue(&index, pJson["index"], "qint32", "");
|
||||||
}
|
}
|
||||||
|
|
||||||
QString
|
QString
|
||||||
@ -119,6 +122,8 @@ SWGDeviceListItem::asJsonObject() {
|
|||||||
|
|
||||||
obj->insert("deviceSetIndex", QJsonValue(device_set_index));
|
obj->insert("deviceSetIndex", QJsonValue(device_set_index));
|
||||||
|
|
||||||
|
obj->insert("index", QJsonValue(index));
|
||||||
|
|
||||||
return obj;
|
return obj;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -194,6 +199,15 @@ SWGDeviceListItem::setDeviceSetIndex(qint32 device_set_index) {
|
|||||||
this->device_set_index = device_set_index;
|
this->device_set_index = device_set_index;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
qint32
|
||||||
|
SWGDeviceListItem::getIndex() {
|
||||||
|
return index;
|
||||||
|
}
|
||||||
|
void
|
||||||
|
SWGDeviceListItem::setIndex(qint32 index) {
|
||||||
|
this->index = index;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -66,6 +66,9 @@ public:
|
|||||||
qint32 getDeviceSetIndex();
|
qint32 getDeviceSetIndex();
|
||||||
void setDeviceSetIndex(qint32 device_set_index);
|
void setDeviceSetIndex(qint32 device_set_index);
|
||||||
|
|
||||||
|
qint32 getIndex();
|
||||||
|
void setIndex(qint32 index);
|
||||||
|
|
||||||
|
|
||||||
private:
|
private:
|
||||||
QString* displayed_name;
|
QString* displayed_name;
|
||||||
@ -76,6 +79,7 @@ private:
|
|||||||
qint32 nb_streams;
|
qint32 nb_streams;
|
||||||
qint32 stream_index;
|
qint32 stream_index;
|
||||||
qint32 device_set_index;
|
qint32 device_set_index;
|
||||||
|
qint32 index;
|
||||||
};
|
};
|
||||||
|
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user