From 233c3f961d4a24924349722a0c82d053dda5c4cb Mon Sep 17 00:00:00 2001 From: f4exb Date: Tue, 3 May 2022 04:55:35 +0200 Subject: [PATCH] v7 API: removed instance feature set end points and some swagger generated code cleanup --- .../mod802.15.4/ieee_802_15_4_mod.cpp | 1 - plugins/channeltx/modpacket/packetmod.cpp | 1 - sdrbase/resources/webapi/doc/html2/index.html | 1079 +---------------- .../resources/webapi/doc/swagger/swagger.yaml | 68 +- sdrbase/webapi/webapiadapter.cpp | 69 +- sdrbase/webapi/webapiadapter.h | 13 - sdrbase/webapi/webapiadapterinterface.cpp | 2 - sdrbase/webapi/webapiadapterinterface.h | 2 - sdrbase/webapi/webapirequestmapper.cpp | 84 -- sdrbase/webapi/webapirequestmapper.h | 3 - swagger/sdrangel/api/swagger/swagger.yaml | 68 +- swagger/sdrangel/code/html2/index.html | 1079 +---------------- .../code/qt5/client/SWGAISModActions_tx.cpp | 110 -- .../code/qt5/client/SWGAISModActions_tx.h | 59 - .../qt5/client/SWGFeaturePresetTransfer.cpp | 133 -- .../qt5/client/SWGFeaturePresetTransfer.h | 65 - .../code/qt5/client/SWGFeatureSetApi.cpp | 104 -- .../code/qt5/client/SWGFeatureSetApi.h | 10 - .../code/qt5/client/SWGFeatureSetList.cpp | 137 --- .../code/qt5/client/SWGFeatureSetList.h | 66 - .../client/SWGIEEE_802_15_4_ModActions_tx.cpp | 110 -- .../client/SWGIEEE_802_15_4_ModActions_tx.h | 59 - .../code/qt5/client/SWGInstanceApi.cpp | 52 - .../sdrangel/code/qt5/client/SWGInstanceApi.h | 6 - .../qt5/client/SWGInstanceSummaryResponse.cpp | 32 +- .../qt5/client/SWGInstanceSummaryResponse.h | 10 +- .../code/qt5/client/SWGLRPTDemodSettings.cpp | 597 --------- .../code/qt5/client/SWGLRPTDemodSettings.h | 185 --- .../code/qt5/client/SWGMapActions_find.cpp | 110 -- .../code/qt5/client/SWGMapActions_find.h | 59 - .../code/qt5/client/SWGMapItem_track.cpp | 154 --- .../code/qt5/client/SWGMapItem_track.h | 70 -- .../code/qt5/client/SWGModelFactory.h | 6 - .../qt5/client/SWGPacketModActions_tx.cpp | 185 --- .../code/qt5/client/SWGPacketModActions_tx.h | 77 -- ...GVORLocalizerSettings_vorDemodChannels.cpp | 131 -- ...SWGVORLocalizerSettings_vorDemodChannels.h | 64 - 37 files changed, 33 insertions(+), 5027 deletions(-) delete mode 100644 swagger/sdrangel/code/qt5/client/SWGAISModActions_tx.cpp delete mode 100644 swagger/sdrangel/code/qt5/client/SWGAISModActions_tx.h delete mode 100644 swagger/sdrangel/code/qt5/client/SWGFeaturePresetTransfer.cpp delete mode 100644 swagger/sdrangel/code/qt5/client/SWGFeaturePresetTransfer.h delete mode 100644 swagger/sdrangel/code/qt5/client/SWGFeatureSetList.cpp delete mode 100644 swagger/sdrangel/code/qt5/client/SWGFeatureSetList.h delete mode 100644 swagger/sdrangel/code/qt5/client/SWGIEEE_802_15_4_ModActions_tx.cpp delete mode 100644 swagger/sdrangel/code/qt5/client/SWGIEEE_802_15_4_ModActions_tx.h delete mode 100644 swagger/sdrangel/code/qt5/client/SWGLRPTDemodSettings.cpp delete mode 100644 swagger/sdrangel/code/qt5/client/SWGLRPTDemodSettings.h delete mode 100644 swagger/sdrangel/code/qt5/client/SWGMapActions_find.cpp delete mode 100644 swagger/sdrangel/code/qt5/client/SWGMapActions_find.h delete mode 100644 swagger/sdrangel/code/qt5/client/SWGMapItem_track.cpp delete mode 100644 swagger/sdrangel/code/qt5/client/SWGMapItem_track.h delete mode 100644 swagger/sdrangel/code/qt5/client/SWGPacketModActions_tx.cpp delete mode 100644 swagger/sdrangel/code/qt5/client/SWGPacketModActions_tx.h delete mode 100644 swagger/sdrangel/code/qt5/client/SWGVORLocalizerSettings_vorDemodChannels.cpp delete mode 100644 swagger/sdrangel/code/qt5/client/SWGVORLocalizerSettings_vorDemodChannels.h diff --git a/plugins/channeltx/mod802.15.4/ieee_802_15_4_mod.cpp b/plugins/channeltx/mod802.15.4/ieee_802_15_4_mod.cpp index 592e7f94e..eb18df7ef 100644 --- a/plugins/channeltx/mod802.15.4/ieee_802_15_4_mod.cpp +++ b/plugins/channeltx/mod802.15.4/ieee_802_15_4_mod.cpp @@ -31,7 +31,6 @@ #include "SWGChannelActions.h" #include "SWGIEEE_802_15_4_ModReport.h" #include "SWGIEEE_802_15_4_ModActions.h" -#include "SWGIEEE_802_15_4_ModActions_tx.h" #include #include diff --git a/plugins/channeltx/modpacket/packetmod.cpp b/plugins/channeltx/modpacket/packetmod.cpp index d3f086bba..c11add032 100644 --- a/plugins/channeltx/modpacket/packetmod.cpp +++ b/plugins/channeltx/modpacket/packetmod.cpp @@ -31,7 +31,6 @@ #include "SWGChannelActions.h" #include "SWGPacketModReport.h" #include "SWGPacketModActions.h" -#include "SWGPacketModActions_tx.h" #include #include diff --git a/sdrbase/resources/webapi/doc/html2/index.html b/sdrbase/resources/webapi/doc/html2/index.html index 51fc25d47..b58b5a96e 100644 --- a/sdrbase/resources/webapi/doc/html2/index.html +++ b/sdrbase/resources/webapi/doc/html2/index.html @@ -5370,22 +5370,6 @@ margin-bottom: 20px; } }, "description" : "Grouping of features" -}; - defs.FeatureSetList = { - "required" : [ "featuresetcount" ], - "properties" : { - "featuresetcount" : { - "type" : "integer", - "description" : "Number of feature sets opened in this instance" - }, - "featureSets" : { - "type" : "array", - "items" : { - "$ref" : "#/definitions/FeatureSet" - } - } - }, - "description" : "List of feature sets opened in this instance" }; defs.FeatureSetPreset = { "properties" : { @@ -6867,8 +6851,8 @@ margin-bottom: 20px; "devicesetlist" : { "$ref" : "#/definitions/DeviceSetList" }, - "featuresetlist" : { - "$ref" : "#/definitions/FeatureSetList" + "featureset" : { + "$ref" : "#/definitions/FeatureSet" } }, "description" : "Summarized information about this SDRangel instance" @@ -14533,12 +14517,6 @@ margin-bottom: 20px;
  • featuresetPresetPut
    • -
  • - instanceFeatureSetDelete -
    • -
  • - instanceFeatureSetPost -
  • API Methods - Instance
  • instanceAMBEDevicesDelete @@ -14603,9 +14581,6 @@ margin-bottom: 20px;
  • instanceFeaturePresetGet
    • -
  • - instanceFeatureSetsGet -
  • instanceFeatures
    • @@ -36155,719 +36130,6 @@ $(document).ready(function() {
    -
    -
    -
    -

    instanceFeatureSetDelete

    -

    -
    -
    -
    -

    -

    Remove last feature set. The GUI version does not remove the first feature set.

    -

    -
    - 
    /sdrangel/featureset
    -

    -

    Usage and SDK Samples

    -

    - - -
    -
    - 
    curl -X DELETE "http://localhost/sdrangel/featureset"
    -
    -
    - 
    import SWGSDRangel.*;
-import SWGSDRangel.auth.*;
-import SWGSDRangel.model.*;
-import SWGSDRangel.api.FeatureSetApi;
-
-import java.io.File;
-import java.util.*;
-
-public class FeatureSetApiExample {
-
-    public static void main(String[] args) {
-        
-        FeatureSetApi apiInstance = new FeatureSetApi();
-        try {
-            SuccessResponse result = apiInstance.instanceFeatureSetDelete();
-            System.out.println(result);
-        } catch (ApiException e) {
-            System.err.println("Exception when calling FeatureSetApi#instanceFeatureSetDelete");
-            e.printStackTrace();
-        }
-    }
-}
    -
    - -
    - 
    import SWGSDRangel.api.FeatureSetApi;
-
-public class FeatureSetApiExample {
-
-    public static void main(String[] args) {
-        FeatureSetApi apiInstance = new FeatureSetApi();
-        try {
-            SuccessResponse result = apiInstance.instanceFeatureSetDelete();
-            System.out.println(result);
-        } catch (ApiException e) {
-            System.err.println("Exception when calling FeatureSetApi#instanceFeatureSetDelete");
-            e.printStackTrace();
-        }
-    }
-}
    -
    - -
    - 
    
-FeatureSetApi *apiInstance = [[FeatureSetApi alloc] init];
-
-[apiInstance instanceFeatureSetDeleteWithCompletionHandler: 
-              ^(SuccessResponse output, NSError* error) {
-                            if (output) {
-                                NSLog(@"%@", output);
-                            }
-                            if (error) {
-                                NSLog(@"Error: %@", error);
-                            }
-                        }];
-
    -
    - -
    - 
    var SdRangel = require('sd_rangel');
-
-var api = new SdRangel.FeatureSetApi()
-
-var callback = function(error, data, response) {
-  if (error) {
-    console.error(error);
-  } else {
-    console.log('API called successfully. Returned data: ' + data);
-  }
-};
-api.instanceFeatureSetDelete(callback);
-
    -
    - - -
    - 
    using System;
-using System.Diagnostics;
-using SWGSDRangel.Api;
-using SWGSDRangel.Client;
-using SWGSDRangel.Model;
-
-namespace Example
-{
-    public class instanceFeatureSetDeleteExample
-    {
-        public void main()
-        {
-            
-            var apiInstance = new FeatureSetApi();
-
-            try
-            {
-                SuccessResponse result = apiInstance.instanceFeatureSetDelete();
-                Debug.WriteLine(result);
-            }
-            catch (Exception e)
-            {
-                Debug.Print("Exception when calling FeatureSetApi.instanceFeatureSetDelete: " + e.Message );
-            }
-        }
-    }
-}
-
    -
    - -
    - 
    <?php
-require_once(__DIR__ . '/vendor/autoload.php');
-
-$api_instance = new Swagger\Client\Api\FeatureSetApi();
-
-try {
-    $result = $api_instance->instanceFeatureSetDelete();
-    print_r($result);
-} catch (Exception $e) {
-    echo 'Exception when calling FeatureSetApi->instanceFeatureSetDelete: ', $e->getMessage(), PHP_EOL;
-}
-?>
    -
    - -
    - 
    use Data::Dumper;
-use SWGSDRangel::Configuration;
-use SWGSDRangel::FeatureSetApi;
-
-my $api_instance = SWGSDRangel::FeatureSetApi->new();
-
-eval { 
-    my $result = $api_instance->instanceFeatureSetDelete();
-    print Dumper($result);
-};
-if ($@) {
-    warn "Exception when calling FeatureSetApi->instanceFeatureSetDelete: $@\n";
-}
    -
    - -
    - 
    from __future__ import print_statement
-import time
-import swagger_sdrangel
-from swagger_sdrangel.rest import ApiException
-from pprint import pprint
-
-# create an instance of the API class
-api_instance = swagger_sdrangel.FeatureSetApi()
-
-try: 
-    api_response = api_instance.instance_feature_set_delete()
-    pprint(api_response)
-except ApiException as e:
-    print("Exception when calling FeatureSetApi->instanceFeatureSetDelete: %s\n" % e)
    -
    -
    - -

    Parameters

    - - - - - - -

    Responses

    -

    Status: 202 - Message to remove last feature set was sent successfully

    - - - -
    -
    -
    - -
    - -
    -
    - -

    Status: 404 - No more feature sets to be deleted

    - - - -
    -
    -
    - -
    - -
    -
    - -

    Status: 500 - Error

    - - - -
    -
    -
    - -
    - -
    -
    - -

    Status: 501 - Function not implemented

    - - - -
    -
    -
    - -
    - -
    -
    - -
    -
    -
    -
    -
    -
    -

    instanceFeatureSetPost

    -

    -
    -
    -
    -

    -

    Add (append) a new feature set

    -

    -
    - 
    /sdrangel/featureset
    -

    -

    Usage and SDK Samples

    -

    - - -
    -
    - 
    curl -X POST "http://localhost/sdrangel/featureset"
    -
    -
    - 
    import SWGSDRangel.*;
-import SWGSDRangel.auth.*;
-import SWGSDRangel.model.*;
-import SWGSDRangel.api.FeatureSetApi;
-
-import java.io.File;
-import java.util.*;
-
-public class FeatureSetApiExample {
-
-    public static void main(String[] args) {
-        
-        FeatureSetApi apiInstance = new FeatureSetApi();
-        try {
-            SuccessResponse result = apiInstance.instanceFeatureSetPost();
-            System.out.println(result);
-        } catch (ApiException e) {
-            System.err.println("Exception when calling FeatureSetApi#instanceFeatureSetPost");
-            e.printStackTrace();
-        }
-    }
-}
    -
    - -
    - 
    import SWGSDRangel.api.FeatureSetApi;
-
-public class FeatureSetApiExample {
-
-    public static void main(String[] args) {
-        FeatureSetApi apiInstance = new FeatureSetApi();
-        try {
-            SuccessResponse result = apiInstance.instanceFeatureSetPost();
-            System.out.println(result);
-        } catch (ApiException e) {
-            System.err.println("Exception when calling FeatureSetApi#instanceFeatureSetPost");
-            e.printStackTrace();
-        }
-    }
-}
    -
    - -
    - 
    
-FeatureSetApi *apiInstance = [[FeatureSetApi alloc] init];
-
-[apiInstance instanceFeatureSetPostWithCompletionHandler: 
-              ^(SuccessResponse output, NSError* error) {
-                            if (output) {
-                                NSLog(@"%@", output);
-                            }
-                            if (error) {
-                                NSLog(@"Error: %@", error);
-                            }
-                        }];
-
    -
    - -
    - 
    var SdRangel = require('sd_rangel');
-
-var api = new SdRangel.FeatureSetApi()
-
-var callback = function(error, data, response) {
-  if (error) {
-    console.error(error);
-  } else {
-    console.log('API called successfully. Returned data: ' + data);
-  }
-};
-api.instanceFeatureSetPost(callback);
-
    -
    - - -
    - 
    using System;
-using System.Diagnostics;
-using SWGSDRangel.Api;
-using SWGSDRangel.Client;
-using SWGSDRangel.Model;
-
-namespace Example
-{
-    public class instanceFeatureSetPostExample
-    {
-        public void main()
-        {
-            
-            var apiInstance = new FeatureSetApi();
-
-            try
-            {
-                SuccessResponse result = apiInstance.instanceFeatureSetPost();
-                Debug.WriteLine(result);
-            }
-            catch (Exception e)
-            {
-                Debug.Print("Exception when calling FeatureSetApi.instanceFeatureSetPost: " + e.Message );
-            }
-        }
-    }
-}
-
    -
    - -
    - 
    <?php
-require_once(__DIR__ . '/vendor/autoload.php');
-
-$api_instance = new Swagger\Client\Api\FeatureSetApi();
-
-try {
-    $result = $api_instance->instanceFeatureSetPost();
-    print_r($result);
-} catch (Exception $e) {
-    echo 'Exception when calling FeatureSetApi->instanceFeatureSetPost: ', $e->getMessage(), PHP_EOL;
-}
-?>
    -
    - -
    - 
    use Data::Dumper;
-use SWGSDRangel::Configuration;
-use SWGSDRangel::FeatureSetApi;
-
-my $api_instance = SWGSDRangel::FeatureSetApi->new();
-
-eval { 
-    my $result = $api_instance->instanceFeatureSetPost();
-    print Dumper($result);
-};
-if ($@) {
-    warn "Exception when calling FeatureSetApi->instanceFeatureSetPost: $@\n";
-}
    -
    - -
    - 
    from __future__ import print_statement
-import time
-import swagger_sdrangel
-from swagger_sdrangel.rest import ApiException
-from pprint import pprint
-
-# create an instance of the API class
-api_instance = swagger_sdrangel.FeatureSetApi()
-
-try: 
-    api_response = api_instance.instance_feature_set_post()
-    pprint(api_response)
-except ApiException as e:
-    print("Exception when calling FeatureSetApi->instanceFeatureSetPost: %s\n" % e)
    -
    -
    - -

    Parameters

    - - - - - - -

    Responses

    -

    Status: 202 - Message to add a new feature set was sent successfully

    - - - -
    -
    -
    - -
    - -
    -
    - -

    Status: 500 - Error

    - - - -
    -
    -
    - -
    - -
    -
    - -

    Status: 501 - Function not implemented

    - - - -
    -
    -
    - -
    - -
    -
    - -
    -
    -

    Instance

    @@ -44751,341 +44013,6 @@ except ApiException as e:
    -
    -
    -
    -

    instanceFeatureSetsGet

    -

    -
    -
    -
    -

    -

    Get summary information about feature sets opened in the instance

    -

    -
    - 
    /sdrangel/featuresets
    -

    -

    Usage and SDK Samples

    -

    - - -
    -
    - 
    curl -X GET "http://localhost/sdrangel/featuresets"
    -
    -
    - 
    import SWGSDRangel.*;
-import SWGSDRangel.auth.*;
-import SWGSDRangel.model.*;
-import SWGSDRangel.api.InstanceApi;
-
-import java.io.File;
-import java.util.*;
-
-public class InstanceApiExample {
-
-    public static void main(String[] args) {
-        
-        InstanceApi apiInstance = new InstanceApi();
-        try {
-            FeatureSetList result = apiInstance.instanceFeatureSetsGet();
-            System.out.println(result);
-        } catch (ApiException e) {
-            System.err.println("Exception when calling InstanceApi#instanceFeatureSetsGet");
-            e.printStackTrace();
-        }
-    }
-}
    -
    - -
    - 
    import SWGSDRangel.api.InstanceApi;
-
-public class InstanceApiExample {
-
-    public static void main(String[] args) {
-        InstanceApi apiInstance = new InstanceApi();
-        try {
-            FeatureSetList result = apiInstance.instanceFeatureSetsGet();
-            System.out.println(result);
-        } catch (ApiException e) {
-            System.err.println("Exception when calling InstanceApi#instanceFeatureSetsGet");
-            e.printStackTrace();
-        }
-    }
-}
    -
    - -
    - 
    
-InstanceApi *apiInstance = [[InstanceApi alloc] init];
-
-[apiInstance instanceFeatureSetsGetWithCompletionHandler: 
-              ^(FeatureSetList output, NSError* error) {
-                            if (output) {
-                                NSLog(@"%@", output);
-                            }
-                            if (error) {
-                                NSLog(@"Error: %@", error);
-                            }
-                        }];
-
    -
    - -
    - 
    var SdRangel = require('sd_rangel');
-
-var api = new SdRangel.InstanceApi()
-
-var callback = function(error, data, response) {
-  if (error) {
-    console.error(error);
-  } else {
-    console.log('API called successfully. Returned data: ' + data);
-  }
-};
-api.instanceFeatureSetsGet(callback);
-
    -
    - - -
    - 
    using System;
-using System.Diagnostics;
-using SWGSDRangel.Api;
-using SWGSDRangel.Client;
-using SWGSDRangel.Model;
-
-namespace Example
-{
-    public class instanceFeatureSetsGetExample
-    {
-        public void main()
-        {
-            
-            var apiInstance = new InstanceApi();
-
-            try
-            {
-                FeatureSetList result = apiInstance.instanceFeatureSetsGet();
-                Debug.WriteLine(result);
-            }
-            catch (Exception e)
-            {
-                Debug.Print("Exception when calling InstanceApi.instanceFeatureSetsGet: " + e.Message );
-            }
-        }
-    }
-}
-
    -
    - -
    - 
    <?php
-require_once(__DIR__ . '/vendor/autoload.php');
-
-$api_instance = new Swagger\Client\Api\InstanceApi();
-
-try {
-    $result = $api_instance->instanceFeatureSetsGet();
-    print_r($result);
-} catch (Exception $e) {
-    echo 'Exception when calling InstanceApi->instanceFeatureSetsGet: ', $e->getMessage(), PHP_EOL;
-}
-?>
    -
    - -
    - 
    use Data::Dumper;
-use SWGSDRangel::Configuration;
-use SWGSDRangel::InstanceApi;
-
-my $api_instance = SWGSDRangel::InstanceApi->new();
-
-eval { 
-    my $result = $api_instance->instanceFeatureSetsGet();
-    print Dumper($result);
-};
-if ($@) {
-    warn "Exception when calling InstanceApi->instanceFeatureSetsGet: $@\n";
-}
    -
    - -
    - 
    from __future__ import print_statement
-import time
-import swagger_sdrangel
-from swagger_sdrangel.rest import ApiException
-from pprint import pprint
-
-# create an instance of the API class
-api_instance = swagger_sdrangel.InstanceApi()
-
-try: 
-    api_response = api_instance.instance_feature_sets_get()
-    pprint(api_response)
-except ApiException as e:
-    print("Exception when calling InstanceApi->instanceFeatureSetsGet: %s\n" % e)
    -
    -
    - -

    Parameters

    - - - - - - -

    Responses

    -

    Status: 200 - On success return feature set list

    - - - -
    -
    -
    - -
    - -
    -
    - -

    Status: 500 - Error

    - - - -
    -
    -
    - -
    - -
    -
    - -

    Status: 501 - Function not implemented

    - - - -
    -
    -
    - -
    - -
    -
    - -
    -
    -
    @@ -52469,7 +51396,7 @@ except ApiException as e:
    - Generated 2022-05-01T22:14:53.451+02:00 + Generated 2022-05-03T04:22:59.079+02:00
    diff --git a/sdrbase/resources/webapi/doc/swagger/swagger.yaml b/sdrbase/resources/webapi/doc/swagger/swagger.yaml index 610404a6f..28a7afef6 100644 --- a/sdrbase/resources/webapi/doc/swagger/swagger.yaml +++ b/sdrbase/resources/webapi/doc/swagger/swagger.yaml @@ -951,23 +951,6 @@ paths: "501": $ref: "#/responses/Response_501" - /sdrangel/featuresets: - x-swagger-router-controller: instance - get: - description: Get summary information about feature sets opened in the instance - operationId: instanceFeatureSetsGet - tags: - - Instance - responses: - "200": - description: On success return feature set list - schema: - $ref: "#/definitions/FeatureSetList" - "500": - $ref: "#/responses/Response_500" - "501": - $ref: "#/responses/Response_501" - /sdrangel/deviceset: x-swagger-router-controller: instance post: @@ -1941,41 +1924,6 @@ paths: "501": $ref: "#/responses/Response_501" - /sdrangel/featureset: - x-swagger-router-controller: instance - post: - description: Add (append) a new feature set - operationId: instanceFeatureSetPost - tags: - - FeatureSet - responses: - "202": - description: Message to add a new feature set was sent successfully - schema: - $ref: "#/definitions/SuccessResponse" - "500": - $ref: "#/responses/Response_500" - "501": - $ref: "#/responses/Response_501" - delete: - description: Remove last feature set. The GUI version does not remove the first feature set. - operationId: instanceFeatureSetDelete - tags: - - FeatureSet - responses: - "202": - description: Message to remove last feature set was sent successfully - schema: - $ref: "#/definitions/SuccessResponse" - "404": - description: "No more feature sets to be deleted" - schema: - $ref: "#/definitions/ErrorResponse" - "500": - $ref: "#/responses/Response_500" - "501": - $ref: "#/responses/Response_501" - /sdrangel/featureset/{featureSetIndex}: x-swagger-router-controller: featureset get: @@ -2532,8 +2480,8 @@ definitions: $ref: "#/definitions/LoggingInfo" devicesetlist: $ref: "#/definitions/DeviceSetList" - featuresetlist: - $ref: "#/definitions/FeatureSetList" + featureset: + $ref: "#/definitions/FeatureSet" InstanceConfigResponse: description: Preferences, Presets and Commands of the MainSettings saved by Qt @@ -2773,18 +2721,6 @@ definitions: type: array items: $ref: "#/definitions/Feature" - FeatureSetList: - description: "List of feature sets opened in this instance" - required: - - featuresetcount - properties: - featuresetcount: - description: "Number of feature sets opened in this instance" - type: integer - featureSets: - type: array - items: - $ref: "#/definitions/FeatureSet" SpectrumServer: description: "Spectrum server state" diff --git a/sdrbase/webapi/webapiadapter.cpp b/sdrbase/webapi/webapiadapter.cpp index c3266425f..133f9d386 100644 --- a/sdrbase/webapi/webapiadapter.cpp +++ b/sdrbase/webapi/webapiadapter.cpp @@ -75,8 +75,6 @@ #include "SWGFeaturePresetGroup.h" #include "SWGFeaturePresetItem.h" #include "SWGFeaturePresetIdentifier.h" -#include "SWGFeaturePresetTransfer.h" -#include "SWGFeatureSetList.h" #include "SWGFeatureSettings.h" #include "SWGFeatureReport.h" #include "SWGFeatureActions.h" @@ -127,8 +125,8 @@ int WebAPIAdapter::instanceSummary( SWGSDRangel::SWGDeviceSetList *deviceSetList = response.getDevicesetlist(); getDeviceSetList(deviceSetList); - SWGSDRangel::SWGFeatureSetList *featureSetList = response.getFeaturesetlist(); - getFeatureSetList(featureSetList); + SWGSDRangel::SWGFeatureSet *featureSet = response.getFeatureset(); + getFeatureSet(featureSet, m_mainCore->m_featureSets.back(), 0); return 200; } @@ -1489,15 +1487,6 @@ int WebAPIAdapter::instanceDeviceSetsGet( return 200; } -int WebAPIAdapter::instanceFeatureSetsGet( - SWGSDRangel::SWGFeatureSetList& response, - SWGSDRangel::SWGErrorResponse& error) -{ - (void) error; - getFeatureSetList(&response); - return 200; -} - int WebAPIAdapter::instanceDeviceSetPost( int direction, SWGSDRangel::SWGSuccessResponse& response, @@ -1538,45 +1527,6 @@ int WebAPIAdapter::instanceDeviceSetDelete( } } -int WebAPIAdapter::instanceFeatureSetPost( - SWGSDRangel::SWGSuccessResponse& response, - SWGSDRangel::SWGErrorResponse& error) -{ - (void) error; - MainCore::MsgAddFeatureSet *msg = MainCore::MsgAddFeatureSet::create(); - m_mainCore->m_mainMessageQueue->push(msg); - - response.init(); - *response.getMessage() = QString("Message to add a new feature set (MsgAddFeatureSet) was submitted successfully"); - - return 202; -} - -int WebAPIAdapter::instanceFeatureSetDelete( - SWGSDRangel::SWGSuccessResponse& response, - SWGSDRangel::SWGErrorResponse& error) -{ - unsigned int minFeatureSets = QCoreApplication::applicationName() == "SDRangelSrv" ? 0 : 1; - - if (m_mainCore->m_featureSets.size() > minFeatureSets) - { - MainCore::MsgRemoveLastFeatureSet *msg = MainCore::MsgRemoveLastFeatureSet::create(); - m_mainCore->m_mainMessageQueue->push(msg); - - response.init(); - *response.getMessage() = QString("Message to remove last feature set (MsgRemoveLastFeatureSet) was submitted successfully"); - - return 202; - } - else - { - error.init(); - *error.getMessage() = "No more feature sets to be removed"; - - return 404; - } -} - int WebAPIAdapter::devicesetGet( int deviceSetIndex, SWGSDRangel::SWGDeviceSet& response, @@ -3746,21 +3696,6 @@ int WebAPIAdapter::featuresetGet( } } -void WebAPIAdapter::getFeatureSetList(SWGSDRangel::SWGFeatureSetList* featureSetList) -{ - featureSetList->init(); - featureSetList->setFeaturesetcount((int) m_mainCore->m_featureSets.size()); - - std::vector::const_iterator it = m_mainCore->m_featureSets.begin(); - - for (int i = 0; it != m_mainCore->m_featureSets.end(); ++it, i++) - { - QList *featureSets = featureSetList->getFeatureSets(); - featureSets->append(new SWGSDRangel::SWGFeatureSet()); - getFeatureSet(featureSets->back(), *it, i); - } -} - void WebAPIAdapter::getFeatureSet(SWGSDRangel::SWGFeatureSet *swgFeatureSet, const FeatureSet* featureSet, int featureSetIndex) { swgFeatureSet->init(); diff --git a/sdrbase/webapi/webapiadapter.h b/sdrbase/webapi/webapiadapter.h index 0a80e437f..5dbfdb511 100644 --- a/sdrbase/webapi/webapiadapter.h +++ b/sdrbase/webapi/webapiadapter.h @@ -207,10 +207,6 @@ public: SWGSDRangel::SWGDeviceSetList& response, SWGSDRangel::SWGErrorResponse& error); - virtual int instanceFeatureSetsGet( - SWGSDRangel::SWGFeatureSetList& response, - SWGSDRangel::SWGErrorResponse& error); - virtual int instanceDeviceSetPost( int direction, SWGSDRangel::SWGSuccessResponse& response, @@ -220,14 +216,6 @@ public: SWGSDRangel::SWGSuccessResponse& response, SWGSDRangel::SWGErrorResponse& error); - virtual int instanceFeatureSetPost( - SWGSDRangel::SWGSuccessResponse& response, - SWGSDRangel::SWGErrorResponse& error); - - virtual int instanceFeatureSetDelete( - SWGSDRangel::SWGSuccessResponse& response, - SWGSDRangel::SWGErrorResponse& error); - virtual int devicesetGet( int deviceSetIndex, SWGSDRangel::SWGDeviceSet& response, @@ -457,7 +445,6 @@ private: void getDeviceSetList(SWGSDRangel::SWGDeviceSetList* deviceSetList); void getDeviceSet(SWGSDRangel::SWGDeviceSet *swgDeviceSet, const DeviceSet* deviceSet, int deviceSetIndex); void getChannelsDetail(SWGSDRangel::SWGChannelsDetail *channelsDetail, const DeviceSet* deviceSet); - void getFeatureSetList(SWGSDRangel::SWGFeatureSetList* featureSetList); void getFeatureSet(SWGSDRangel::SWGFeatureSet *swgFeatureSet, const FeatureSet* featureSet, int featureSetIndex); static QtMsgType getMsgTypeFromString(const QString& msgTypeString); static void getMsgTypeString(const QtMsgType& msgType, QString& level); diff --git a/sdrbase/webapi/webapiadapterinterface.cpp b/sdrbase/webapi/webapiadapterinterface.cpp index 2b6d30743..a62cce066 100644 --- a/sdrbase/webapi/webapiadapterinterface.cpp +++ b/sdrbase/webapi/webapiadapterinterface.cpp @@ -44,8 +44,6 @@ QString WebAPIAdapterInterface::instanceFeaturePresetsURL = "/sdrangel/featurepr QString WebAPIAdapterInterface::instanceFeaturePresetURL = "/sdrangel/featurepreset"; QString WebAPIAdapterInterface::instanceDeviceSetsURL = "/sdrangel/devicesets"; QString WebAPIAdapterInterface::instanceDeviceSetURL = "/sdrangel/deviceset"; -QString WebAPIAdapterInterface::instanceFeatureSetsURL = "/sdrangel/featuresets"; -QString WebAPIAdapterInterface::instanceFeatureSetURL = "/sdrangel/featureset"; std::regex WebAPIAdapterInterface::devicesetURLRe("^/sdrangel/deviceset/([0-9]{1,2})$"); std::regex WebAPIAdapterInterface::devicesetFocusURLRe("^/sdrangel/deviceset/([0-9]{1,2})/focus$"); diff --git a/sdrbase/webapi/webapiadapterinterface.h b/sdrbase/webapi/webapiadapterinterface.h index 88cd9d121..28807661e 100644 --- a/sdrbase/webapi/webapiadapterinterface.h +++ b/sdrbase/webapi/webapiadapterinterface.h @@ -1472,8 +1472,6 @@ public: static QString instanceFeaturePresetURL; static QString instanceDeviceSetsURL; static QString instanceDeviceSetURL; - static QString instanceFeatureSetsURL; - static QString instanceFeatureSetURL; static std::regex devicesetURLRe; static std::regex devicesetFocusURLRe; static std::regex devicesetSpectrumSettingsURLRe; diff --git a/sdrbase/webapi/webapirequestmapper.cpp b/sdrbase/webapi/webapirequestmapper.cpp index ad7abb888..13f49a939 100644 --- a/sdrbase/webapi/webapirequestmapper.cpp +++ b/sdrbase/webapi/webapirequestmapper.cpp @@ -55,8 +55,6 @@ #include "SWGErrorResponse.h" #include "SWGFeaturePresets.h" #include "SWGFeaturePresetIdentifier.h" -#include "SWGFeaturePresetTransfer.h" -#include "SWGFeatureSetList.h" #include "SWGFeatureSettings.h" #include "SWGFeatureReport.h" #include "SWGFeatureActions.h" @@ -161,10 +159,6 @@ void WebAPIRequestMapper::service(qtwebapp::HttpRequest& request, qtwebapp::Http instanceDeviceSetsService(request, response); } else if (path == WebAPIAdapterInterface::instanceDeviceSetURL) { instanceDeviceSetService(request, response); - } else if (path == WebAPIAdapterInterface::instanceFeatureSetsURL) { - instanceFeatureSetsService(request, response); - } else if (path == WebAPIAdapterInterface::instanceFeatureSetURL) { - instanceFeatureSetService(request, response); } else { @@ -1475,33 +1469,6 @@ void WebAPIRequestMapper::instanceDeviceSetsService(qtwebapp::HttpRequest& reque } } -void WebAPIRequestMapper::instanceFeatureSetsService(qtwebapp::HttpRequest& request, qtwebapp::HttpResponse& response) -{ - SWGSDRangel::SWGErrorResponse errorResponse; - response.setHeader("Content-Type", "application/json"); - response.setHeader("Access-Control-Allow-Origin", "*"); - - if (request.getMethod() == "GET") - { - SWGSDRangel::SWGFeatureSetList normalResponse; - int status = m_adapter->instanceFeatureSetsGet(normalResponse, errorResponse); - response.setStatus(status); - - if (status/100 == 2) { - response.write(normalResponse.asJson().toUtf8()); - } else { - response.write(errorResponse.asJson().toUtf8()); - } - } - else - { - response.setStatus(405,"Invalid HTTP method"); - errorResponse.init(); - *errorResponse.getMessage() = "Invalid HTTP method"; - response.write(errorResponse.asJson().toUtf8()); - } -} - void WebAPIRequestMapper::instanceDeviceSetService(qtwebapp::HttpRequest& request, qtwebapp::HttpResponse& response) { SWGSDRangel::SWGErrorResponse errorResponse; @@ -1553,46 +1520,6 @@ void WebAPIRequestMapper::instanceDeviceSetService(qtwebapp::HttpRequest& reques } } -void WebAPIRequestMapper::instanceFeatureSetService(qtwebapp::HttpRequest& request, qtwebapp::HttpResponse& response) -{ - SWGSDRangel::SWGErrorResponse errorResponse; - response.setHeader("Content-Type", "application/json"); - response.setHeader("Access-Control-Allow-Origin", "*"); - - if (request.getMethod() == "POST") - { - SWGSDRangel::SWGSuccessResponse normalResponse; - - int status = m_adapter->instanceFeatureSetPost(normalResponse, errorResponse); - response.setStatus(status); - - if (status/100 == 2) { - response.write(normalResponse.asJson().toUtf8()); - } else { - response.write(errorResponse.asJson().toUtf8()); - } - } - else if (request.getMethod() == "DELETE") - { - SWGSDRangel::SWGSuccessResponse normalResponse; - int status = m_adapter->instanceFeatureSetDelete(normalResponse, errorResponse); - response.setStatus(status); - - if (status/100 == 2) { - response.write(normalResponse.asJson().toUtf8()); - } else { - response.write(errorResponse.asJson().toUtf8()); - } - } - else - { - response.setStatus(405,"Invalid HTTP method"); - errorResponse.init(); - *errorResponse.getMessage() = "Invalid HTTP method"; - response.write(errorResponse.asJson().toUtf8()); - } -} - void WebAPIRequestMapper::devicesetService(const std::string& indexStr, qtwebapp::HttpRequest& request, qtwebapp::HttpResponse& response) { SWGSDRangel::SWGErrorResponse errorResponse; @@ -3216,17 +3143,6 @@ bool WebAPIRequestMapper::validatePresetIdentifer(SWGSDRangel::SWGPresetIdentifi return (presetIdentifier.getGroupName() && presetIdentifier.getName() && presetIdentifier.getType()); } -bool WebAPIRequestMapper::validateFeaturePresetTransfer(SWGSDRangel::SWGFeaturePresetTransfer& presetTransfer) -{ - SWGSDRangel::SWGFeaturePresetIdentifier *presetIdentifier = presetTransfer.getPreset(); - - if (presetIdentifier == 0) { - return false; - } - - return validateFeaturePresetIdentifer(*presetIdentifier); -} - bool WebAPIRequestMapper::validateFeaturePresetIdentifer(SWGSDRangel::SWGFeaturePresetIdentifier& presetIdentifier) { return (presetIdentifier.getGroupName() && presetIdentifier.getDescription()); diff --git a/sdrbase/webapi/webapirequestmapper.h b/sdrbase/webapi/webapirequestmapper.h index babd977a8..454472d06 100644 --- a/sdrbase/webapi/webapirequestmapper.h +++ b/sdrbase/webapi/webapirequestmapper.h @@ -80,8 +80,6 @@ private: void instanceFeaturePresetService(qtwebapp::HttpRequest& request, qtwebapp::HttpResponse& response); void instanceDeviceSetsService(qtwebapp::HttpRequest& request, qtwebapp::HttpResponse& response); void instanceDeviceSetService(qtwebapp::HttpRequest& request, qtwebapp::HttpResponse& response); - void instanceFeatureSetsService(qtwebapp::HttpRequest& request, qtwebapp::HttpResponse& response); - void instanceFeatureSetService(qtwebapp::HttpRequest& request, qtwebapp::HttpResponse& response); void devicesetService(const std::string& indexStr, qtwebapp::HttpRequest& request, qtwebapp::HttpResponse& response); void devicesetFocusService(const std::string& indexStr, qtwebapp::HttpRequest& request, qtwebapp::HttpResponse& response); @@ -118,7 +116,6 @@ private: bool validateDeviceActions(SWGSDRangel::SWGDeviceActions& deviceActions, QJsonObject& jsonObject, QStringList& deviceActionsKeys); bool validateChannelSettings(SWGSDRangel::SWGChannelSettings& channelSettings, QJsonObject& jsonObject, QStringList& channelSettingsKeys); bool validateChannelActions(SWGSDRangel::SWGChannelActions& channelActions, QJsonObject& jsonObject, QStringList& channelActionsKeys); - bool validateFeaturePresetTransfer(SWGSDRangel::SWGFeaturePresetTransfer& presetTransfer); bool validateFeaturePresetIdentifer(SWGSDRangel::SWGFeaturePresetIdentifier& presetIdentifier); bool validateFeatureSettings(SWGSDRangel::SWGFeatureSettings& featureSettings, QJsonObject& jsonObject, QStringList& featureSettingsKeys); bool validateFeatureActions(SWGSDRangel::SWGFeatureActions& featureActions, QJsonObject& jsonObject, QStringList& featureActionsKeys); diff --git a/swagger/sdrangel/api/swagger/swagger.yaml b/swagger/sdrangel/api/swagger/swagger.yaml index 06c590fee..2b9b5087d 100644 --- a/swagger/sdrangel/api/swagger/swagger.yaml +++ b/swagger/sdrangel/api/swagger/swagger.yaml @@ -951,23 +951,6 @@ paths: "501": $ref: "#/responses/Response_501" - /sdrangel/featuresets: - x-swagger-router-controller: instance - get: - description: Get summary information about feature sets opened in the instance - operationId: instanceFeatureSetsGet - tags: - - Instance - responses: - "200": - description: On success return feature set list - schema: - $ref: "#/definitions/FeatureSetList" - "500": - $ref: "#/responses/Response_500" - "501": - $ref: "#/responses/Response_501" - /sdrangel/deviceset: x-swagger-router-controller: instance post: @@ -1941,41 +1924,6 @@ paths: "501": $ref: "#/responses/Response_501" - /sdrangel/featureset: - x-swagger-router-controller: instance - post: - description: Add (append) a new feature set - operationId: instanceFeatureSetPost - tags: - - FeatureSet - responses: - "202": - description: Message to add a new feature set was sent successfully - schema: - $ref: "#/definitions/SuccessResponse" - "500": - $ref: "#/responses/Response_500" - "501": - $ref: "#/responses/Response_501" - delete: - description: Remove last feature set. The GUI version does not remove the first feature set. - operationId: instanceFeatureSetDelete - tags: - - FeatureSet - responses: - "202": - description: Message to remove last feature set was sent successfully - schema: - $ref: "#/definitions/SuccessResponse" - "404": - description: "No more feature sets to be deleted" - schema: - $ref: "#/definitions/ErrorResponse" - "500": - $ref: "#/responses/Response_500" - "501": - $ref: "#/responses/Response_501" - /sdrangel/featureset/{featureSetIndex}: x-swagger-router-controller: featureset get: @@ -2532,8 +2480,8 @@ definitions: $ref: "#/definitions/LoggingInfo" devicesetlist: $ref: "#/definitions/DeviceSetList" - featuresetlist: - $ref: "#/definitions/FeatureSetList" + featureset: + $ref: "#/definitions/FeatureSet" InstanceConfigResponse: description: Preferences, Presets and Commands of the MainSettings saved by Qt @@ -2773,18 +2721,6 @@ definitions: type: array items: $ref: "#/definitions/Feature" - FeatureSetList: - description: "List of feature sets opened in this instance" - required: - - featuresetcount - properties: - featuresetcount: - description: "Number of feature sets opened in this instance" - type: integer - featureSets: - type: array - items: - $ref: "#/definitions/FeatureSet" SpectrumServer: description: "Spectrum server state" diff --git a/swagger/sdrangel/code/html2/index.html b/swagger/sdrangel/code/html2/index.html index 51fc25d47..b58b5a96e 100644 --- a/swagger/sdrangel/code/html2/index.html +++ b/swagger/sdrangel/code/html2/index.html @@ -5370,22 +5370,6 @@ margin-bottom: 20px; } }, "description" : "Grouping of features" -}; - defs.FeatureSetList = { - "required" : [ "featuresetcount" ], - "properties" : { - "featuresetcount" : { - "type" : "integer", - "description" : "Number of feature sets opened in this instance" - }, - "featureSets" : { - "type" : "array", - "items" : { - "$ref" : "#/definitions/FeatureSet" - } - } - }, - "description" : "List of feature sets opened in this instance" }; defs.FeatureSetPreset = { "properties" : { @@ -6867,8 +6851,8 @@ margin-bottom: 20px; "devicesetlist" : { "$ref" : "#/definitions/DeviceSetList" }, - "featuresetlist" : { - "$ref" : "#/definitions/FeatureSetList" + "featureset" : { + "$ref" : "#/definitions/FeatureSet" } }, "description" : "Summarized information about this SDRangel instance" @@ -14533,12 +14517,6 @@ margin-bottom: 20px;
  • featuresetPresetPut
    • -
  • - instanceFeatureSetDelete -
    • -
  • - instanceFeatureSetPost -
  • API Methods - Instance
  • instanceAMBEDevicesDelete @@ -14603,9 +14581,6 @@ margin-bottom: 20px;
  • instanceFeaturePresetGet
    • -
  • - instanceFeatureSetsGet -
  • instanceFeatures
    • @@ -36155,719 +36130,6 @@ $(document).ready(function() {
    -
    -
    -
    -

    instanceFeatureSetDelete

    -

    -
    -
    -
    -

    -

    Remove last feature set. The GUI version does not remove the first feature set.

    -

    -
    - 
    /sdrangel/featureset
    -

    -

    Usage and SDK Samples

    -

    - - -
    -
    - 
    curl -X DELETE "http://localhost/sdrangel/featureset"
    -
    -
    - 
    import SWGSDRangel.*;
-import SWGSDRangel.auth.*;
-import SWGSDRangel.model.*;
-import SWGSDRangel.api.FeatureSetApi;
-
-import java.io.File;
-import java.util.*;
-
-public class FeatureSetApiExample {
-
-    public static void main(String[] args) {
-        
-        FeatureSetApi apiInstance = new FeatureSetApi();
-        try {
-            SuccessResponse result = apiInstance.instanceFeatureSetDelete();
-            System.out.println(result);
-        } catch (ApiException e) {
-            System.err.println("Exception when calling FeatureSetApi#instanceFeatureSetDelete");
-            e.printStackTrace();
-        }
-    }
-}
    -
    - -
    - 
    import SWGSDRangel.api.FeatureSetApi;
-
-public class FeatureSetApiExample {
-
-    public static void main(String[] args) {
-        FeatureSetApi apiInstance = new FeatureSetApi();
-        try {
-            SuccessResponse result = apiInstance.instanceFeatureSetDelete();
-            System.out.println(result);
-        } catch (ApiException e) {
-            System.err.println("Exception when calling FeatureSetApi#instanceFeatureSetDelete");
-            e.printStackTrace();
-        }
-    }
-}
    -
    - -
    - 
    
-FeatureSetApi *apiInstance = [[FeatureSetApi alloc] init];
-
-[apiInstance instanceFeatureSetDeleteWithCompletionHandler: 
-              ^(SuccessResponse output, NSError* error) {
-                            if (output) {
-                                NSLog(@"%@", output);
-                            }
-                            if (error) {
-                                NSLog(@"Error: %@", error);
-                            }
-                        }];
-
    -
    - -
    - 
    var SdRangel = require('sd_rangel');
-
-var api = new SdRangel.FeatureSetApi()
-
-var callback = function(error, data, response) {
-  if (error) {
-    console.error(error);
-  } else {
-    console.log('API called successfully. Returned data: ' + data);
-  }
-};
-api.instanceFeatureSetDelete(callback);
-
    -
    - - -
    - 
    using System;
-using System.Diagnostics;
-using SWGSDRangel.Api;
-using SWGSDRangel.Client;
-using SWGSDRangel.Model;
-
-namespace Example
-{
-    public class instanceFeatureSetDeleteExample
-    {
-        public void main()
-        {
-            
-            var apiInstance = new FeatureSetApi();
-
-            try
-            {
-                SuccessResponse result = apiInstance.instanceFeatureSetDelete();
-                Debug.WriteLine(result);
-            }
-            catch (Exception e)
-            {
-                Debug.Print("Exception when calling FeatureSetApi.instanceFeatureSetDelete: " + e.Message );
-            }
-        }
-    }
-}
-
    -
    - -
    - 
    <?php
-require_once(__DIR__ . '/vendor/autoload.php');
-
-$api_instance = new Swagger\Client\Api\FeatureSetApi();
-
-try {
-    $result = $api_instance->instanceFeatureSetDelete();
-    print_r($result);
-} catch (Exception $e) {
-    echo 'Exception when calling FeatureSetApi->instanceFeatureSetDelete: ', $e->getMessage(), PHP_EOL;
-}
-?>
    -
    - -
    - 
    use Data::Dumper;
-use SWGSDRangel::Configuration;
-use SWGSDRangel::FeatureSetApi;
-
-my $api_instance = SWGSDRangel::FeatureSetApi->new();
-
-eval { 
-    my $result = $api_instance->instanceFeatureSetDelete();
-    print Dumper($result);
-};
-if ($@) {
-    warn "Exception when calling FeatureSetApi->instanceFeatureSetDelete: $@\n";
-}
    -
    - -
    - 
    from __future__ import print_statement
-import time
-import swagger_sdrangel
-from swagger_sdrangel.rest import ApiException
-from pprint import pprint
-
-# create an instance of the API class
-api_instance = swagger_sdrangel.FeatureSetApi()
-
-try: 
-    api_response = api_instance.instance_feature_set_delete()
-    pprint(api_response)
-except ApiException as e:
-    print("Exception when calling FeatureSetApi->instanceFeatureSetDelete: %s\n" % e)
    -
    -
    - -

    Parameters

    - - - - - - -

    Responses

    -

    Status: 202 - Message to remove last feature set was sent successfully

    - - - -
    -
    -
    - -
    - -
    -
    - -

    Status: 404 - No more feature sets to be deleted

    - - - -
    -
    -
    - -
    - -
    -
    - -

    Status: 500 - Error

    - - - -
    -
    -
    - -
    - -
    -
    - -

    Status: 501 - Function not implemented

    - - - -
    -
    -
    - -
    - -
    -
    - -
    -
    -
    -
    -
    -
    -

    instanceFeatureSetPost

    -

    -
    -
    -
    -

    -

    Add (append) a new feature set

    -

    -
    - 
    /sdrangel/featureset
    -

    -

    Usage and SDK Samples

    -

    - - -
    -
    - 
    curl -X POST "http://localhost/sdrangel/featureset"
    -
    -
    - 
    import SWGSDRangel.*;
-import SWGSDRangel.auth.*;
-import SWGSDRangel.model.*;
-import SWGSDRangel.api.FeatureSetApi;
-
-import java.io.File;
-import java.util.*;
-
-public class FeatureSetApiExample {
-
-    public static void main(String[] args) {
-        
-        FeatureSetApi apiInstance = new FeatureSetApi();
-        try {
-            SuccessResponse result = apiInstance.instanceFeatureSetPost();
-            System.out.println(result);
-        } catch (ApiException e) {
-            System.err.println("Exception when calling FeatureSetApi#instanceFeatureSetPost");
-            e.printStackTrace();
-        }
-    }
-}
    -
    - -
    - 
    import SWGSDRangel.api.FeatureSetApi;
-
-public class FeatureSetApiExample {
-
-    public static void main(String[] args) {
-        FeatureSetApi apiInstance = new FeatureSetApi();
-        try {
-            SuccessResponse result = apiInstance.instanceFeatureSetPost();
-            System.out.println(result);
-        } catch (ApiException e) {
-            System.err.println("Exception when calling FeatureSetApi#instanceFeatureSetPost");
-            e.printStackTrace();
-        }
-    }
-}
    -
    - -
    - 
    
-FeatureSetApi *apiInstance = [[FeatureSetApi alloc] init];
-
-[apiInstance instanceFeatureSetPostWithCompletionHandler: 
-              ^(SuccessResponse output, NSError* error) {
-                            if (output) {
-                                NSLog(@"%@", output);
-                            }
-                            if (error) {
-                                NSLog(@"Error: %@", error);
-                            }
-                        }];
-
    -
    - -
    - 
    var SdRangel = require('sd_rangel');
-
-var api = new SdRangel.FeatureSetApi()
-
-var callback = function(error, data, response) {
-  if (error) {
-    console.error(error);
-  } else {
-    console.log('API called successfully. Returned data: ' + data);
-  }
-};
-api.instanceFeatureSetPost(callback);
-
    -
    - - -
    - 
    using System;
-using System.Diagnostics;
-using SWGSDRangel.Api;
-using SWGSDRangel.Client;
-using SWGSDRangel.Model;
-
-namespace Example
-{
-    public class instanceFeatureSetPostExample
-    {
-        public void main()
-        {
-            
-            var apiInstance = new FeatureSetApi();
-
-            try
-            {
-                SuccessResponse result = apiInstance.instanceFeatureSetPost();
-                Debug.WriteLine(result);
-            }
-            catch (Exception e)
-            {
-                Debug.Print("Exception when calling FeatureSetApi.instanceFeatureSetPost: " + e.Message );
-            }
-        }
-    }
-}
-
    -
    - -
    - 
    <?php
-require_once(__DIR__ . '/vendor/autoload.php');
-
-$api_instance = new Swagger\Client\Api\FeatureSetApi();
-
-try {
-    $result = $api_instance->instanceFeatureSetPost();
-    print_r($result);
-} catch (Exception $e) {
-    echo 'Exception when calling FeatureSetApi->instanceFeatureSetPost: ', $e->getMessage(), PHP_EOL;
-}
-?>
    -
    - -
    - 
    use Data::Dumper;
-use SWGSDRangel::Configuration;
-use SWGSDRangel::FeatureSetApi;
-
-my $api_instance = SWGSDRangel::FeatureSetApi->new();
-
-eval { 
-    my $result = $api_instance->instanceFeatureSetPost();
-    print Dumper($result);
-};
-if ($@) {
-    warn "Exception when calling FeatureSetApi->instanceFeatureSetPost: $@\n";
-}
    -
    - -
    - 
    from __future__ import print_statement
-import time
-import swagger_sdrangel
-from swagger_sdrangel.rest import ApiException
-from pprint import pprint
-
-# create an instance of the API class
-api_instance = swagger_sdrangel.FeatureSetApi()
-
-try: 
-    api_response = api_instance.instance_feature_set_post()
-    pprint(api_response)
-except ApiException as e:
-    print("Exception when calling FeatureSetApi->instanceFeatureSetPost: %s\n" % e)
    -
    -
    - -

    Parameters

    - - - - - - -

    Responses

    -

    Status: 202 - Message to add a new feature set was sent successfully

    - - - -
    -
    -
    - -
    - -
    -
    - -

    Status: 500 - Error

    - - - -
    -
    -
    - -
    - -
    -
    - -

    Status: 501 - Function not implemented

    - - - -
    -
    -
    - -
    - -
    -
    - -
    -
    -

    Instance

    @@ -44751,341 +44013,6 @@ except ApiException as e:
    -
    -
    -
    -

    instanceFeatureSetsGet

    -

    -
    -
    -
    -

    -

    Get summary information about feature sets opened in the instance

    -

    -
    - 
    /sdrangel/featuresets
    -

    -

    Usage and SDK Samples

    -

    - - -
    -
    - 
    curl -X GET "http://localhost/sdrangel/featuresets"
    -
    -
    - 
    import SWGSDRangel.*;
-import SWGSDRangel.auth.*;
-import SWGSDRangel.model.*;
-import SWGSDRangel.api.InstanceApi;
-
-import java.io.File;
-import java.util.*;
-
-public class InstanceApiExample {
-
-    public static void main(String[] args) {
-        
-        InstanceApi apiInstance = new InstanceApi();
-        try {
-            FeatureSetList result = apiInstance.instanceFeatureSetsGet();
-            System.out.println(result);
-        } catch (ApiException e) {
-            System.err.println("Exception when calling InstanceApi#instanceFeatureSetsGet");
-            e.printStackTrace();
-        }
-    }
-}
    -
    - -
    - 
    import SWGSDRangel.api.InstanceApi;
-
-public class InstanceApiExample {
-
-    public static void main(String[] args) {
-        InstanceApi apiInstance = new InstanceApi();
-        try {
-            FeatureSetList result = apiInstance.instanceFeatureSetsGet();
-            System.out.println(result);
-        } catch (ApiException e) {
-            System.err.println("Exception when calling InstanceApi#instanceFeatureSetsGet");
-            e.printStackTrace();
-        }
-    }
-}
    -
    - -
    - 
    
-InstanceApi *apiInstance = [[InstanceApi alloc] init];
-
-[apiInstance instanceFeatureSetsGetWithCompletionHandler: 
-              ^(FeatureSetList output, NSError* error) {
-                            if (output) {
-                                NSLog(@"%@", output);
-                            }
-                            if (error) {
-                                NSLog(@"Error: %@", error);
-                            }
-                        }];
-
    -
    - -
    - 
    var SdRangel = require('sd_rangel');
-
-var api = new SdRangel.InstanceApi()
-
-var callback = function(error, data, response) {
-  if (error) {
-    console.error(error);
-  } else {
-    console.log('API called successfully. Returned data: ' + data);
-  }
-};
-api.instanceFeatureSetsGet(callback);
-
    -
    - - -
    - 
    using System;
-using System.Diagnostics;
-using SWGSDRangel.Api;
-using SWGSDRangel.Client;
-using SWGSDRangel.Model;
-
-namespace Example
-{
-    public class instanceFeatureSetsGetExample
-    {
-        public void main()
-        {
-            
-            var apiInstance = new InstanceApi();
-
-            try
-            {
-                FeatureSetList result = apiInstance.instanceFeatureSetsGet();
-                Debug.WriteLine(result);
-            }
-            catch (Exception e)
-            {
-                Debug.Print("Exception when calling InstanceApi.instanceFeatureSetsGet: " + e.Message );
-            }
-        }
-    }
-}
-
    -
    - -
    - 
    <?php
-require_once(__DIR__ . '/vendor/autoload.php');
-
-$api_instance = new Swagger\Client\Api\InstanceApi();
-
-try {
-    $result = $api_instance->instanceFeatureSetsGet();
-    print_r($result);
-} catch (Exception $e) {
-    echo 'Exception when calling InstanceApi->instanceFeatureSetsGet: ', $e->getMessage(), PHP_EOL;
-}
-?>
    -
    - -
    - 
    use Data::Dumper;
-use SWGSDRangel::Configuration;
-use SWGSDRangel::InstanceApi;
-
-my $api_instance = SWGSDRangel::InstanceApi->new();
-
-eval { 
-    my $result = $api_instance->instanceFeatureSetsGet();
-    print Dumper($result);
-};
-if ($@) {
-    warn "Exception when calling InstanceApi->instanceFeatureSetsGet: $@\n";
-}
    -
    - -
    - 
    from __future__ import print_statement
-import time
-import swagger_sdrangel
-from swagger_sdrangel.rest import ApiException
-from pprint import pprint
-
-# create an instance of the API class
-api_instance = swagger_sdrangel.InstanceApi()
-
-try: 
-    api_response = api_instance.instance_feature_sets_get()
-    pprint(api_response)
-except ApiException as e:
-    print("Exception when calling InstanceApi->instanceFeatureSetsGet: %s\n" % e)
    -
    -
    - -

    Parameters

    - - - - - - -

    Responses

    -

    Status: 200 - On success return feature set list

    - - - -
    -
    -
    - -
    - -
    -
    - -

    Status: 500 - Error

    - - - -
    -
    -
    - -
    - -
    -
    - -

    Status: 501 - Function not implemented

    - - - -
    -
    -
    - -
    - -
    -
    - -
    -
    -
    @@ -52469,7 +51396,7 @@ except ApiException as e:
    - Generated 2022-05-01T22:14:53.451+02:00 + Generated 2022-05-03T04:22:59.079+02:00
    diff --git a/swagger/sdrangel/code/qt5/client/SWGAISModActions_tx.cpp b/swagger/sdrangel/code/qt5/client/SWGAISModActions_tx.cpp deleted file mode 100644 index 26eddd1b2..000000000 --- a/swagger/sdrangel/code/qt5/client/SWGAISModActions_tx.cpp +++ /dev/null @@ -1,110 +0,0 @@ -/** - * SDRangel - * This is the web REST/JSON API of SDRangel SDR software. SDRangel is an Open Source Qt5/OpenGL 3.0+ (4.3+ in Windows) GUI and server Software Defined Radio and signal analyzer in software. It supports Airspy, BladeRF, HackRF, LimeSDR, PlutoSDR, RTL-SDR, SDRplay RSP1 and FunCube --- Limitations and specifcities: * In SDRangel GUI the first Rx device set cannot be deleted. Conversely the server starts with no device sets and its number of device sets can be reduced to zero by as many calls as necessary to /sdrangel/deviceset with DELETE method. * Preset import and export from/to file is a server only feature. * Device set focus is a GUI only feature. * The following channels are not implemented (status 501 is returned): ATV and DATV demodulators, Channel Analyzer NG, LoRa demodulator * The device settings and report structures contains only the sub-structure corresponding to the device type. The DeviceSettings and DeviceReport structures documented here shows all of them but only one will be or should be present at a time * The channel settings and report structures contains only the sub-structure corresponding to the channel type. The ChannelSettings and ChannelReport structures documented here shows all of them but only one will be or should be present at a time --- - * - * OpenAPI spec version: 6.0.0 - * Contact: f4exb06@gmail.com - * - * NOTE: This class is auto generated by the swagger code generator program. - * https://github.com/swagger-api/swagger-codegen.git - * Do not edit the class manually. - */ - - -#include "SWGAISModActions_tx.h" - -#include "SWGHelpers.h" - -#include -#include -#include -#include - -namespace SWGSDRangel { - -SWGAISModActions_tx::SWGAISModActions_tx(QString* json) { - init(); - this->fromJson(*json); -} - -SWGAISModActions_tx::SWGAISModActions_tx() { - data = nullptr; - m_data_isSet = false; -} - -SWGAISModActions_tx::~SWGAISModActions_tx() { - this->cleanup(); -} - -void -SWGAISModActions_tx::init() { - data = new QString(""); - m_data_isSet = false; -} - -void -SWGAISModActions_tx::cleanup() { - if(data != nullptr) { - delete data; - } -} - -SWGAISModActions_tx* -SWGAISModActions_tx::fromJson(QString &json) { - QByteArray array (json.toStdString().c_str()); - QJsonDocument doc = QJsonDocument::fromJson(array); - QJsonObject jsonObject = doc.object(); - this->fromJsonObject(jsonObject); - return this; -} - -void -SWGAISModActions_tx::fromJsonObject(QJsonObject &pJson) { - ::SWGSDRangel::setValue(&data, pJson["data"], "QString", "QString"); - -} - -QString -SWGAISModActions_tx::asJson () -{ - QJsonObject* obj = this->asJsonObject(); - - QJsonDocument doc(*obj); - QByteArray bytes = doc.toJson(); - delete obj; - return QString(bytes); -} - -QJsonObject* -SWGAISModActions_tx::asJsonObject() { - QJsonObject* obj = new QJsonObject(); - if(data != nullptr && *data != QString("")){ - toJsonValue(QString("data"), data, obj, QString("QString")); - } - - return obj; -} - -QString* -SWGAISModActions_tx::getData() { - return data; -} -void -SWGAISModActions_tx::setData(QString* data) { - this->data = data; - this->m_data_isSet = true; -} - - -bool -SWGAISModActions_tx::isSet(){ - bool isObjectUpdated = false; - do{ - if(data && *data != QString("")){ - isObjectUpdated = true; break; - } - }while(false); - return isObjectUpdated; -} -} - diff --git a/swagger/sdrangel/code/qt5/client/SWGAISModActions_tx.h b/swagger/sdrangel/code/qt5/client/SWGAISModActions_tx.h deleted file mode 100644 index e03dd89a6..000000000 --- a/swagger/sdrangel/code/qt5/client/SWGAISModActions_tx.h +++ /dev/null @@ -1,59 +0,0 @@ -/** - * SDRangel - * This is the web REST/JSON API of SDRangel SDR software. SDRangel is an Open Source Qt5/OpenGL 3.0+ (4.3+ in Windows) GUI and server Software Defined Radio and signal analyzer in software. It supports Airspy, BladeRF, HackRF, LimeSDR, PlutoSDR, RTL-SDR, SDRplay RSP1 and FunCube --- Limitations and specifcities: * In SDRangel GUI the first Rx device set cannot be deleted. Conversely the server starts with no device sets and its number of device sets can be reduced to zero by as many calls as necessary to /sdrangel/deviceset with DELETE method. * Preset import and export from/to file is a server only feature. * Device set focus is a GUI only feature. * The following channels are not implemented (status 501 is returned): ATV and DATV demodulators, Channel Analyzer NG, LoRa demodulator * The device settings and report structures contains only the sub-structure corresponding to the device type. The DeviceSettings and DeviceReport structures documented here shows all of them but only one will be or should be present at a time * The channel settings and report structures contains only the sub-structure corresponding to the channel type. The ChannelSettings and ChannelReport structures documented here shows all of them but only one will be or should be present at a time --- - * - * OpenAPI spec version: 6.0.0 - * Contact: f4exb06@gmail.com - * - * NOTE: This class is auto generated by the swagger code generator program. - * https://github.com/swagger-api/swagger-codegen.git - * Do not edit the class manually. - */ - -/* - * SWGAISModActions_tx.h - * - * Transmit a message - */ - -#ifndef SWGAISModActions_tx_H_ -#define SWGAISModActions_tx_H_ - -#include - - -#include - -#include "SWGObject.h" -#include "export.h" - -namespace SWGSDRangel { - -class SWG_API SWGAISModActions_tx: public SWGObject { -public: - SWGAISModActions_tx(); - SWGAISModActions_tx(QString* json); - virtual ~SWGAISModActions_tx(); - void init(); - void cleanup(); - - virtual QString asJson () override; - virtual QJsonObject* asJsonObject() override; - virtual void fromJsonObject(QJsonObject &json) override; - virtual SWGAISModActions_tx* fromJson(QString &jsonString) override; - - QString* getData(); - void setData(QString* data); - - - virtual bool isSet() override; - -private: - QString* data; - bool m_data_isSet; - -}; - -} - -#endif /* SWGAISModActions_tx_H_ */ diff --git a/swagger/sdrangel/code/qt5/client/SWGFeaturePresetTransfer.cpp b/swagger/sdrangel/code/qt5/client/SWGFeaturePresetTransfer.cpp deleted file mode 100644 index c08d58840..000000000 --- a/swagger/sdrangel/code/qt5/client/SWGFeaturePresetTransfer.cpp +++ /dev/null @@ -1,133 +0,0 @@ -/** - * SDRangel - * This is the web REST/JSON API of SDRangel SDR software. SDRangel is an Open Source Qt5/OpenGL 3.0+ (4.3+ in Windows) GUI and server Software Defined Radio and signal analyzer in software. It supports Airspy, BladeRF, HackRF, LimeSDR, PlutoSDR, RTL-SDR, SDRplay RSP1 and FunCube --- Limitations and specifcities: * In SDRangel GUI the first Rx device set cannot be deleted. Conversely the server starts with no device sets and its number of device sets can be reduced to zero by as many calls as necessary to /sdrangel/deviceset with DELETE method. * Preset import and export from/to file is a server only feature. * Device set focus is a GUI only feature. * The following channels are not implemented (status 501 is returned): ATV and DATV demodulators, Channel Analyzer NG, LoRa demodulator * The device settings and report structures contains only the sub-structure corresponding to the device type. The DeviceSettings and DeviceReport structures documented here shows all of them but only one will be or should be present at a time * The channel settings and report structures contains only the sub-structure corresponding to the channel type. The ChannelSettings and ChannelReport structures documented here shows all of them but only one will be or should be present at a time --- - * - * OpenAPI spec version: 6.0.0 - * Contact: f4exb06@gmail.com - * - * NOTE: This class is auto generated by the swagger code generator program. - * https://github.com/swagger-api/swagger-codegen.git - * Do not edit the class manually. - */ - - -#include "SWGFeaturePresetTransfer.h" - -#include "SWGHelpers.h" - -#include -#include -#include -#include - -namespace SWGSDRangel { - -SWGFeaturePresetTransfer::SWGFeaturePresetTransfer(QString* json) { - init(); - this->fromJson(*json); -} - -SWGFeaturePresetTransfer::SWGFeaturePresetTransfer() { - feature_set_index = 0; - m_feature_set_index_isSet = false; - preset = nullptr; - m_preset_isSet = false; -} - -SWGFeaturePresetTransfer::~SWGFeaturePresetTransfer() { - this->cleanup(); -} - -void -SWGFeaturePresetTransfer::init() { - feature_set_index = 0; - m_feature_set_index_isSet = false; - preset = new SWGFeaturePresetIdentifier(); - m_preset_isSet = false; -} - -void -SWGFeaturePresetTransfer::cleanup() { - - if(preset != nullptr) { - delete preset; - } -} - -SWGFeaturePresetTransfer* -SWGFeaturePresetTransfer::fromJson(QString &json) { - QByteArray array (json.toStdString().c_str()); - QJsonDocument doc = QJsonDocument::fromJson(array); - QJsonObject jsonObject = doc.object(); - this->fromJsonObject(jsonObject); - return this; -} - -void -SWGFeaturePresetTransfer::fromJsonObject(QJsonObject &pJson) { - ::SWGSDRangel::setValue(&feature_set_index, pJson["featureSetIndex"], "qint32", ""); - - ::SWGSDRangel::setValue(&preset, pJson["preset"], "SWGFeaturePresetIdentifier", "SWGFeaturePresetIdentifier"); - -} - -QString -SWGFeaturePresetTransfer::asJson () -{ - QJsonObject* obj = this->asJsonObject(); - - QJsonDocument doc(*obj); - QByteArray bytes = doc.toJson(); - delete obj; - return QString(bytes); -} - -QJsonObject* -SWGFeaturePresetTransfer::asJsonObject() { - QJsonObject* obj = new QJsonObject(); - if(m_feature_set_index_isSet){ - obj->insert("featureSetIndex", QJsonValue(feature_set_index)); - } - if((preset != nullptr) && (preset->isSet())){ - toJsonValue(QString("preset"), preset, obj, QString("SWGFeaturePresetIdentifier")); - } - - return obj; -} - -qint32 -SWGFeaturePresetTransfer::getFeatureSetIndex() { - return feature_set_index; -} -void -SWGFeaturePresetTransfer::setFeatureSetIndex(qint32 feature_set_index) { - this->feature_set_index = feature_set_index; - this->m_feature_set_index_isSet = true; -} - -SWGFeaturePresetIdentifier* -SWGFeaturePresetTransfer::getPreset() { - return preset; -} -void -SWGFeaturePresetTransfer::setPreset(SWGFeaturePresetIdentifier* preset) { - this->preset = preset; - this->m_preset_isSet = true; -} - - -bool -SWGFeaturePresetTransfer::isSet(){ - bool isObjectUpdated = false; - do{ - if(m_feature_set_index_isSet){ - isObjectUpdated = true; break; - } - if(preset && preset->isSet()){ - isObjectUpdated = true; break; - } - }while(false); - return isObjectUpdated; -} -} - diff --git a/swagger/sdrangel/code/qt5/client/SWGFeaturePresetTransfer.h b/swagger/sdrangel/code/qt5/client/SWGFeaturePresetTransfer.h deleted file mode 100644 index f2cc014c0..000000000 --- a/swagger/sdrangel/code/qt5/client/SWGFeaturePresetTransfer.h +++ /dev/null @@ -1,65 +0,0 @@ -/** - * SDRangel - * This is the web REST/JSON API of SDRangel SDR software. SDRangel is an Open Source Qt5/OpenGL 3.0+ (4.3+ in Windows) GUI and server Software Defined Radio and signal analyzer in software. It supports Airspy, BladeRF, HackRF, LimeSDR, PlutoSDR, RTL-SDR, SDRplay RSP1 and FunCube --- Limitations and specifcities: * In SDRangel GUI the first Rx device set cannot be deleted. Conversely the server starts with no device sets and its number of device sets can be reduced to zero by as many calls as necessary to /sdrangel/deviceset with DELETE method. * Preset import and export from/to file is a server only feature. * Device set focus is a GUI only feature. * The following channels are not implemented (status 501 is returned): ATV and DATV demodulators, Channel Analyzer NG, LoRa demodulator * The device settings and report structures contains only the sub-structure corresponding to the device type. The DeviceSettings and DeviceReport structures documented here shows all of them but only one will be or should be present at a time * The channel settings and report structures contains only the sub-structure corresponding to the channel type. The ChannelSettings and ChannelReport structures documented here shows all of them but only one will be or should be present at a time --- - * - * OpenAPI spec version: 6.0.0 - * Contact: f4exb06@gmail.com - * - * NOTE: This class is auto generated by the swagger code generator program. - * https://github.com/swagger-api/swagger-codegen.git - * Do not edit the class manually. - */ - -/* - * SWGFeaturePresetTransfer.h - * - * Preset transfer to or from a feature set - */ - -#ifndef SWGFeaturePresetTransfer_H_ -#define SWGFeaturePresetTransfer_H_ - -#include - - -#include "SWGFeaturePresetIdentifier.h" - -#include "SWGObject.h" -#include "export.h" - -namespace SWGSDRangel { - -class SWG_API SWGFeaturePresetTransfer: public SWGObject { -public: - SWGFeaturePresetTransfer(); - SWGFeaturePresetTransfer(QString* json); - virtual ~SWGFeaturePresetTransfer(); - void init(); - void cleanup(); - - virtual QString asJson () override; - virtual QJsonObject* asJsonObject() override; - virtual void fromJsonObject(QJsonObject &json) override; - virtual SWGFeaturePresetTransfer* fromJson(QString &jsonString) override; - - qint32 getFeatureSetIndex(); - void setFeatureSetIndex(qint32 feature_set_index); - - SWGFeaturePresetIdentifier* getPreset(); - void setPreset(SWGFeaturePresetIdentifier* preset); - - - virtual bool isSet() override; - -private: - qint32 feature_set_index; - bool m_feature_set_index_isSet; - - SWGFeaturePresetIdentifier* preset; - bool m_preset_isSet; - -}; - -} - -#endif /* SWGFeaturePresetTransfer_H_ */ diff --git a/swagger/sdrangel/code/qt5/client/SWGFeatureSetApi.cpp b/swagger/sdrangel/code/qt5/client/SWGFeatureSetApi.cpp index 66ae3a754..cce203117 100644 --- a/swagger/sdrangel/code/qt5/client/SWGFeatureSetApi.cpp +++ b/swagger/sdrangel/code/qt5/client/SWGFeatureSetApi.cpp @@ -823,109 +823,5 @@ SWGFeatureSetApi::featuresetPresetPutCallback(SWGHttpRequestWorker * worker) { } } -void -SWGFeatureSetApi::instanceFeatureSetDelete() { - QString fullPath; - fullPath.append(this->host).append(this->basePath).append("/sdrangel/featureset"); - - - - SWGHttpRequestWorker *worker = new SWGHttpRequestWorker(); - SWGHttpRequestInput input(fullPath, "DELETE"); - - - - - - foreach(QString key, this->defaultHeaders.keys()) { - input.headers.insert(key, this->defaultHeaders.value(key)); - } - - connect(worker, - &SWGHttpRequestWorker::on_execution_finished, - this, - &SWGFeatureSetApi::instanceFeatureSetDeleteCallback); - - worker->execute(&input); -} - -void -SWGFeatureSetApi::instanceFeatureSetDeleteCallback(SWGHttpRequestWorker * worker) { - QString msg; - QString error_str = worker->error_str; - QNetworkReply::NetworkError error_type = worker->error_type; - - if (worker->error_type == QNetworkReply::NoError) { - msg = QString("Success! %1 bytes").arg(worker->response.length()); - } - else { - msg = "Error: " + worker->error_str; - } - - - QString json(worker->response); - SWGSuccessResponse* output = static_cast(create(json, QString("SWGSuccessResponse"))); - worker->deleteLater(); - - if (worker->error_type == QNetworkReply::NoError) { - emit instanceFeatureSetDeleteSignal(output); - } else { - emit instanceFeatureSetDeleteSignalE(output, error_type, error_str); - emit instanceFeatureSetDeleteSignalEFull(worker, error_type, error_str); - } -} - -void -SWGFeatureSetApi::instanceFeatureSetPost() { - QString fullPath; - fullPath.append(this->host).append(this->basePath).append("/sdrangel/featureset"); - - - - SWGHttpRequestWorker *worker = new SWGHttpRequestWorker(); - SWGHttpRequestInput input(fullPath, "POST"); - - - - - - foreach(QString key, this->defaultHeaders.keys()) { - input.headers.insert(key, this->defaultHeaders.value(key)); - } - - connect(worker, - &SWGHttpRequestWorker::on_execution_finished, - this, - &SWGFeatureSetApi::instanceFeatureSetPostCallback); - - worker->execute(&input); -} - -void -SWGFeatureSetApi::instanceFeatureSetPostCallback(SWGHttpRequestWorker * worker) { - QString msg; - QString error_str = worker->error_str; - QNetworkReply::NetworkError error_type = worker->error_type; - - if (worker->error_type == QNetworkReply::NoError) { - msg = QString("Success! %1 bytes").arg(worker->response.length()); - } - else { - msg = "Error: " + worker->error_str; - } - - - QString json(worker->response); - SWGSuccessResponse* output = static_cast(create(json, QString("SWGSuccessResponse"))); - worker->deleteLater(); - - if (worker->error_type == QNetworkReply::NoError) { - emit instanceFeatureSetPostSignal(output); - } else { - emit instanceFeatureSetPostSignalE(output, error_type, error_str); - emit instanceFeatureSetPostSignalEFull(worker, error_type, error_str); - } -} - } diff --git a/swagger/sdrangel/code/qt5/client/SWGFeatureSetApi.h b/swagger/sdrangel/code/qt5/client/SWGFeatureSetApi.h index 4aaf9f60f..2952a7a7f 100644 --- a/swagger/sdrangel/code/qt5/client/SWGFeatureSetApi.h +++ b/swagger/sdrangel/code/qt5/client/SWGFeatureSetApi.h @@ -55,8 +55,6 @@ public: void featuresetPresetPatch(qint32 feature_set_index, SWGFeaturePresetIdentifier& body); void featuresetPresetPost(qint32 feature_set_index, SWGFeaturePresetIdentifier& body); void featuresetPresetPut(qint32 feature_set_index, SWGFeaturePresetIdentifier& body); - void instanceFeatureSetDelete(); - void instanceFeatureSetPost(); private: void featuresetFEatureSettingsPutCallback (SWGHttpRequestWorker * worker); @@ -73,8 +71,6 @@ private: void featuresetPresetPatchCallback (SWGHttpRequestWorker * worker); void featuresetPresetPostCallback (SWGHttpRequestWorker * worker); void featuresetPresetPutCallback (SWGHttpRequestWorker * worker); - void instanceFeatureSetDeleteCallback (SWGHttpRequestWorker * worker); - void instanceFeatureSetPostCallback (SWGHttpRequestWorker * worker); signals: void featuresetFEatureSettingsPutSignal(SWGFeatureSettings* summary); @@ -91,8 +87,6 @@ signals: void featuresetPresetPatchSignal(SWGFeaturePresetIdentifier* summary); void featuresetPresetPostSignal(SWGPresetIdentifier* summary); void featuresetPresetPutSignal(SWGFeaturePresetIdentifier* summary); - void instanceFeatureSetDeleteSignal(SWGSuccessResponse* summary); - void instanceFeatureSetPostSignal(SWGSuccessResponse* summary); void featuresetFEatureSettingsPutSignalE(SWGFeatureSettings* summary, QNetworkReply::NetworkError error_type, QString& error_str); void featuresetFeatureActionsPostSignalE(SWGSuccessResponse* summary, QNetworkReply::NetworkError error_type, QString& error_str); @@ -108,8 +102,6 @@ signals: void featuresetPresetPatchSignalE(SWGFeaturePresetIdentifier* summary, QNetworkReply::NetworkError error_type, QString& error_str); void featuresetPresetPostSignalE(SWGPresetIdentifier* summary, QNetworkReply::NetworkError error_type, QString& error_str); void featuresetPresetPutSignalE(SWGFeaturePresetIdentifier* summary, QNetworkReply::NetworkError error_type, QString& error_str); - void instanceFeatureSetDeleteSignalE(SWGSuccessResponse* summary, QNetworkReply::NetworkError error_type, QString& error_str); - void instanceFeatureSetPostSignalE(SWGSuccessResponse* summary, QNetworkReply::NetworkError error_type, QString& error_str); void featuresetFEatureSettingsPutSignalEFull(SWGHttpRequestWorker* worker, QNetworkReply::NetworkError error_type, QString& error_str); void featuresetFeatureActionsPostSignalEFull(SWGHttpRequestWorker* worker, QNetworkReply::NetworkError error_type, QString& error_str); @@ -125,8 +117,6 @@ signals: void featuresetPresetPatchSignalEFull(SWGHttpRequestWorker* worker, QNetworkReply::NetworkError error_type, QString& error_str); void featuresetPresetPostSignalEFull(SWGHttpRequestWorker* worker, QNetworkReply::NetworkError error_type, QString& error_str); void featuresetPresetPutSignalEFull(SWGHttpRequestWorker* worker, QNetworkReply::NetworkError error_type, QString& error_str); - void instanceFeatureSetDeleteSignalEFull(SWGHttpRequestWorker* worker, QNetworkReply::NetworkError error_type, QString& error_str); - void instanceFeatureSetPostSignalEFull(SWGHttpRequestWorker* worker, QNetworkReply::NetworkError error_type, QString& error_str); }; diff --git a/swagger/sdrangel/code/qt5/client/SWGFeatureSetList.cpp b/swagger/sdrangel/code/qt5/client/SWGFeatureSetList.cpp deleted file mode 100644 index 08779afdc..000000000 --- a/swagger/sdrangel/code/qt5/client/SWGFeatureSetList.cpp +++ /dev/null @@ -1,137 +0,0 @@ -/** - * SDRangel - * This is the web REST/JSON API of SDRangel SDR software. SDRangel is an Open Source Qt5/OpenGL 3.0+ (4.3+ in Windows) GUI and server Software Defined Radio and signal analyzer in software. It supports Airspy, BladeRF, HackRF, LimeSDR, PlutoSDR, RTL-SDR, SDRplay RSP1 and FunCube --- Limitations and specifcities: * In SDRangel GUI the first Rx device set cannot be deleted. Conversely the server starts with no device sets and its number of device sets can be reduced to zero by as many calls as necessary to /sdrangel/deviceset with DELETE method. * Preset import and export from/to file is a server only feature. * Device set focus is a GUI only feature. * The following channels are not implemented (status 501 is returned): ATV and DATV demodulators, Channel Analyzer NG, LoRa demodulator * The device settings and report structures contains only the sub-structure corresponding to the device type. The DeviceSettings and DeviceReport structures documented here shows all of them but only one will be or should be present at a time * The channel settings and report structures contains only the sub-structure corresponding to the channel type. The ChannelSettings and ChannelReport structures documented here shows all of them but only one will be or should be present at a time --- - * - * OpenAPI spec version: 6.0.0 - * Contact: f4exb06@gmail.com - * - * NOTE: This class is auto generated by the swagger code generator program. - * https://github.com/swagger-api/swagger-codegen.git - * Do not edit the class manually. - */ - - -#include "SWGFeatureSetList.h" - -#include "SWGHelpers.h" - -#include -#include -#include -#include - -namespace SWGSDRangel { - -SWGFeatureSetList::SWGFeatureSetList(QString* json) { - init(); - this->fromJson(*json); -} - -SWGFeatureSetList::SWGFeatureSetList() { - featuresetcount = 0; - m_featuresetcount_isSet = false; - feature_sets = nullptr; - m_feature_sets_isSet = false; -} - -SWGFeatureSetList::~SWGFeatureSetList() { - this->cleanup(); -} - -void -SWGFeatureSetList::init() { - featuresetcount = 0; - m_featuresetcount_isSet = false; - feature_sets = new QList(); - m_feature_sets_isSet = false; -} - -void -SWGFeatureSetList::cleanup() { - - if(feature_sets != nullptr) { - auto arr = feature_sets; - for(auto o: *arr) { - delete o; - } - delete feature_sets; - } -} - -SWGFeatureSetList* -SWGFeatureSetList::fromJson(QString &json) { - QByteArray array (json.toStdString().c_str()); - QJsonDocument doc = QJsonDocument::fromJson(array); - QJsonObject jsonObject = doc.object(); - this->fromJsonObject(jsonObject); - return this; -} - -void -SWGFeatureSetList::fromJsonObject(QJsonObject &pJson) { - ::SWGSDRangel::setValue(&featuresetcount, pJson["featuresetcount"], "qint32", ""); - - - ::SWGSDRangel::setValue(&feature_sets, pJson["featureSets"], "QList", "SWGFeatureSet"); -} - -QString -SWGFeatureSetList::asJson () -{ - QJsonObject* obj = this->asJsonObject(); - - QJsonDocument doc(*obj); - QByteArray bytes = doc.toJson(); - delete obj; - return QString(bytes); -} - -QJsonObject* -SWGFeatureSetList::asJsonObject() { - QJsonObject* obj = new QJsonObject(); - if(m_featuresetcount_isSet){ - obj->insert("featuresetcount", QJsonValue(featuresetcount)); - } - if(feature_sets && feature_sets->size() > 0){ - toJsonArray((QList*)feature_sets, obj, "featureSets", "SWGFeatureSet"); - } - - return obj; -} - -qint32 -SWGFeatureSetList::getFeaturesetcount() { - return featuresetcount; -} -void -SWGFeatureSetList::setFeaturesetcount(qint32 featuresetcount) { - this->featuresetcount = featuresetcount; - this->m_featuresetcount_isSet = true; -} - -QList* -SWGFeatureSetList::getFeatureSets() { - return feature_sets; -} -void -SWGFeatureSetList::setFeatureSets(QList* feature_sets) { - this->feature_sets = feature_sets; - this->m_feature_sets_isSet = true; -} - - -bool -SWGFeatureSetList::isSet(){ - bool isObjectUpdated = false; - do{ - if(m_featuresetcount_isSet){ - isObjectUpdated = true; break; - } - if(feature_sets && (feature_sets->size() > 0)){ - isObjectUpdated = true; break; - } - }while(false); - return isObjectUpdated; -} -} - diff --git a/swagger/sdrangel/code/qt5/client/SWGFeatureSetList.h b/swagger/sdrangel/code/qt5/client/SWGFeatureSetList.h deleted file mode 100644 index 16f695f62..000000000 --- a/swagger/sdrangel/code/qt5/client/SWGFeatureSetList.h +++ /dev/null @@ -1,66 +0,0 @@ -/** - * SDRangel - * This is the web REST/JSON API of SDRangel SDR software. SDRangel is an Open Source Qt5/OpenGL 3.0+ (4.3+ in Windows) GUI and server Software Defined Radio and signal analyzer in software. It supports Airspy, BladeRF, HackRF, LimeSDR, PlutoSDR, RTL-SDR, SDRplay RSP1 and FunCube --- Limitations and specifcities: * In SDRangel GUI the first Rx device set cannot be deleted. Conversely the server starts with no device sets and its number of device sets can be reduced to zero by as many calls as necessary to /sdrangel/deviceset with DELETE method. * Preset import and export from/to file is a server only feature. * Device set focus is a GUI only feature. * The following channels are not implemented (status 501 is returned): ATV and DATV demodulators, Channel Analyzer NG, LoRa demodulator * The device settings and report structures contains only the sub-structure corresponding to the device type. The DeviceSettings and DeviceReport structures documented here shows all of them but only one will be or should be present at a time * The channel settings and report structures contains only the sub-structure corresponding to the channel type. The ChannelSettings and ChannelReport structures documented here shows all of them but only one will be or should be present at a time --- - * - * OpenAPI spec version: 6.0.0 - * Contact: f4exb06@gmail.com - * - * NOTE: This class is auto generated by the swagger code generator program. - * https://github.com/swagger-api/swagger-codegen.git - * Do not edit the class manually. - */ - -/* - * SWGFeatureSetList.h - * - * List of feature sets opened in this instance - */ - -#ifndef SWGFeatureSetList_H_ -#define SWGFeatureSetList_H_ - -#include - - -#include "SWGFeatureSet.h" -#include - -#include "SWGObject.h" -#include "export.h" - -namespace SWGSDRangel { - -class SWG_API SWGFeatureSetList: public SWGObject { -public: - SWGFeatureSetList(); - SWGFeatureSetList(QString* json); - virtual ~SWGFeatureSetList(); - void init(); - void cleanup(); - - virtual QString asJson () override; - virtual QJsonObject* asJsonObject() override; - virtual void fromJsonObject(QJsonObject &json) override; - virtual SWGFeatureSetList* fromJson(QString &jsonString) override; - - qint32 getFeaturesetcount(); - void setFeaturesetcount(qint32 featuresetcount); - - QList* getFeatureSets(); - void setFeatureSets(QList* feature_sets); - - - virtual bool isSet() override; - -private: - qint32 featuresetcount; - bool m_featuresetcount_isSet; - - QList* feature_sets; - bool m_feature_sets_isSet; - -}; - -} - -#endif /* SWGFeatureSetList_H_ */ diff --git a/swagger/sdrangel/code/qt5/client/SWGIEEE_802_15_4_ModActions_tx.cpp b/swagger/sdrangel/code/qt5/client/SWGIEEE_802_15_4_ModActions_tx.cpp deleted file mode 100644 index 454c37131..000000000 --- a/swagger/sdrangel/code/qt5/client/SWGIEEE_802_15_4_ModActions_tx.cpp +++ /dev/null @@ -1,110 +0,0 @@ -/** - * SDRangel - * This is the web REST/JSON API of SDRangel SDR software. SDRangel is an Open Source Qt5/OpenGL 3.0+ (4.3+ in Windows) GUI and server Software Defined Radio and signal analyzer in software. It supports Airspy, BladeRF, HackRF, LimeSDR, PlutoSDR, RTL-SDR, SDRplay RSP1 and FunCube --- Limitations and specifcities: * In SDRangel GUI the first Rx device set cannot be deleted. Conversely the server starts with no device sets and its number of device sets can be reduced to zero by as many calls as necessary to /sdrangel/deviceset with DELETE method. * Preset import and export from/to file is a server only feature. * Device set focus is a GUI only feature. * The following channels are not implemented (status 501 is returned): ATV and DATV demodulators, Channel Analyzer NG, LoRa demodulator * The device settings and report structures contains only the sub-structure corresponding to the device type. The DeviceSettings and DeviceReport structures documented here shows all of them but only one will be or should be present at a time * The channel settings and report structures contains only the sub-structure corresponding to the channel type. The ChannelSettings and ChannelReport structures documented here shows all of them but only one will be or should be present at a time --- - * - * OpenAPI spec version: 6.0.0 - * Contact: f4exb06@gmail.com - * - * NOTE: This class is auto generated by the swagger code generator program. - * https://github.com/swagger-api/swagger-codegen.git - * Do not edit the class manually. - */ - - -#include "SWGIEEE_802_15_4_ModActions_tx.h" - -#include "SWGHelpers.h" - -#include -#include -#include -#include - -namespace SWGSDRangel { - -SWGIEEE_802_15_4_ModActions_tx::SWGIEEE_802_15_4_ModActions_tx(QString* json) { - init(); - this->fromJson(*json); -} - -SWGIEEE_802_15_4_ModActions_tx::SWGIEEE_802_15_4_ModActions_tx() { - data = nullptr; - m_data_isSet = false; -} - -SWGIEEE_802_15_4_ModActions_tx::~SWGIEEE_802_15_4_ModActions_tx() { - this->cleanup(); -} - -void -SWGIEEE_802_15_4_ModActions_tx::init() { - data = new QString(""); - m_data_isSet = false; -} - -void -SWGIEEE_802_15_4_ModActions_tx::cleanup() { - if(data != nullptr) { - delete data; - } -} - -SWGIEEE_802_15_4_ModActions_tx* -SWGIEEE_802_15_4_ModActions_tx::fromJson(QString &json) { - QByteArray array (json.toStdString().c_str()); - QJsonDocument doc = QJsonDocument::fromJson(array); - QJsonObject jsonObject = doc.object(); - this->fromJsonObject(jsonObject); - return this; -} - -void -SWGIEEE_802_15_4_ModActions_tx::fromJsonObject(QJsonObject &pJson) { - ::SWGSDRangel::setValue(&data, pJson["data"], "QString", "QString"); - -} - -QString -SWGIEEE_802_15_4_ModActions_tx::asJson () -{ - QJsonObject* obj = this->asJsonObject(); - - QJsonDocument doc(*obj); - QByteArray bytes = doc.toJson(); - delete obj; - return QString(bytes); -} - -QJsonObject* -SWGIEEE_802_15_4_ModActions_tx::asJsonObject() { - QJsonObject* obj = new QJsonObject(); - if(data != nullptr && *data != QString("")){ - toJsonValue(QString("data"), data, obj, QString("QString")); - } - - return obj; -} - -QString* -SWGIEEE_802_15_4_ModActions_tx::getData() { - return data; -} -void -SWGIEEE_802_15_4_ModActions_tx::setData(QString* data) { - this->data = data; - this->m_data_isSet = true; -} - - -bool -SWGIEEE_802_15_4_ModActions_tx::isSet(){ - bool isObjectUpdated = false; - do{ - if(data && *data != QString("")){ - isObjectUpdated = true; break; - } - }while(false); - return isObjectUpdated; -} -} - diff --git a/swagger/sdrangel/code/qt5/client/SWGIEEE_802_15_4_ModActions_tx.h b/swagger/sdrangel/code/qt5/client/SWGIEEE_802_15_4_ModActions_tx.h deleted file mode 100644 index 824dd1f44..000000000 --- a/swagger/sdrangel/code/qt5/client/SWGIEEE_802_15_4_ModActions_tx.h +++ /dev/null @@ -1,59 +0,0 @@ -/** - * SDRangel - * This is the web REST/JSON API of SDRangel SDR software. SDRangel is an Open Source Qt5/OpenGL 3.0+ (4.3+ in Windows) GUI and server Software Defined Radio and signal analyzer in software. It supports Airspy, BladeRF, HackRF, LimeSDR, PlutoSDR, RTL-SDR, SDRplay RSP1 and FunCube --- Limitations and specifcities: * In SDRangel GUI the first Rx device set cannot be deleted. Conversely the server starts with no device sets and its number of device sets can be reduced to zero by as many calls as necessary to /sdrangel/deviceset with DELETE method. * Preset import and export from/to file is a server only feature. * Device set focus is a GUI only feature. * The following channels are not implemented (status 501 is returned): ATV and DATV demodulators, Channel Analyzer NG, LoRa demodulator * The device settings and report structures contains only the sub-structure corresponding to the device type. The DeviceSettings and DeviceReport structures documented here shows all of them but only one will be or should be present at a time * The channel settings and report structures contains only the sub-structure corresponding to the channel type. The ChannelSettings and ChannelReport structures documented here shows all of them but only one will be or should be present at a time --- - * - * OpenAPI spec version: 6.0.0 - * Contact: f4exb06@gmail.com - * - * NOTE: This class is auto generated by the swagger code generator program. - * https://github.com/swagger-api/swagger-codegen.git - * Do not edit the class manually. - */ - -/* - * SWGIEEE_802_15_4_ModActions_tx.h - * - * Transmit a frame - */ - -#ifndef SWGIEEE_802_15_4_ModActions_tx_H_ -#define SWGIEEE_802_15_4_ModActions_tx_H_ - -#include - - -#include - -#include "SWGObject.h" -#include "export.h" - -namespace SWGSDRangel { - -class SWG_API SWGIEEE_802_15_4_ModActions_tx: public SWGObject { -public: - SWGIEEE_802_15_4_ModActions_tx(); - SWGIEEE_802_15_4_ModActions_tx(QString* json); - virtual ~SWGIEEE_802_15_4_ModActions_tx(); - void init(); - void cleanup(); - - virtual QString asJson () override; - virtual QJsonObject* asJsonObject() override; - virtual void fromJsonObject(QJsonObject &json) override; - virtual SWGIEEE_802_15_4_ModActions_tx* fromJson(QString &jsonString) override; - - QString* getData(); - void setData(QString* data); - - - virtual bool isSet() override; - -private: - QString* data; - bool m_data_isSet; - -}; - -} - -#endif /* SWGIEEE_802_15_4_ModActions_tx_H_ */ diff --git a/swagger/sdrangel/code/qt5/client/SWGInstanceApi.cpp b/swagger/sdrangel/code/qt5/client/SWGInstanceApi.cpp index 057eb6492..42cf8de55 100644 --- a/swagger/sdrangel/code/qt5/client/SWGInstanceApi.cpp +++ b/swagger/sdrangel/code/qt5/client/SWGInstanceApi.cpp @@ -1163,58 +1163,6 @@ SWGInstanceApi::instanceFeaturePresetGetCallback(SWGHttpRequestWorker * worker) } } -void -SWGInstanceApi::instanceFeatureSetsGet() { - QString fullPath; - fullPath.append(this->host).append(this->basePath).append("/sdrangel/featuresets"); - - - - SWGHttpRequestWorker *worker = new SWGHttpRequestWorker(); - SWGHttpRequestInput input(fullPath, "GET"); - - - - - - foreach(QString key, this->defaultHeaders.keys()) { - input.headers.insert(key, this->defaultHeaders.value(key)); - } - - connect(worker, - &SWGHttpRequestWorker::on_execution_finished, - this, - &SWGInstanceApi::instanceFeatureSetsGetCallback); - - worker->execute(&input); -} - -void -SWGInstanceApi::instanceFeatureSetsGetCallback(SWGHttpRequestWorker * worker) { - QString msg; - QString error_str = worker->error_str; - QNetworkReply::NetworkError error_type = worker->error_type; - - if (worker->error_type == QNetworkReply::NoError) { - msg = QString("Success! %1 bytes").arg(worker->response.length()); - } - else { - msg = "Error: " + worker->error_str; - } - - - QString json(worker->response); - SWGFeatureSetList* output = static_cast(create(json, QString("SWGFeatureSetList"))); - worker->deleteLater(); - - if (worker->error_type == QNetworkReply::NoError) { - emit instanceFeatureSetsGetSignal(output); - } else { - emit instanceFeatureSetsGetSignalE(output, error_type, error_str); - emit instanceFeatureSetsGetSignalEFull(worker, error_type, error_str); - } -} - void SWGInstanceApi::instanceFeatures() { QString fullPath; diff --git a/swagger/sdrangel/code/qt5/client/SWGInstanceApi.h b/swagger/sdrangel/code/qt5/client/SWGInstanceApi.h index faeefcfcc..8aeb3db09 100644 --- a/swagger/sdrangel/code/qt5/client/SWGInstanceApi.h +++ b/swagger/sdrangel/code/qt5/client/SWGInstanceApi.h @@ -25,7 +25,6 @@ #include "SWGErrorResponse.h" #include "SWGFeaturePresetIdentifier.h" #include "SWGFeaturePresets.h" -#include "SWGFeatureSetList.h" #include "SWGInstanceChannelsResponse.h" #include "SWGInstanceConfigResponse.h" #include "SWGInstanceDevicesResponse.h" @@ -80,7 +79,6 @@ public: void instanceDevices(qint32 direction); void instanceFeaturePresetDelete(SWGFeaturePresetIdentifier& body); void instanceFeaturePresetGet(); - void instanceFeatureSetsGet(); void instanceFeatures(); void instanceLimeRFEConfigGet(QString* serial); void instanceLimeRFEConfigPut(SWGLimeRFESettings& body); @@ -122,7 +120,6 @@ private: void instanceDevicesCallback (SWGHttpRequestWorker * worker); void instanceFeaturePresetDeleteCallback (SWGHttpRequestWorker * worker); void instanceFeaturePresetGetCallback (SWGHttpRequestWorker * worker); - void instanceFeatureSetsGetCallback (SWGHttpRequestWorker * worker); void instanceFeaturesCallback (SWGHttpRequestWorker * worker); void instanceLimeRFEConfigGetCallback (SWGHttpRequestWorker * worker); void instanceLimeRFEConfigPutCallback (SWGHttpRequestWorker * worker); @@ -164,7 +161,6 @@ signals: void instanceDevicesSignal(SWGInstanceDevicesResponse* summary); void instanceFeaturePresetDeleteSignal(SWGFeaturePresetIdentifier* summary); void instanceFeaturePresetGetSignal(SWGFeaturePresets* summary); - void instanceFeatureSetsGetSignal(SWGFeatureSetList* summary); void instanceFeaturesSignal(SWGInstanceFeaturesResponse* summary); void instanceLimeRFEConfigGetSignal(SWGLimeRFESettings* summary); void instanceLimeRFEConfigPutSignal(SWGSuccessResponse* summary); @@ -205,7 +201,6 @@ signals: void instanceDevicesSignalE(SWGInstanceDevicesResponse* summary, QNetworkReply::NetworkError error_type, QString& error_str); void instanceFeaturePresetDeleteSignalE(SWGFeaturePresetIdentifier* summary, QNetworkReply::NetworkError error_type, QString& error_str); void instanceFeaturePresetGetSignalE(SWGFeaturePresets* summary, QNetworkReply::NetworkError error_type, QString& error_str); - void instanceFeatureSetsGetSignalE(SWGFeatureSetList* summary, QNetworkReply::NetworkError error_type, QString& error_str); void instanceFeaturesSignalE(SWGInstanceFeaturesResponse* summary, QNetworkReply::NetworkError error_type, QString& error_str); void instanceLimeRFEConfigGetSignalE(SWGLimeRFESettings* summary, QNetworkReply::NetworkError error_type, QString& error_str); void instanceLimeRFEConfigPutSignalE(SWGSuccessResponse* summary, QNetworkReply::NetworkError error_type, QString& error_str); @@ -246,7 +241,6 @@ signals: void instanceDevicesSignalEFull(SWGHttpRequestWorker* worker, QNetworkReply::NetworkError error_type, QString& error_str); void instanceFeaturePresetDeleteSignalEFull(SWGHttpRequestWorker* worker, QNetworkReply::NetworkError error_type, QString& error_str); void instanceFeaturePresetGetSignalEFull(SWGHttpRequestWorker* worker, QNetworkReply::NetworkError error_type, QString& error_str); - void instanceFeatureSetsGetSignalEFull(SWGHttpRequestWorker* worker, QNetworkReply::NetworkError error_type, QString& error_str); void instanceFeaturesSignalEFull(SWGHttpRequestWorker* worker, QNetworkReply::NetworkError error_type, QString& error_str); void instanceLimeRFEConfigGetSignalEFull(SWGHttpRequestWorker* worker, QNetworkReply::NetworkError error_type, QString& error_str); void instanceLimeRFEConfigPutSignalEFull(SWGHttpRequestWorker* worker, QNetworkReply::NetworkError error_type, QString& error_str); diff --git a/swagger/sdrangel/code/qt5/client/SWGInstanceSummaryResponse.cpp b/swagger/sdrangel/code/qt5/client/SWGInstanceSummaryResponse.cpp index 49a1928c3..e53c4f180 100644 --- a/swagger/sdrangel/code/qt5/client/SWGInstanceSummaryResponse.cpp +++ b/swagger/sdrangel/code/qt5/client/SWGInstanceSummaryResponse.cpp @@ -48,8 +48,8 @@ SWGInstanceSummaryResponse::SWGInstanceSummaryResponse() { m_logging_isSet = false; devicesetlist = nullptr; m_devicesetlist_isSet = false; - featuresetlist = nullptr; - m_featuresetlist_isSet = false; + featureset = nullptr; + m_featureset_isSet = false; } SWGInstanceSummaryResponse::~SWGInstanceSummaryResponse() { @@ -78,8 +78,8 @@ SWGInstanceSummaryResponse::init() { m_logging_isSet = false; devicesetlist = new SWGDeviceSetList(); m_devicesetlist_isSet = false; - featuresetlist = new SWGFeatureSetList(); - m_featuresetlist_isSet = false; + featureset = new SWGFeatureSet(); + m_featureset_isSet = false; } void @@ -108,8 +108,8 @@ SWGInstanceSummaryResponse::cleanup() { if(devicesetlist != nullptr) { delete devicesetlist; } - if(featuresetlist != nullptr) { - delete featuresetlist; + if(featureset != nullptr) { + delete featureset; } } @@ -144,7 +144,7 @@ SWGInstanceSummaryResponse::fromJsonObject(QJsonObject &pJson) { ::SWGSDRangel::setValue(&devicesetlist, pJson["devicesetlist"], "SWGDeviceSetList", "SWGDeviceSetList"); - ::SWGSDRangel::setValue(&featuresetlist, pJson["featuresetlist"], "SWGFeatureSetList", "SWGFeatureSetList"); + ::SWGSDRangel::setValue(&featureset, pJson["featureset"], "SWGFeatureSet", "SWGFeatureSet"); } @@ -192,8 +192,8 @@ SWGInstanceSummaryResponse::asJsonObject() { if((devicesetlist != nullptr) && (devicesetlist->isSet())){ toJsonValue(QString("devicesetlist"), devicesetlist, obj, QString("SWGDeviceSetList")); } - if((featuresetlist != nullptr) && (featuresetlist->isSet())){ - toJsonValue(QString("featuresetlist"), featuresetlist, obj, QString("SWGFeatureSetList")); + if((featureset != nullptr) && (featureset->isSet())){ + toJsonValue(QString("featureset"), featureset, obj, QString("SWGFeatureSet")); } return obj; @@ -299,14 +299,14 @@ SWGInstanceSummaryResponse::setDevicesetlist(SWGDeviceSetList* devicesetlist) { this->m_devicesetlist_isSet = true; } -SWGFeatureSetList* -SWGInstanceSummaryResponse::getFeaturesetlist() { - return featuresetlist; +SWGFeatureSet* +SWGInstanceSummaryResponse::getFeatureset() { + return featureset; } void -SWGInstanceSummaryResponse::setFeaturesetlist(SWGFeatureSetList* featuresetlist) { - this->featuresetlist = featuresetlist; - this->m_featuresetlist_isSet = true; +SWGInstanceSummaryResponse::setFeatureset(SWGFeatureSet* featureset) { + this->featureset = featureset; + this->m_featureset_isSet = true; } @@ -344,7 +344,7 @@ SWGInstanceSummaryResponse::isSet(){ if(devicesetlist && devicesetlist->isSet()){ isObjectUpdated = true; break; } - if(featuresetlist && featuresetlist->isSet()){ + if(featureset && featureset->isSet()){ isObjectUpdated = true; break; } }while(false); diff --git a/swagger/sdrangel/code/qt5/client/SWGInstanceSummaryResponse.h b/swagger/sdrangel/code/qt5/client/SWGInstanceSummaryResponse.h index 43a56f7a1..58d1e53b4 100644 --- a/swagger/sdrangel/code/qt5/client/SWGInstanceSummaryResponse.h +++ b/swagger/sdrangel/code/qt5/client/SWGInstanceSummaryResponse.h @@ -23,7 +23,7 @@ #include "SWGDeviceSetList.h" -#include "SWGFeatureSetList.h" +#include "SWGFeatureSet.h" #include "SWGLoggingInfo.h" #include @@ -75,8 +75,8 @@ public: SWGDeviceSetList* getDevicesetlist(); void setDevicesetlist(SWGDeviceSetList* devicesetlist); - SWGFeatureSetList* getFeaturesetlist(); - void setFeaturesetlist(SWGFeatureSetList* featuresetlist); + SWGFeatureSet* getFeatureset(); + void setFeatureset(SWGFeatureSet* featureset); virtual bool isSet() override; @@ -112,8 +112,8 @@ private: SWGDeviceSetList* devicesetlist; bool m_devicesetlist_isSet; - SWGFeatureSetList* featuresetlist; - bool m_featuresetlist_isSet; + SWGFeatureSet* featureset; + bool m_featureset_isSet; }; diff --git a/swagger/sdrangel/code/qt5/client/SWGLRPTDemodSettings.cpp b/swagger/sdrangel/code/qt5/client/SWGLRPTDemodSettings.cpp deleted file mode 100644 index b1acba920..000000000 --- a/swagger/sdrangel/code/qt5/client/SWGLRPTDemodSettings.cpp +++ /dev/null @@ -1,597 +0,0 @@ -/** - * SDRangel - * This is the web REST/JSON API of SDRangel SDR software. SDRangel is an Open Source Qt5/OpenGL 3.0+ (4.3+ in Windows) GUI and server Software Defined Radio and signal analyzer in software. It supports Airspy, BladeRF, HackRF, LimeSDR, PlutoSDR, RTL-SDR, SDRplay RSP1 and FunCube --- Limitations and specifcities: * In SDRangel GUI the first Rx device set cannot be deleted. Conversely the server starts with no device sets and its number of device sets can be reduced to zero by as many calls as necessary to /sdrangel/deviceset with DELETE method. * Preset import and export from/to file is a server only feature. * Device set focus is a GUI only feature. * The following channels are not implemented (status 501 is returned): ATV and DATV demodulators, Channel Analyzer NG, LoRa demodulator * The device settings and report structures contains only the sub-structure corresponding to the device type. The DeviceSettings and DeviceReport structures documented here shows all of them but only one will be or should be present at a time * The channel settings and report structures contains only the sub-structure corresponding to the channel type. The ChannelSettings and ChannelReport structures documented here shows all of them but only one will be or should be present at a time --- - * - * OpenAPI spec version: 6.0.0 - * Contact: f4exb06@gmail.com - * - * NOTE: This class is auto generated by the swagger code generator program. - * https://github.com/swagger-api/swagger-codegen.git - * Do not edit the class manually. - */ - - -#include "SWGLRPTDemodSettings.h" - -#include "SWGHelpers.h" - -#include -#include -#include -#include - -namespace SWGSDRangel { - -SWGLRPTDemodSettings::SWGLRPTDemodSettings(QString* json) { - init(); - this->fromJson(*json); -} - -SWGLRPTDemodSettings::SWGLRPTDemodSettings() { - input_frequency_offset = 0L; - m_input_frequency_offset_isSet = false; - rf_bandwidth = 0.0f; - m_rf_bandwidth_isSet = false; - fm_deviation = 0; - m_fm_deviation_isSet = false; - crop_noise = 0; - m_crop_noise_isSet = false; - denoise = 0; - m_denoise_isSet = false; - linear_equalise = 0; - m_linear_equalise_isSet = false; - histogram_equalise = 0; - m_histogram_equalise_isSet = false; - precipitation_overlay = 0; - m_precipitation_overlay_isSet = false; - flip = 0; - m_flip_isSet = false; - channels = 0; - m_channels_isSet = false; - decode_enabled = 0; - m_decode_enabled_isSet = false; - auto_save = 0; - m_auto_save_isSet = false; - auto_save_path = nullptr; - m_auto_save_path_isSet = false; - auto_save_min_scan_lines = 0; - m_auto_save_min_scan_lines_isSet = false; - rgb_color = 0; - m_rgb_color_isSet = false; - title = nullptr; - m_title_isSet = false; - stream_index = 0; - m_stream_index_isSet = false; - use_reverse_api = 0; - m_use_reverse_api_isSet = false; - reverse_api_address = nullptr; - m_reverse_api_address_isSet = false; - reverse_api_port = 0; - m_reverse_api_port_isSet = false; - reverse_api_device_index = 0; - m_reverse_api_device_index_isSet = false; - reverse_api_channel_index = 0; - m_reverse_api_channel_index_isSet = false; -} - -SWGLRPTDemodSettings::~SWGLRPTDemodSettings() { - this->cleanup(); -} - -void -SWGLRPTDemodSettings::init() { - input_frequency_offset = 0L; - m_input_frequency_offset_isSet = false; - rf_bandwidth = 0.0f; - m_rf_bandwidth_isSet = false; - fm_deviation = 0; - m_fm_deviation_isSet = false; - crop_noise = 0; - m_crop_noise_isSet = false; - denoise = 0; - m_denoise_isSet = false; - linear_equalise = 0; - m_linear_equalise_isSet = false; - histogram_equalise = 0; - m_histogram_equalise_isSet = false; - precipitation_overlay = 0; - m_precipitation_overlay_isSet = false; - flip = 0; - m_flip_isSet = false; - channels = 0; - m_channels_isSet = false; - decode_enabled = 0; - m_decode_enabled_isSet = false; - auto_save = 0; - m_auto_save_isSet = false; - auto_save_path = new QString(""); - m_auto_save_path_isSet = false; - auto_save_min_scan_lines = 0; - m_auto_save_min_scan_lines_isSet = false; - rgb_color = 0; - m_rgb_color_isSet = false; - title = new QString(""); - m_title_isSet = false; - stream_index = 0; - m_stream_index_isSet = false; - use_reverse_api = 0; - m_use_reverse_api_isSet = false; - reverse_api_address = new QString(""); - m_reverse_api_address_isSet = false; - reverse_api_port = 0; - m_reverse_api_port_isSet = false; - reverse_api_device_index = 0; - m_reverse_api_device_index_isSet = false; - reverse_api_channel_index = 0; - m_reverse_api_channel_index_isSet = false; -} - -void -SWGLRPTDemodSettings::cleanup() { - - - - - - - - - - - - - if(auto_save_path != nullptr) { - delete auto_save_path; - } - - - if(title != nullptr) { - delete title; - } - - - if(reverse_api_address != nullptr) { - delete reverse_api_address; - } - - - -} - -SWGLRPTDemodSettings* -SWGLRPTDemodSettings::fromJson(QString &json) { - QByteArray array (json.toStdString().c_str()); - QJsonDocument doc = QJsonDocument::fromJson(array); - QJsonObject jsonObject = doc.object(); - this->fromJsonObject(jsonObject); - return this; -} - -void -SWGLRPTDemodSettings::fromJsonObject(QJsonObject &pJson) { - ::SWGSDRangel::setValue(&input_frequency_offset, pJson["inputFrequencyOffset"], "qint64", ""); - - ::SWGSDRangel::setValue(&rf_bandwidth, pJson["rfBandwidth"], "float", ""); - - ::SWGSDRangel::setValue(&fm_deviation, pJson["fmDeviation"], "qint32", ""); - - ::SWGSDRangel::setValue(&crop_noise, pJson["cropNoise"], "qint32", ""); - - ::SWGSDRangel::setValue(&denoise, pJson["denoise"], "qint32", ""); - - ::SWGSDRangel::setValue(&linear_equalise, pJson["linearEqualise"], "qint32", ""); - - ::SWGSDRangel::setValue(&histogram_equalise, pJson["histogramEqualise"], "qint32", ""); - - ::SWGSDRangel::setValue(&precipitation_overlay, pJson["precipitationOverlay"], "qint32", ""); - - ::SWGSDRangel::setValue(&flip, pJson["flip"], "qint32", ""); - - ::SWGSDRangel::setValue(&channels, pJson["channels"], "qint32", ""); - - ::SWGSDRangel::setValue(&decode_enabled, pJson["decodeEnabled"], "qint32", ""); - - ::SWGSDRangel::setValue(&auto_save, pJson["autoSave"], "qint32", ""); - - ::SWGSDRangel::setValue(&auto_save_path, pJson["autoSavePath"], "QString", "QString"); - - ::SWGSDRangel::setValue(&auto_save_min_scan_lines, pJson["autoSaveMinScanLines"], "qint32", ""); - - ::SWGSDRangel::setValue(&rgb_color, pJson["rgbColor"], "qint32", ""); - - ::SWGSDRangel::setValue(&title, pJson["title"], "QString", "QString"); - - ::SWGSDRangel::setValue(&stream_index, pJson["streamIndex"], "qint32", ""); - - ::SWGSDRangel::setValue(&use_reverse_api, pJson["useReverseAPI"], "qint32", ""); - - ::SWGSDRangel::setValue(&reverse_api_address, pJson["reverseAPIAddress"], "QString", "QString"); - - ::SWGSDRangel::setValue(&reverse_api_port, pJson["reverseAPIPort"], "qint32", ""); - - ::SWGSDRangel::setValue(&reverse_api_device_index, pJson["reverseAPIDeviceIndex"], "qint32", ""); - - ::SWGSDRangel::setValue(&reverse_api_channel_index, pJson["reverseAPIChannelIndex"], "qint32", ""); - -} - -QString -SWGLRPTDemodSettings::asJson () -{ - QJsonObject* obj = this->asJsonObject(); - - QJsonDocument doc(*obj); - QByteArray bytes = doc.toJson(); - delete obj; - return QString(bytes); -} - -QJsonObject* -SWGLRPTDemodSettings::asJsonObject() { - QJsonObject* obj = new QJsonObject(); - if(m_input_frequency_offset_isSet){ - obj->insert("inputFrequencyOffset", QJsonValue(input_frequency_offset)); - } - if(m_rf_bandwidth_isSet){ - obj->insert("rfBandwidth", QJsonValue(rf_bandwidth)); - } - if(m_fm_deviation_isSet){ - obj->insert("fmDeviation", QJsonValue(fm_deviation)); - } - if(m_crop_noise_isSet){ - obj->insert("cropNoise", QJsonValue(crop_noise)); - } - if(m_denoise_isSet){ - obj->insert("denoise", QJsonValue(denoise)); - } - if(m_linear_equalise_isSet){ - obj->insert("linearEqualise", QJsonValue(linear_equalise)); - } - if(m_histogram_equalise_isSet){ - obj->insert("histogramEqualise", QJsonValue(histogram_equalise)); - } - if(m_precipitation_overlay_isSet){ - obj->insert("precipitationOverlay", QJsonValue(precipitation_overlay)); - } - if(m_flip_isSet){ - obj->insert("flip", QJsonValue(flip)); - } - if(m_channels_isSet){ - obj->insert("channels", QJsonValue(channels)); - } - if(m_decode_enabled_isSet){ - obj->insert("decodeEnabled", QJsonValue(decode_enabled)); - } - if(m_auto_save_isSet){ - obj->insert("autoSave", QJsonValue(auto_save)); - } - if(auto_save_path != nullptr && *auto_save_path != QString("")){ - toJsonValue(QString("autoSavePath"), auto_save_path, obj, QString("QString")); - } - if(m_auto_save_min_scan_lines_isSet){ - obj->insert("autoSaveMinScanLines", QJsonValue(auto_save_min_scan_lines)); - } - if(m_rgb_color_isSet){ - obj->insert("rgbColor", QJsonValue(rgb_color)); - } - if(title != nullptr && *title != QString("")){ - toJsonValue(QString("title"), title, obj, QString("QString")); - } - if(m_stream_index_isSet){ - obj->insert("streamIndex", QJsonValue(stream_index)); - } - if(m_use_reverse_api_isSet){ - obj->insert("useReverseAPI", QJsonValue(use_reverse_api)); - } - if(reverse_api_address != nullptr && *reverse_api_address != QString("")){ - toJsonValue(QString("reverseAPIAddress"), reverse_api_address, obj, QString("QString")); - } - if(m_reverse_api_port_isSet){ - obj->insert("reverseAPIPort", QJsonValue(reverse_api_port)); - } - if(m_reverse_api_device_index_isSet){ - obj->insert("reverseAPIDeviceIndex", QJsonValue(reverse_api_device_index)); - } - if(m_reverse_api_channel_index_isSet){ - obj->insert("reverseAPIChannelIndex", QJsonValue(reverse_api_channel_index)); - } - - return obj; -} - -qint64 -SWGLRPTDemodSettings::getInputFrequencyOffset() { - return input_frequency_offset; -} -void -SWGLRPTDemodSettings::setInputFrequencyOffset(qint64 input_frequency_offset) { - this->input_frequency_offset = input_frequency_offset; - this->m_input_frequency_offset_isSet = true; -} - -float -SWGLRPTDemodSettings::getRfBandwidth() { - return rf_bandwidth; -} -void -SWGLRPTDemodSettings::setRfBandwidth(float rf_bandwidth) { - this->rf_bandwidth = rf_bandwidth; - this->m_rf_bandwidth_isSet = true; -} - -qint32 -SWGLRPTDemodSettings::getFmDeviation() { - return fm_deviation; -} -void -SWGLRPTDemodSettings::setFmDeviation(qint32 fm_deviation) { - this->fm_deviation = fm_deviation; - this->m_fm_deviation_isSet = true; -} - -qint32 -SWGLRPTDemodSettings::getCropNoise() { - return crop_noise; -} -void -SWGLRPTDemodSettings::setCropNoise(qint32 crop_noise) { - this->crop_noise = crop_noise; - this->m_crop_noise_isSet = true; -} - -qint32 -SWGLRPTDemodSettings::getDenoise() { - return denoise; -} -void -SWGLRPTDemodSettings::setDenoise(qint32 denoise) { - this->denoise = denoise; - this->m_denoise_isSet = true; -} - -qint32 -SWGLRPTDemodSettings::getLinearEqualise() { - return linear_equalise; -} -void -SWGLRPTDemodSettings::setLinearEqualise(qint32 linear_equalise) { - this->linear_equalise = linear_equalise; - this->m_linear_equalise_isSet = true; -} - -qint32 -SWGLRPTDemodSettings::getHistogramEqualise() { - return histogram_equalise; -} -void -SWGLRPTDemodSettings::setHistogramEqualise(qint32 histogram_equalise) { - this->histogram_equalise = histogram_equalise; - this->m_histogram_equalise_isSet = true; -} - -qint32 -SWGLRPTDemodSettings::getPrecipitationOverlay() { - return precipitation_overlay; -} -void -SWGLRPTDemodSettings::setPrecipitationOverlay(qint32 precipitation_overlay) { - this->precipitation_overlay = precipitation_overlay; - this->m_precipitation_overlay_isSet = true; -} - -qint32 -SWGLRPTDemodSettings::getFlip() { - return flip; -} -void -SWGLRPTDemodSettings::setFlip(qint32 flip) { - this->flip = flip; - this->m_flip_isSet = true; -} - -qint32 -SWGLRPTDemodSettings::getChannels() { - return channels; -} -void -SWGLRPTDemodSettings::setChannels(qint32 channels) { - this->channels = channels; - this->m_channels_isSet = true; -} - -qint32 -SWGLRPTDemodSettings::getDecodeEnabled() { - return decode_enabled; -} -void -SWGLRPTDemodSettings::setDecodeEnabled(qint32 decode_enabled) { - this->decode_enabled = decode_enabled; - this->m_decode_enabled_isSet = true; -} - -qint32 -SWGLRPTDemodSettings::getAutoSave() { - return auto_save; -} -void -SWGLRPTDemodSettings::setAutoSave(qint32 auto_save) { - this->auto_save = auto_save; - this->m_auto_save_isSet = true; -} - -QString* -SWGLRPTDemodSettings::getAutoSavePath() { - return auto_save_path; -} -void -SWGLRPTDemodSettings::setAutoSavePath(QString* auto_save_path) { - this->auto_save_path = auto_save_path; - this->m_auto_save_path_isSet = true; -} - -qint32 -SWGLRPTDemodSettings::getAutoSaveMinScanLines() { - return auto_save_min_scan_lines; -} -void -SWGLRPTDemodSettings::setAutoSaveMinScanLines(qint32 auto_save_min_scan_lines) { - this->auto_save_min_scan_lines = auto_save_min_scan_lines; - this->m_auto_save_min_scan_lines_isSet = true; -} - -qint32 -SWGLRPTDemodSettings::getRgbColor() { - return rgb_color; -} -void -SWGLRPTDemodSettings::setRgbColor(qint32 rgb_color) { - this->rgb_color = rgb_color; - this->m_rgb_color_isSet = true; -} - -QString* -SWGLRPTDemodSettings::getTitle() { - return title; -} -void -SWGLRPTDemodSettings::setTitle(QString* title) { - this->title = title; - this->m_title_isSet = true; -} - -qint32 -SWGLRPTDemodSettings::getStreamIndex() { - return stream_index; -} -void -SWGLRPTDemodSettings::setStreamIndex(qint32 stream_index) { - this->stream_index = stream_index; - this->m_stream_index_isSet = true; -} - -qint32 -SWGLRPTDemodSettings::getUseReverseApi() { - return use_reverse_api; -} -void -SWGLRPTDemodSettings::setUseReverseApi(qint32 use_reverse_api) { - this->use_reverse_api = use_reverse_api; - this->m_use_reverse_api_isSet = true; -} - -QString* -SWGLRPTDemodSettings::getReverseApiAddress() { - return reverse_api_address; -} -void -SWGLRPTDemodSettings::setReverseApiAddress(QString* reverse_api_address) { - this->reverse_api_address = reverse_api_address; - this->m_reverse_api_address_isSet = true; -} - -qint32 -SWGLRPTDemodSettings::getReverseApiPort() { - return reverse_api_port; -} -void -SWGLRPTDemodSettings::setReverseApiPort(qint32 reverse_api_port) { - this->reverse_api_port = reverse_api_port; - this->m_reverse_api_port_isSet = true; -} - -qint32 -SWGLRPTDemodSettings::getReverseApiDeviceIndex() { - return reverse_api_device_index; -} -void -SWGLRPTDemodSettings::setReverseApiDeviceIndex(qint32 reverse_api_device_index) { - this->reverse_api_device_index = reverse_api_device_index; - this->m_reverse_api_device_index_isSet = true; -} - -qint32 -SWGLRPTDemodSettings::getReverseApiChannelIndex() { - return reverse_api_channel_index; -} -void -SWGLRPTDemodSettings::setReverseApiChannelIndex(qint32 reverse_api_channel_index) { - this->reverse_api_channel_index = reverse_api_channel_index; - this->m_reverse_api_channel_index_isSet = true; -} - - -bool -SWGLRPTDemodSettings::isSet(){ - bool isObjectUpdated = false; - do{ - if(m_input_frequency_offset_isSet){ - isObjectUpdated = true; break; - } - if(m_rf_bandwidth_isSet){ - isObjectUpdated = true; break; - } - if(m_fm_deviation_isSet){ - isObjectUpdated = true; break; - } - if(m_crop_noise_isSet){ - isObjectUpdated = true; break; - } - if(m_denoise_isSet){ - isObjectUpdated = true; break; - } - if(m_linear_equalise_isSet){ - isObjectUpdated = true; break; - } - if(m_histogram_equalise_isSet){ - isObjectUpdated = true; break; - } - if(m_precipitation_overlay_isSet){ - isObjectUpdated = true; break; - } - if(m_flip_isSet){ - isObjectUpdated = true; break; - } - if(m_channels_isSet){ - isObjectUpdated = true; break; - } - if(m_decode_enabled_isSet){ - isObjectUpdated = true; break; - } - if(m_auto_save_isSet){ - isObjectUpdated = true; break; - } - if(auto_save_path && *auto_save_path != QString("")){ - isObjectUpdated = true; break; - } - if(m_auto_save_min_scan_lines_isSet){ - isObjectUpdated = true; break; - } - if(m_rgb_color_isSet){ - isObjectUpdated = true; break; - } - if(title && *title != QString("")){ - isObjectUpdated = true; break; - } - if(m_stream_index_isSet){ - isObjectUpdated = true; break; - } - if(m_use_reverse_api_isSet){ - isObjectUpdated = true; break; - } - if(reverse_api_address && *reverse_api_address != QString("")){ - isObjectUpdated = true; break; - } - if(m_reverse_api_port_isSet){ - isObjectUpdated = true; break; - } - if(m_reverse_api_device_index_isSet){ - isObjectUpdated = true; break; - } - if(m_reverse_api_channel_index_isSet){ - isObjectUpdated = true; break; - } - }while(false); - return isObjectUpdated; -} -} - diff --git a/swagger/sdrangel/code/qt5/client/SWGLRPTDemodSettings.h b/swagger/sdrangel/code/qt5/client/SWGLRPTDemodSettings.h deleted file mode 100644 index 474759372..000000000 --- a/swagger/sdrangel/code/qt5/client/SWGLRPTDemodSettings.h +++ /dev/null @@ -1,185 +0,0 @@ -/** - * SDRangel - * This is the web REST/JSON API of SDRangel SDR software. SDRangel is an Open Source Qt5/OpenGL 3.0+ (4.3+ in Windows) GUI and server Software Defined Radio and signal analyzer in software. It supports Airspy, BladeRF, HackRF, LimeSDR, PlutoSDR, RTL-SDR, SDRplay RSP1 and FunCube --- Limitations and specifcities: * In SDRangel GUI the first Rx device set cannot be deleted. Conversely the server starts with no device sets and its number of device sets can be reduced to zero by as many calls as necessary to /sdrangel/deviceset with DELETE method. * Preset import and export from/to file is a server only feature. * Device set focus is a GUI only feature. * The following channels are not implemented (status 501 is returned): ATV and DATV demodulators, Channel Analyzer NG, LoRa demodulator * The device settings and report structures contains only the sub-structure corresponding to the device type. The DeviceSettings and DeviceReport structures documented here shows all of them but only one will be or should be present at a time * The channel settings and report structures contains only the sub-structure corresponding to the channel type. The ChannelSettings and ChannelReport structures documented here shows all of them but only one will be or should be present at a time --- - * - * OpenAPI spec version: 6.0.0 - * Contact: f4exb06@gmail.com - * - * NOTE: This class is auto generated by the swagger code generator program. - * https://github.com/swagger-api/swagger-codegen.git - * Do not edit the class manually. - */ - -/* - * SWGLRPTDemodSettings.h - * - * LRPTDemod - */ - -#ifndef SWGLRPTDemodSettings_H_ -#define SWGLRPTDemodSettings_H_ - -#include - - -#include - -#include "SWGObject.h" -#include "export.h" - -namespace SWGSDRangel { - -class SWG_API SWGLRPTDemodSettings: public SWGObject { -public: - SWGLRPTDemodSettings(); - SWGLRPTDemodSettings(QString* json); - virtual ~SWGLRPTDemodSettings(); - void init(); - void cleanup(); - - virtual QString asJson () override; - virtual QJsonObject* asJsonObject() override; - virtual void fromJsonObject(QJsonObject &json) override; - virtual SWGLRPTDemodSettings* fromJson(QString &jsonString) override; - - qint64 getInputFrequencyOffset(); - void setInputFrequencyOffset(qint64 input_frequency_offset); - - float getRfBandwidth(); - void setRfBandwidth(float rf_bandwidth); - - qint32 getFmDeviation(); - void setFmDeviation(qint32 fm_deviation); - - qint32 getCropNoise(); - void setCropNoise(qint32 crop_noise); - - qint32 getDenoise(); - void setDenoise(qint32 denoise); - - qint32 getLinearEqualise(); - void setLinearEqualise(qint32 linear_equalise); - - qint32 getHistogramEqualise(); - void setHistogramEqualise(qint32 histogram_equalise); - - qint32 getPrecipitationOverlay(); - void setPrecipitationOverlay(qint32 precipitation_overlay); - - qint32 getFlip(); - void setFlip(qint32 flip); - - qint32 getChannels(); - void setChannels(qint32 channels); - - qint32 getDecodeEnabled(); - void setDecodeEnabled(qint32 decode_enabled); - - qint32 getAutoSave(); - void setAutoSave(qint32 auto_save); - - QString* getAutoSavePath(); - void setAutoSavePath(QString* auto_save_path); - - qint32 getAutoSaveMinScanLines(); - void setAutoSaveMinScanLines(qint32 auto_save_min_scan_lines); - - qint32 getRgbColor(); - void setRgbColor(qint32 rgb_color); - - QString* getTitle(); - void setTitle(QString* title); - - qint32 getStreamIndex(); - void setStreamIndex(qint32 stream_index); - - qint32 getUseReverseApi(); - void setUseReverseApi(qint32 use_reverse_api); - - QString* getReverseApiAddress(); - void setReverseApiAddress(QString* reverse_api_address); - - qint32 getReverseApiPort(); - void setReverseApiPort(qint32 reverse_api_port); - - qint32 getReverseApiDeviceIndex(); - void setReverseApiDeviceIndex(qint32 reverse_api_device_index); - - qint32 getReverseApiChannelIndex(); - void setReverseApiChannelIndex(qint32 reverse_api_channel_index); - - - virtual bool isSet() override; - -private: - qint64 input_frequency_offset; - bool m_input_frequency_offset_isSet; - - float rf_bandwidth; - bool m_rf_bandwidth_isSet; - - qint32 fm_deviation; - bool m_fm_deviation_isSet; - - qint32 crop_noise; - bool m_crop_noise_isSet; - - qint32 denoise; - bool m_denoise_isSet; - - qint32 linear_equalise; - bool m_linear_equalise_isSet; - - qint32 histogram_equalise; - bool m_histogram_equalise_isSet; - - qint32 precipitation_overlay; - bool m_precipitation_overlay_isSet; - - qint32 flip; - bool m_flip_isSet; - - qint32 channels; - bool m_channels_isSet; - - qint32 decode_enabled; - bool m_decode_enabled_isSet; - - qint32 auto_save; - bool m_auto_save_isSet; - - QString* auto_save_path; - bool m_auto_save_path_isSet; - - qint32 auto_save_min_scan_lines; - bool m_auto_save_min_scan_lines_isSet; - - qint32 rgb_color; - bool m_rgb_color_isSet; - - QString* title; - bool m_title_isSet; - - qint32 stream_index; - bool m_stream_index_isSet; - - qint32 use_reverse_api; - bool m_use_reverse_api_isSet; - - QString* reverse_api_address; - bool m_reverse_api_address_isSet; - - qint32 reverse_api_port; - bool m_reverse_api_port_isSet; - - qint32 reverse_api_device_index; - bool m_reverse_api_device_index_isSet; - - qint32 reverse_api_channel_index; - bool m_reverse_api_channel_index_isSet; - -}; - -} - -#endif /* SWGLRPTDemodSettings_H_ */ diff --git a/swagger/sdrangel/code/qt5/client/SWGMapActions_find.cpp b/swagger/sdrangel/code/qt5/client/SWGMapActions_find.cpp deleted file mode 100644 index 0e9607141..000000000 --- a/swagger/sdrangel/code/qt5/client/SWGMapActions_find.cpp +++ /dev/null @@ -1,110 +0,0 @@ -/** - * SDRangel - * This is the web REST/JSON API of SDRangel SDR software. SDRangel is an Open Source Qt5/OpenGL 3.0+ (4.3+ in Windows) GUI and server Software Defined Radio and signal analyzer in software. It supports Airspy, BladeRF, HackRF, LimeSDR, PlutoSDR, RTL-SDR, SDRplay RSP1 and FunCube --- Limitations and specifcities: * In SDRangel GUI the first Rx device set cannot be deleted. Conversely the server starts with no device sets and its number of device sets can be reduced to zero by as many calls as necessary to /sdrangel/deviceset with DELETE method. * Preset import and export from/to file is a server only feature. * Device set focus is a GUI only feature. * The following channels are not implemented (status 501 is returned): ATV and DATV demodulators, Channel Analyzer NG, LoRa demodulator * The device settings and report structures contains only the sub-structure corresponding to the device type. The DeviceSettings and DeviceReport structures documented here shows all of them but only one will be or should be present at a time * The channel settings and report structures contains only the sub-structure corresponding to the channel type. The ChannelSettings and ChannelReport structures documented here shows all of them but only one will be or should be present at a time --- - * - * OpenAPI spec version: 6.0.0 - * Contact: f4exb06@gmail.com - * - * NOTE: This class is auto generated by the swagger code generator program. - * https://github.com/swagger-api/swagger-codegen.git - * Do not edit the class manually. - */ - - -#include "SWGMapActions_find.h" - -#include "SWGHelpers.h" - -#include -#include -#include -#include - -namespace SWGSDRangel { - -SWGMapActions_find::SWGMapActions_find(QString* json) { - init(); - this->fromJson(*json); -} - -SWGMapActions_find::SWGMapActions_find() { - id = nullptr; - m_id_isSet = false; -} - -SWGMapActions_find::~SWGMapActions_find() { - this->cleanup(); -} - -void -SWGMapActions_find::init() { - id = new QString(""); - m_id_isSet = false; -} - -void -SWGMapActions_find::cleanup() { - if(id != nullptr) { - delete id; - } -} - -SWGMapActions_find* -SWGMapActions_find::fromJson(QString &json) { - QByteArray array (json.toStdString().c_str()); - QJsonDocument doc = QJsonDocument::fromJson(array); - QJsonObject jsonObject = doc.object(); - this->fromJsonObject(jsonObject); - return this; -} - -void -SWGMapActions_find::fromJsonObject(QJsonObject &pJson) { - ::SWGSDRangel::setValue(&id, pJson["id"], "QString", "QString"); - -} - -QString -SWGMapActions_find::asJson () -{ - QJsonObject* obj = this->asJsonObject(); - - QJsonDocument doc(*obj); - QByteArray bytes = doc.toJson(); - delete obj; - return QString(bytes); -} - -QJsonObject* -SWGMapActions_find::asJsonObject() { - QJsonObject* obj = new QJsonObject(); - if(id != nullptr && *id != QString("")){ - toJsonValue(QString("id"), id, obj, QString("QString")); - } - - return obj; -} - -QString* -SWGMapActions_find::getId() { - return id; -} -void -SWGMapActions_find::setId(QString* id) { - this->id = id; - this->m_id_isSet = true; -} - - -bool -SWGMapActions_find::isSet(){ - bool isObjectUpdated = false; - do{ - if(id && *id != QString("")){ - isObjectUpdated = true; break; - } - }while(false); - return isObjectUpdated; -} -} - diff --git a/swagger/sdrangel/code/qt5/client/SWGMapActions_find.h b/swagger/sdrangel/code/qt5/client/SWGMapActions_find.h deleted file mode 100644 index cce1988c8..000000000 --- a/swagger/sdrangel/code/qt5/client/SWGMapActions_find.h +++ /dev/null @@ -1,59 +0,0 @@ -/** - * SDRangel - * This is the web REST/JSON API of SDRangel SDR software. SDRangel is an Open Source Qt5/OpenGL 3.0+ (4.3+ in Windows) GUI and server Software Defined Radio and signal analyzer in software. It supports Airspy, BladeRF, HackRF, LimeSDR, PlutoSDR, RTL-SDR, SDRplay RSP1 and FunCube --- Limitations and specifcities: * In SDRangel GUI the first Rx device set cannot be deleted. Conversely the server starts with no device sets and its number of device sets can be reduced to zero by as many calls as necessary to /sdrangel/deviceset with DELETE method. * Preset import and export from/to file is a server only feature. * Device set focus is a GUI only feature. * The following channels are not implemented (status 501 is returned): ATV and DATV demodulators, Channel Analyzer NG, LoRa demodulator * The device settings and report structures contains only the sub-structure corresponding to the device type. The DeviceSettings and DeviceReport structures documented here shows all of them but only one will be or should be present at a time * The channel settings and report structures contains only the sub-structure corresponding to the channel type. The ChannelSettings and ChannelReport structures documented here shows all of them but only one will be or should be present at a time --- - * - * OpenAPI spec version: 6.0.0 - * Contact: f4exb06@gmail.com - * - * NOTE: This class is auto generated by the swagger code generator program. - * https://github.com/swagger-api/swagger-codegen.git - * Do not edit the class manually. - */ - -/* - * SWGMapActions_find.h - * - * A request to centre the map on an item. - */ - -#ifndef SWGMapActions_find_H_ -#define SWGMapActions_find_H_ - -#include - - -#include - -#include "SWGObject.h" -#include "export.h" - -namespace SWGSDRangel { - -class SWG_API SWGMapActions_find: public SWGObject { -public: - SWGMapActions_find(); - SWGMapActions_find(QString* json); - virtual ~SWGMapActions_find(); - void init(); - void cleanup(); - - virtual QString asJson () override; - virtual QJsonObject* asJsonObject() override; - virtual void fromJsonObject(QJsonObject &json) override; - virtual SWGMapActions_find* fromJson(QString &jsonString) override; - - QString* getId(); - void setId(QString* id); - - - virtual bool isSet() override; - -private: - QString* id; - bool m_id_isSet; - -}; - -} - -#endif /* SWGMapActions_find_H_ */ diff --git a/swagger/sdrangel/code/qt5/client/SWGMapItem_track.cpp b/swagger/sdrangel/code/qt5/client/SWGMapItem_track.cpp deleted file mode 100644 index 589a18c57..000000000 --- a/swagger/sdrangel/code/qt5/client/SWGMapItem_track.cpp +++ /dev/null @@ -1,154 +0,0 @@ -/** - * SDRangel - * This is the web REST/JSON API of SDRangel SDR software. SDRangel is an Open Source Qt5/OpenGL 3.0+ (4.3+ in Windows) GUI and server Software Defined Radio and signal analyzer in software. It supports Airspy, BladeRF, HackRF, LimeSDR, PlutoSDR, RTL-SDR, SDRplay RSP1 and FunCube --- Limitations and specifcities: * In SDRangel GUI the first Rx device set cannot be deleted. Conversely the server starts with no device sets and its number of device sets can be reduced to zero by as many calls as necessary to /sdrangel/deviceset with DELETE method. * Preset import and export from/to file is a server only feature. * Device set focus is a GUI only feature. * The following channels are not implemented (status 501 is returned): ATV and DATV demodulators, Channel Analyzer NG, LoRa demodulator * The device settings and report structures contains only the sub-structure corresponding to the device type. The DeviceSettings and DeviceReport structures documented here shows all of them but only one will be or should be present at a time * The channel settings and report structures contains only the sub-structure corresponding to the channel type. The ChannelSettings and ChannelReport structures documented here shows all of them but only one will be or should be present at a time --- - * - * OpenAPI spec version: 6.0.0 - * Contact: f4exb06@gmail.com - * - * NOTE: This class is auto generated by the swagger code generator program. - * https://github.com/swagger-api/swagger-codegen.git - * Do not edit the class manually. - */ - - -#include "SWGMapItem_track.h" - -#include "SWGHelpers.h" - -#include -#include -#include -#include - -namespace SWGSDRangel { - -SWGMapItem_track::SWGMapItem_track(QString* json) { - init(); - this->fromJson(*json); -} - -SWGMapItem_track::SWGMapItem_track() { - latitude = 0.0f; - m_latitude_isSet = false; - longitude = 0.0f; - m_longitude_isSet = false; - altitude = 0.0f; - m_altitude_isSet = false; -} - -SWGMapItem_track::~SWGMapItem_track() { - this->cleanup(); -} - -void -SWGMapItem_track::init() { - latitude = 0.0f; - m_latitude_isSet = false; - longitude = 0.0f; - m_longitude_isSet = false; - altitude = 0.0f; - m_altitude_isSet = false; -} - -void -SWGMapItem_track::cleanup() { - - - -} - -SWGMapItem_track* -SWGMapItem_track::fromJson(QString &json) { - QByteArray array (json.toStdString().c_str()); - QJsonDocument doc = QJsonDocument::fromJson(array); - QJsonObject jsonObject = doc.object(); - this->fromJsonObject(jsonObject); - return this; -} - -void -SWGMapItem_track::fromJsonObject(QJsonObject &pJson) { - ::SWGSDRangel::setValue(&latitude, pJson["latitude"], "float", ""); - - ::SWGSDRangel::setValue(&longitude, pJson["longitude"], "float", ""); - - ::SWGSDRangel::setValue(&altitude, pJson["altitude"], "float", ""); - -} - -QString -SWGMapItem_track::asJson () -{ - QJsonObject* obj = this->asJsonObject(); - - QJsonDocument doc(*obj); - QByteArray bytes = doc.toJson(); - delete obj; - return QString(bytes); -} - -QJsonObject* -SWGMapItem_track::asJsonObject() { - QJsonObject* obj = new QJsonObject(); - if(m_latitude_isSet){ - obj->insert("latitude", QJsonValue(latitude)); - } - if(m_longitude_isSet){ - obj->insert("longitude", QJsonValue(longitude)); - } - if(m_altitude_isSet){ - obj->insert("altitude", QJsonValue(altitude)); - } - - return obj; -} - -float -SWGMapItem_track::getLatitude() { - return latitude; -} -void -SWGMapItem_track::setLatitude(float latitude) { - this->latitude = latitude; - this->m_latitude_isSet = true; -} - -float -SWGMapItem_track::getLongitude() { - return longitude; -} -void -SWGMapItem_track::setLongitude(float longitude) { - this->longitude = longitude; - this->m_longitude_isSet = true; -} - -float -SWGMapItem_track::getAltitude() { - return altitude; -} -void -SWGMapItem_track::setAltitude(float altitude) { - this->altitude = altitude; - this->m_altitude_isSet = true; -} - - -bool -SWGMapItem_track::isSet(){ - bool isObjectUpdated = false; - do{ - if(m_latitude_isSet){ - isObjectUpdated = true; break; - } - if(m_longitude_isSet){ - isObjectUpdated = true; break; - } - if(m_altitude_isSet){ - isObjectUpdated = true; break; - } - }while(false); - return isObjectUpdated; -} -} - diff --git a/swagger/sdrangel/code/qt5/client/SWGMapItem_track.h b/swagger/sdrangel/code/qt5/client/SWGMapItem_track.h deleted file mode 100644 index ec738bd51..000000000 --- a/swagger/sdrangel/code/qt5/client/SWGMapItem_track.h +++ /dev/null @@ -1,70 +0,0 @@ -/** - * SDRangel - * This is the web REST/JSON API of SDRangel SDR software. SDRangel is an Open Source Qt5/OpenGL 3.0+ (4.3+ in Windows) GUI and server Software Defined Radio and signal analyzer in software. It supports Airspy, BladeRF, HackRF, LimeSDR, PlutoSDR, RTL-SDR, SDRplay RSP1 and FunCube --- Limitations and specifcities: * In SDRangel GUI the first Rx device set cannot be deleted. Conversely the server starts with no device sets and its number of device sets can be reduced to zero by as many calls as necessary to /sdrangel/deviceset with DELETE method. * Preset import and export from/to file is a server only feature. * Device set focus is a GUI only feature. * The following channels are not implemented (status 501 is returned): ATV and DATV demodulators, Channel Analyzer NG, LoRa demodulator * The device settings and report structures contains only the sub-structure corresponding to the device type. The DeviceSettings and DeviceReport structures documented here shows all of them but only one will be or should be present at a time * The channel settings and report structures contains only the sub-structure corresponding to the channel type. The ChannelSettings and ChannelReport structures documented here shows all of them but only one will be or should be present at a time --- - * - * OpenAPI spec version: 6.0.0 - * Contact: f4exb06@gmail.com - * - * NOTE: This class is auto generated by the swagger code generator program. - * https://github.com/swagger-api/swagger-codegen.git - * Do not edit the class manually. - */ - -/* - * SWGMapItem_track.h - * - * - */ - -#ifndef SWGMapItem_track_H_ -#define SWGMapItem_track_H_ - -#include - - - -#include "SWGObject.h" -#include "export.h" - -namespace SWGSDRangel { - -class SWG_API SWGMapItem_track: public SWGObject { -public: - SWGMapItem_track(); - SWGMapItem_track(QString* json); - virtual ~SWGMapItem_track(); - void init(); - void cleanup(); - - virtual QString asJson () override; - virtual QJsonObject* asJsonObject() override; - virtual void fromJsonObject(QJsonObject &json) override; - virtual SWGMapItem_track* fromJson(QString &jsonString) override; - - float getLatitude(); - void setLatitude(float latitude); - - float getLongitude(); - void setLongitude(float longitude); - - float getAltitude(); - void setAltitude(float altitude); - - - virtual bool isSet() override; - -private: - float latitude; - bool m_latitude_isSet; - - float longitude; - bool m_longitude_isSet; - - float altitude; - bool m_altitude_isSet; - -}; - -} - -#endif /* SWGMapItem_track_H_ */ diff --git a/swagger/sdrangel/code/qt5/client/SWGModelFactory.h b/swagger/sdrangel/code/qt5/client/SWGModelFactory.h index 6ff46686e..6594f5cff 100644 --- a/swagger/sdrangel/code/qt5/client/SWGModelFactory.h +++ b/swagger/sdrangel/code/qt5/client/SWGModelFactory.h @@ -111,7 +111,6 @@ #include "SWGFeaturePresets.h" #include "SWGFeatureReport.h" #include "SWGFeatureSet.h" -#include "SWGFeatureSetList.h" #include "SWGFeatureSetPreset.h" #include "SWGFeatureSettings.h" #include "SWGFileInputReport.h" @@ -806,11 +805,6 @@ namespace SWGSDRangel { obj->init(); return obj; } - if(QString("SWGFeatureSetList").compare(type) == 0) { - SWGFeatureSetList *obj = new SWGFeatureSetList(); - obj->init(); - return obj; - } if(QString("SWGFeatureSetPreset").compare(type) == 0) { SWGFeatureSetPreset *obj = new SWGFeatureSetPreset(); obj->init(); diff --git a/swagger/sdrangel/code/qt5/client/SWGPacketModActions_tx.cpp b/swagger/sdrangel/code/qt5/client/SWGPacketModActions_tx.cpp deleted file mode 100644 index 46d09fef3..000000000 --- a/swagger/sdrangel/code/qt5/client/SWGPacketModActions_tx.cpp +++ /dev/null @@ -1,185 +0,0 @@ -/** - * SDRangel - * This is the web REST/JSON API of SDRangel SDR software. SDRangel is an Open Source Qt5/OpenGL 3.0+ (4.3+ in Windows) GUI and server Software Defined Radio and signal analyzer in software. It supports Airspy, BladeRF, HackRF, LimeSDR, PlutoSDR, RTL-SDR, SDRplay RSP1 and FunCube --- Limitations and specifcities: * In SDRangel GUI the first Rx device set cannot be deleted. Conversely the server starts with no device sets and its number of device sets can be reduced to zero by as many calls as necessary to /sdrangel/deviceset with DELETE method. * Preset import and export from/to file is a server only feature. * Device set focus is a GUI only feature. * The following channels are not implemented (status 501 is returned): ATV and DATV demodulators, Channel Analyzer NG, LoRa demodulator * The device settings and report structures contains only the sub-structure corresponding to the device type. The DeviceSettings and DeviceReport structures documented here shows all of them but only one will be or should be present at a time * The channel settings and report structures contains only the sub-structure corresponding to the channel type. The ChannelSettings and ChannelReport structures documented here shows all of them but only one will be or should be present at a time --- - * - * OpenAPI spec version: 6.0.0 - * Contact: f4exb06@gmail.com - * - * NOTE: This class is auto generated by the swagger code generator program. - * https://github.com/swagger-api/swagger-codegen.git - * Do not edit the class manually. - */ - - -#include "SWGPacketModActions_tx.h" - -#include "SWGHelpers.h" - -#include -#include -#include -#include - -namespace SWGSDRangel { - -SWGPacketModActions_tx::SWGPacketModActions_tx(QString* json) { - init(); - this->fromJson(*json); -} - -SWGPacketModActions_tx::SWGPacketModActions_tx() { - callsign = nullptr; - m_callsign_isSet = false; - to = nullptr; - m_to_isSet = false; - via = nullptr; - m_via_isSet = false; - data = nullptr; - m_data_isSet = false; -} - -SWGPacketModActions_tx::~SWGPacketModActions_tx() { - this->cleanup(); -} - -void -SWGPacketModActions_tx::init() { - callsign = new QString(""); - m_callsign_isSet = false; - to = new QString(""); - m_to_isSet = false; - via = new QString(""); - m_via_isSet = false; - data = new QString(""); - m_data_isSet = false; -} - -void -SWGPacketModActions_tx::cleanup() { - if(callsign != nullptr) { - delete callsign; - } - if(to != nullptr) { - delete to; - } - if(via != nullptr) { - delete via; - } - if(data != nullptr) { - delete data; - } -} - -SWGPacketModActions_tx* -SWGPacketModActions_tx::fromJson(QString &json) { - QByteArray array (json.toStdString().c_str()); - QJsonDocument doc = QJsonDocument::fromJson(array); - QJsonObject jsonObject = doc.object(); - this->fromJsonObject(jsonObject); - return this; -} - -void -SWGPacketModActions_tx::fromJsonObject(QJsonObject &pJson) { - ::SWGSDRangel::setValue(&callsign, pJson["callsign"], "QString", "QString"); - - ::SWGSDRangel::setValue(&to, pJson["to"], "QString", "QString"); - - ::SWGSDRangel::setValue(&via, pJson["via"], "QString", "QString"); - - ::SWGSDRangel::setValue(&data, pJson["data"], "QString", "QString"); - -} - -QString -SWGPacketModActions_tx::asJson () -{ - QJsonObject* obj = this->asJsonObject(); - - QJsonDocument doc(*obj); - QByteArray bytes = doc.toJson(); - delete obj; - return QString(bytes); -} - -QJsonObject* -SWGPacketModActions_tx::asJsonObject() { - QJsonObject* obj = new QJsonObject(); - if(callsign != nullptr && *callsign != QString("")){ - toJsonValue(QString("callsign"), callsign, obj, QString("QString")); - } - if(to != nullptr && *to != QString("")){ - toJsonValue(QString("to"), to, obj, QString("QString")); - } - if(via != nullptr && *via != QString("")){ - toJsonValue(QString("via"), via, obj, QString("QString")); - } - if(data != nullptr && *data != QString("")){ - toJsonValue(QString("data"), data, obj, QString("QString")); - } - - return obj; -} - -QString* -SWGPacketModActions_tx::getCallsign() { - return callsign; -} -void -SWGPacketModActions_tx::setCallsign(QString* callsign) { - this->callsign = callsign; - this->m_callsign_isSet = true; -} - -QString* -SWGPacketModActions_tx::getTo() { - return to; -} -void -SWGPacketModActions_tx::setTo(QString* to) { - this->to = to; - this->m_to_isSet = true; -} - -QString* -SWGPacketModActions_tx::getVia() { - return via; -} -void -SWGPacketModActions_tx::setVia(QString* via) { - this->via = via; - this->m_via_isSet = true; -} - -QString* -SWGPacketModActions_tx::getData() { - return data; -} -void -SWGPacketModActions_tx::setData(QString* data) { - this->data = data; - this->m_data_isSet = true; -} - - -bool -SWGPacketModActions_tx::isSet(){ - bool isObjectUpdated = false; - do{ - if(callsign && *callsign != QString("")){ - isObjectUpdated = true; break; - } - if(to && *to != QString("")){ - isObjectUpdated = true; break; - } - if(via && *via != QString("")){ - isObjectUpdated = true; break; - } - if(data && *data != QString("")){ - isObjectUpdated = true; break; - } - }while(false); - return isObjectUpdated; -} -} - diff --git a/swagger/sdrangel/code/qt5/client/SWGPacketModActions_tx.h b/swagger/sdrangel/code/qt5/client/SWGPacketModActions_tx.h deleted file mode 100644 index f29149ddf..000000000 --- a/swagger/sdrangel/code/qt5/client/SWGPacketModActions_tx.h +++ /dev/null @@ -1,77 +0,0 @@ -/** - * SDRangel - * This is the web REST/JSON API of SDRangel SDR software. SDRangel is an Open Source Qt5/OpenGL 3.0+ (4.3+ in Windows) GUI and server Software Defined Radio and signal analyzer in software. It supports Airspy, BladeRF, HackRF, LimeSDR, PlutoSDR, RTL-SDR, SDRplay RSP1 and FunCube --- Limitations and specifcities: * In SDRangel GUI the first Rx device set cannot be deleted. Conversely the server starts with no device sets and its number of device sets can be reduced to zero by as many calls as necessary to /sdrangel/deviceset with DELETE method. * Preset import and export from/to file is a server only feature. * Device set focus is a GUI only feature. * The following channels are not implemented (status 501 is returned): ATV and DATV demodulators, Channel Analyzer NG, LoRa demodulator * The device settings and report structures contains only the sub-structure corresponding to the device type. The DeviceSettings and DeviceReport structures documented here shows all of them but only one will be or should be present at a time * The channel settings and report structures contains only the sub-structure corresponding to the channel type. The ChannelSettings and ChannelReport structures documented here shows all of them but only one will be or should be present at a time --- - * - * OpenAPI spec version: 6.0.0 - * Contact: f4exb06@gmail.com - * - * NOTE: This class is auto generated by the swagger code generator program. - * https://github.com/swagger-api/swagger-codegen.git - * Do not edit the class manually. - */ - -/* - * SWGPacketModActions_tx.h - * - * Transmit a packet - */ - -#ifndef SWGPacketModActions_tx_H_ -#define SWGPacketModActions_tx_H_ - -#include - - -#include - -#include "SWGObject.h" -#include "export.h" - -namespace SWGSDRangel { - -class SWG_API SWGPacketModActions_tx: public SWGObject { -public: - SWGPacketModActions_tx(); - SWGPacketModActions_tx(QString* json); - virtual ~SWGPacketModActions_tx(); - void init(); - void cleanup(); - - virtual QString asJson () override; - virtual QJsonObject* asJsonObject() override; - virtual void fromJsonObject(QJsonObject &json) override; - virtual SWGPacketModActions_tx* fromJson(QString &jsonString) override; - - QString* getCallsign(); - void setCallsign(QString* callsign); - - QString* getTo(); - void setTo(QString* to); - - QString* getVia(); - void setVia(QString* via); - - QString* getData(); - void setData(QString* data); - - - virtual bool isSet() override; - -private: - QString* callsign; - bool m_callsign_isSet; - - QString* to; - bool m_to_isSet; - - QString* via; - bool m_via_isSet; - - QString* data; - bool m_data_isSet; - -}; - -} - -#endif /* SWGPacketModActions_tx_H_ */ diff --git a/swagger/sdrangel/code/qt5/client/SWGVORLocalizerSettings_vorDemodChannels.cpp b/swagger/sdrangel/code/qt5/client/SWGVORLocalizerSettings_vorDemodChannels.cpp deleted file mode 100644 index 4004d5ecb..000000000 --- a/swagger/sdrangel/code/qt5/client/SWGVORLocalizerSettings_vorDemodChannels.cpp +++ /dev/null @@ -1,131 +0,0 @@ -/** - * SDRangel - * This is the web REST/JSON API of SDRangel SDR software. SDRangel is an Open Source Qt5/OpenGL 3.0+ (4.3+ in Windows) GUI and server Software Defined Radio and signal analyzer in software. It supports Airspy, BladeRF, HackRF, LimeSDR, PlutoSDR, RTL-SDR, SDRplay RSP1 and FunCube --- Limitations and specifcities: * In SDRangel GUI the first Rx device set cannot be deleted. Conversely the server starts with no device sets and its number of device sets can be reduced to zero by as many calls as necessary to /sdrangel/deviceset with DELETE method. * Preset import and export from/to file is a server only feature. * Device set focus is a GUI only feature. * The following channels are not implemented (status 501 is returned): ATV and DATV demodulators, Channel Analyzer NG, LoRa demodulator * The device settings and report structures contains only the sub-structure corresponding to the device type. The DeviceSettings and DeviceReport structures documented here shows all of them but only one will be or should be present at a time * The channel settings and report structures contains only the sub-structure corresponding to the channel type. The ChannelSettings and ChannelReport structures documented here shows all of them but only one will be or should be present at a time --- - * - * OpenAPI spec version: 6.0.0 - * Contact: f4exb06@gmail.com - * - * NOTE: This class is auto generated by the swagger code generator program. - * https://github.com/swagger-api/swagger-codegen.git - * Do not edit the class manually. - */ - - -#include "SWGVORLocalizerSettings_vorDemodChannels.h" - -#include "SWGHelpers.h" - -#include -#include -#include -#include - -namespace SWGSDRangel { - -SWGVORLocalizerSettings_vorDemodChannels::SWGVORLocalizerSettings_vorDemodChannels(QString* json) { - init(); - this->fromJson(*json); -} - -SWGVORLocalizerSettings_vorDemodChannels::SWGVORLocalizerSettings_vorDemodChannels() { - device_set_index = 0; - m_device_set_index_isSet = false; - channel_index = 0; - m_channel_index_isSet = false; -} - -SWGVORLocalizerSettings_vorDemodChannels::~SWGVORLocalizerSettings_vorDemodChannels() { - this->cleanup(); -} - -void -SWGVORLocalizerSettings_vorDemodChannels::init() { - device_set_index = 0; - m_device_set_index_isSet = false; - channel_index = 0; - m_channel_index_isSet = false; -} - -void -SWGVORLocalizerSettings_vorDemodChannels::cleanup() { - - -} - -SWGVORLocalizerSettings_vorDemodChannels* -SWGVORLocalizerSettings_vorDemodChannels::fromJson(QString &json) { - QByteArray array (json.toStdString().c_str()); - QJsonDocument doc = QJsonDocument::fromJson(array); - QJsonObject jsonObject = doc.object(); - this->fromJsonObject(jsonObject); - return this; -} - -void -SWGVORLocalizerSettings_vorDemodChannels::fromJsonObject(QJsonObject &pJson) { - ::SWGSDRangel::setValue(&device_set_index, pJson["deviceSetIndex"], "qint32", ""); - - ::SWGSDRangel::setValue(&channel_index, pJson["channelIndex"], "qint32", ""); - -} - -QString -SWGVORLocalizerSettings_vorDemodChannels::asJson () -{ - QJsonObject* obj = this->asJsonObject(); - - QJsonDocument doc(*obj); - QByteArray bytes = doc.toJson(); - delete obj; - return QString(bytes); -} - -QJsonObject* -SWGVORLocalizerSettings_vorDemodChannels::asJsonObject() { - QJsonObject* obj = new QJsonObject(); - if(m_device_set_index_isSet){ - obj->insert("deviceSetIndex", QJsonValue(device_set_index)); - } - if(m_channel_index_isSet){ - obj->insert("channelIndex", QJsonValue(channel_index)); - } - - return obj; -} - -qint32 -SWGVORLocalizerSettings_vorDemodChannels::getDeviceSetIndex() { - return device_set_index; -} -void -SWGVORLocalizerSettings_vorDemodChannels::setDeviceSetIndex(qint32 device_set_index) { - this->device_set_index = device_set_index; - this->m_device_set_index_isSet = true; -} - -qint32 -SWGVORLocalizerSettings_vorDemodChannels::getChannelIndex() { - return channel_index; -} -void -SWGVORLocalizerSettings_vorDemodChannels::setChannelIndex(qint32 channel_index) { - this->channel_index = channel_index; - this->m_channel_index_isSet = true; -} - - -bool -SWGVORLocalizerSettings_vorDemodChannels::isSet(){ - bool isObjectUpdated = false; - do{ - if(m_device_set_index_isSet){ - isObjectUpdated = true; break; - } - if(m_channel_index_isSet){ - isObjectUpdated = true; break; - } - }while(false); - return isObjectUpdated; -} -} - diff --git a/swagger/sdrangel/code/qt5/client/SWGVORLocalizerSettings_vorDemodChannels.h b/swagger/sdrangel/code/qt5/client/SWGVORLocalizerSettings_vorDemodChannels.h deleted file mode 100644 index 3416ee3a4..000000000 --- a/swagger/sdrangel/code/qt5/client/SWGVORLocalizerSettings_vorDemodChannels.h +++ /dev/null @@ -1,64 +0,0 @@ -/** - * SDRangel - * This is the web REST/JSON API of SDRangel SDR software. SDRangel is an Open Source Qt5/OpenGL 3.0+ (4.3+ in Windows) GUI and server Software Defined Radio and signal analyzer in software. It supports Airspy, BladeRF, HackRF, LimeSDR, PlutoSDR, RTL-SDR, SDRplay RSP1 and FunCube --- Limitations and specifcities: * In SDRangel GUI the first Rx device set cannot be deleted. Conversely the server starts with no device sets and its number of device sets can be reduced to zero by as many calls as necessary to /sdrangel/deviceset with DELETE method. * Preset import and export from/to file is a server only feature. * Device set focus is a GUI only feature. * The following channels are not implemented (status 501 is returned): ATV and DATV demodulators, Channel Analyzer NG, LoRa demodulator * The device settings and report structures contains only the sub-structure corresponding to the device type. The DeviceSettings and DeviceReport structures documented here shows all of them but only one will be or should be present at a time * The channel settings and report structures contains only the sub-structure corresponding to the channel type. The ChannelSettings and ChannelReport structures documented here shows all of them but only one will be or should be present at a time --- - * - * OpenAPI spec version: 6.0.0 - * Contact: f4exb06@gmail.com - * - * NOTE: This class is auto generated by the swagger code generator program. - * https://github.com/swagger-api/swagger-codegen.git - * Do not edit the class manually. - */ - -/* - * SWGVORLocalizerSettings_vorDemodChannels.h - * - * - */ - -#ifndef SWGVORLocalizerSettings_vorDemodChannels_H_ -#define SWGVORLocalizerSettings_vorDemodChannels_H_ - -#include - - - -#include "SWGObject.h" -#include "export.h" - -namespace SWGSDRangel { - -class SWG_API SWGVORLocalizerSettings_vorDemodChannels: public SWGObject { -public: - SWGVORLocalizerSettings_vorDemodChannels(); - SWGVORLocalizerSettings_vorDemodChannels(QString* json); - virtual ~SWGVORLocalizerSettings_vorDemodChannels(); - void init(); - void cleanup(); - - virtual QString asJson () override; - virtual QJsonObject* asJsonObject() override; - virtual void fromJsonObject(QJsonObject &json) override; - virtual SWGVORLocalizerSettings_vorDemodChannels* fromJson(QString &jsonString) override; - - qint32 getDeviceSetIndex(); - void setDeviceSetIndex(qint32 device_set_index); - - qint32 getChannelIndex(); - void setChannelIndex(qint32 channel_index); - - - virtual bool isSet() override; - -private: - qint32 device_set_index; - bool m_device_set_index_isSet; - - qint32 channel_index; - bool m_channel_index_isSet; - -}; - -} - -#endif /* SWGVORLocalizerSettings_vorDemodChannels_H_ */