From f9794c77019ad76d0f9ea4cf8b330759ec75ec29 Mon Sep 17 00:00:00 2001 From: f4exb Date: Wed, 6 Dec 2017 22:08:34 +0100 Subject: [PATCH] Web API: have /sdrangel/deviceset/{deviceSetIndex}/device/settings URL in its own right --- .../samplesource/filesource/CMakeLists.txt | 2 + sdrbase/resources/index.html | 1946 ++++++++--------- sdrbase/webapi/webapiadapterinterface.cpp | 1 + sdrbase/webapi/webapiadapterinterface.h | 7 +- sdrbase/webapi/webapirequestmapper.cpp | 47 +- sdrbase/webapi/webapirequestmapper.h | 3 + sdrgui/webapi/webapiadaptergui.cpp | 2 +- sdrgui/webapi/webapiadaptergui.h | 2 +- swagger/sdrangel/api/swagger/swagger.yaml | 6 +- swagger/sdrangel/code/html2/index.html | 1946 ++++++++--------- .../code/qt5/client/SWGDeviceSetApi.cpp | 2 +- .../qt5/client/SWGInstanceSummaryResponse.cpp | 17 - .../qt5/client/SWGInstanceSummaryResponse.h | 5 - .../code/qt5/client/SWGModelFactory.h | 4 - swagger/sdrangel/code/qt5/client/SWGUser.cpp | 109 - swagger/sdrangel/code/qt5/client/SWGUser.h | 59 - 16 files changed, 1989 insertions(+), 2169 deletions(-) delete mode 100644 swagger/sdrangel/code/qt5/client/SWGUser.cpp delete mode 100644 swagger/sdrangel/code/qt5/client/SWGUser.h diff --git a/plugins/samplesource/filesource/CMakeLists.txt b/plugins/samplesource/filesource/CMakeLists.txt index feb67eec2..f50b39413 100644 --- a/plugins/samplesource/filesource/CMakeLists.txt +++ b/plugins/samplesource/filesource/CMakeLists.txt @@ -1,5 +1,7 @@ project(filesource) +set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11") + set(filesource_SOURCES filesourcegui.cpp filesourceinput.cpp diff --git a/sdrbase/resources/index.html b/sdrbase/resources/index.html index 6c369aa7b..6f6f7db73 100644 --- a/sdrbase/resources/index.html +++ b/sdrbase/resources/index.html @@ -695,665 +695,651 @@ margin-bottom: 20px; @@ -1469,7 +1455,7 @@ margin-bottom: 20px;

Get device settings


-
/sdrangel/deviceset/{deviceSetIndex}/device
+
/sdrangel/deviceset/{deviceSetIndex}/device/settings

Usage and SDK Samples

@@ -1489,7 +1475,7 @@ margin-bottom: 20px;
-
curl -X GET "http://localhost:8091/sdrangel/deviceset/{deviceSetIndex}/device"
+
curl -X GET "http://localhost:8091/sdrangel/deviceset/{deviceSetIndex}/device/settings"
import SWGSDRangel.*;
@@ -1714,11 +1700,11 @@ except ApiException as e:
                                   
@@ -1469,7 +1455,7 @@ margin-bottom: 20px;

Get device settings


-
/sdrangel/deviceset/{deviceSetIndex}/device
+
/sdrangel/deviceset/{deviceSetIndex}/device/settings

Usage and SDK Samples

@@ -1489,7 +1475,7 @@ margin-bottom: 20px;
-
curl -X GET "http://localhost:8091/sdrangel/deviceset/{deviceSetIndex}/device"
+
curl -X GET "http://localhost:8091/sdrangel/deviceset/{deviceSetIndex}/device/settings"
import SWGSDRangel.*;
@@ -1714,11 +1700,11 @@ except ApiException as e: