From 41378fff0421c9b8093406ac624a942c1e2c9a41 Mon Sep 17 00:00:00 2001
From: f4exb <f4exb06@gmail.com>
Date: Wed, 22 Nov 2017 22:16:57 +0100
Subject: [PATCH] Web API: instanceDevices: added index in registered devices

---
 sdrgui/webapi/webapiadaptergui.cpp                 |  1 +
 swagger/sdrangel/api/swagger/swagger.yaml          |  4 +++-
 .../sdrangel/code/qt5/client/SWGDeviceListItem.cpp | 14 ++++++++++++++
 .../sdrangel/code/qt5/client/SWGDeviceListItem.h   |  4 ++++
 4 files changed, 22 insertions(+), 1 deletion(-)

diff --git a/sdrgui/webapi/webapiadaptergui.cpp b/sdrgui/webapi/webapiadaptergui.cpp
index a244e7e2e..f00859428 100644
--- a/sdrgui/webapi/webapiadaptergui.cpp
+++ b/sdrgui/webapi/webapiadaptergui.cpp
@@ -161,6 +161,7 @@ int WebAPIAdapterGUI::instanceDevices(
         devices->back()->setTx(!samplingDevice.rxElseTx);
         devices->back()->setNbStreams(samplingDevice.deviceNbItems);
         devices->back()->setDeviceSetIndex(samplingDevice.claimed);
+        devices->back()->setIndex(i);
     }
 
     return 200;
diff --git a/swagger/sdrangel/api/swagger/swagger.yaml b/swagger/sdrangel/api/swagger/swagger.yaml
index d5ad74d7b..b2f67d6b7 100644
--- a/swagger/sdrangel/api/swagger/swagger.yaml
+++ b/swagger/sdrangel/api/swagger/swagger.yaml
@@ -482,7 +482,6 @@ definitions:
     description: "Summarized information about attached hardware device"
     required:
       - hwType
-      
     properties:
       displayedName:
         description: "Displayable name that uniquely identifies this device instance"
@@ -508,6 +507,9 @@ definitions:
       deviceSetIndex: 
         description: "Index of the device set that claimed this device (-1 if not claimed)"
         type: integer
+      index: 
+        description: "Index of the device in the list of registered devices"
+        type: integer
   ChannelListItem:
     description: "Summarized information about channel plugin"
     required:
diff --git a/swagger/sdrangel/code/qt5/client/SWGDeviceListItem.cpp b/swagger/sdrangel/code/qt5/client/SWGDeviceListItem.cpp
index ed4213f93..11ba2ac4b 100644
--- a/swagger/sdrangel/code/qt5/client/SWGDeviceListItem.cpp
+++ b/swagger/sdrangel/code/qt5/client/SWGDeviceListItem.cpp
@@ -45,6 +45,7 @@ SWGDeviceListItem::init() {
     nb_streams = 0;
     stream_index = 0;
     device_set_index = 0;
+    index = 0;
 }
 
 void
@@ -66,6 +67,7 @@ SWGDeviceListItem::cleanup() {
 
 
 
+
 }
 
 SWGDeviceListItem*
@@ -87,6 +89,7 @@ SWGDeviceListItem::fromJsonObject(QJsonObject &pJson) {
     ::Swagger::setValue(&nb_streams, pJson["nbStreams"], "qint32", "");
     ::Swagger::setValue(&stream_index, pJson["streamIndex"], "qint32", "");
     ::Swagger::setValue(&device_set_index, pJson["deviceSetIndex"], "qint32", "");
+    ::Swagger::setValue(&index, pJson["index"], "qint32", "");
 }
 
 QString
@@ -119,6 +122,8 @@ SWGDeviceListItem::asJsonObject() {
 
     obj->insert("deviceSetIndex", QJsonValue(device_set_index));
 
+    obj->insert("index", QJsonValue(index));
+
     return obj;
 }
 
@@ -194,6 +199,15 @@ SWGDeviceListItem::setDeviceSetIndex(qint32 device_set_index) {
     this->device_set_index = device_set_index;
 }
 
+qint32
+SWGDeviceListItem::getIndex() {
+    return index;
+}
+void
+SWGDeviceListItem::setIndex(qint32 index) {
+    this->index = index;
+}
+
 
 }
 
diff --git a/swagger/sdrangel/code/qt5/client/SWGDeviceListItem.h b/swagger/sdrangel/code/qt5/client/SWGDeviceListItem.h
index 9d158913f..4fd9ac5b5 100644
--- a/swagger/sdrangel/code/qt5/client/SWGDeviceListItem.h
+++ b/swagger/sdrangel/code/qt5/client/SWGDeviceListItem.h
@@ -66,6 +66,9 @@ public:
     qint32 getDeviceSetIndex();
     void setDeviceSetIndex(qint32 device_set_index);
 
+    qint32 getIndex();
+    void setIndex(qint32 index);
+
 
 private:
     QString* displayed_name;
@@ -76,6 +79,7 @@ private:
     qint32 nb_streams;
     qint32 stream_index;
     qint32 device_set_index;
+    qint32 index;
 };
 
 }