kopia lustrzana https://github.com/f4exb/sdrangel
Unique WebAPIAdapter
f4exb
rodzic
c9e0425616
commit
2b2ffce469
|
|
@ -170,6 +170,7 @@ set(sdrbase_SOURCES
|
|||
plugin/pluginapi.cpp
|
||||
plugin/pluginmanager.cpp
|
||||
|
||||
webapi/webapiadapter.cpp
|
||||
webapi/webapiadapterbase.cpp
|
||||
webapi/webapiadapterinterface.cpp
|
||||
webapi/webapirequestmapper.cpp
|
||||
|
|
@ -334,6 +335,7 @@ set(sdrbase_HEADERS
|
|||
util/uid.h
|
||||
util/timeutil.h
|
||||
|
||||
webapi/webapiadapter.h
|
||||
webapi/webapiadapterbase.h
|
||||
webapi/webapiadapterinterface.h
|
||||
webapi/webapirequestmapper.h
|
||||
|
|
|
|||
|
|
@ -419,8 +419,7 @@ public:
|
|||
|
||||
friend class MainServer;
|
||||
friend class MainWindow;
|
||||
friend class WebAPIAdapterSrv;
|
||||
friend class WebAPIAdapterGUI;
|
||||
friend class WebAPIAdapter;
|
||||
|
||||
private:
|
||||
MainSettings m_settings;
|
||||
|
|
|
|||
|
|
@ -17,12 +17,11 @@
|
|||
// along with this program. If not, see <http://www.gnu.org/licenses/>. //
|
||||
///////////////////////////////////////////////////////////////////////////////////
|
||||
|
||||
#include <QApplication>
|
||||
#include <QCoreApplication>
|
||||
#include <QList>
|
||||
#include <QSysInfo>
|
||||
|
||||
#include "maincore.h"
|
||||
#include "ui_mainwindow.h"
|
||||
#include "loggerwithfile.h"
|
||||
#include "device/deviceapi.h"
|
||||
#include "device/deviceset.h"
|
||||
|
|
@ -80,18 +79,18 @@
|
|||
#include "limerfe/limerfecontroller.h"
|
||||
#endif
|
||||
|
||||
#include "webapiadaptergui.h"
|
||||
#include "webapiadapter.h"
|
||||
|
||||
WebAPIAdapterGUI::WebAPIAdapterGUI()
|
||||
WebAPIAdapter::WebAPIAdapter()
|
||||
{
|
||||
m_mainCore = MainCore::instance();
|
||||
}
|
||||
|
||||
WebAPIAdapterGUI::~WebAPIAdapterGUI()
|
||||
WebAPIAdapter::~WebAPIAdapter()
|
||||
{
|
||||
}
|
||||
|
||||
int WebAPIAdapterGUI::instanceSummary(
|
||||
int WebAPIAdapter::instanceSummary(
|
||||
SWGSDRangel::SWGInstanceSummaryResponse& response,
|
||||
SWGSDRangel::SWGErrorResponse& error)
|
||||
{
|
||||
|
|
@ -125,7 +124,7 @@ int WebAPIAdapterGUI::instanceSummary(
|
|||
return 200;
|
||||
}
|
||||
|
||||
int WebAPIAdapterGUI::instanceDelete(
|
||||
int WebAPIAdapter::instanceDelete(
|
||||
SWGSDRangel::SWGSuccessResponse& response,
|
||||
SWGSDRangel::SWGErrorResponse& error)
|
||||
{
|
||||
|
|
@ -134,7 +133,7 @@ int WebAPIAdapterGUI::instanceDelete(
|
|||
return 400;
|
||||
}
|
||||
|
||||
int WebAPIAdapterGUI::instanceConfigGet(
|
||||
int WebAPIAdapter::instanceConfigGet(
|
||||
SWGSDRangel::SWGInstanceConfigResponse& response,
|
||||
SWGSDRangel::SWGErrorResponse& error)
|
||||
{
|
||||
|
|
@ -181,7 +180,7 @@ int WebAPIAdapterGUI::instanceConfigGet(
|
|||
return 200;
|
||||
}
|
||||
|
||||
int WebAPIAdapterGUI::instanceConfigPutPatch(
|
||||
int WebAPIAdapter::instanceConfigPutPatch(
|
||||
bool force, // PUT else PATCH
|
||||
SWGSDRangel::SWGInstanceConfigResponse& query,
|
||||
const ConfigKeys& configKeys,
|
||||
|
|
@ -241,7 +240,7 @@ int WebAPIAdapterGUI::instanceConfigPutPatch(
|
|||
return 200;
|
||||
}
|
||||
|
||||
int WebAPIAdapterGUI::instanceDevices(
|
||||
int WebAPIAdapter::instanceDevices(
|
||||
int direction,
|
||||
SWGSDRangel::SWGInstanceDevicesResponse& response,
|
||||
SWGSDRangel::SWGErrorResponse& error)
|
||||
|
|
@ -293,7 +292,7 @@ int WebAPIAdapterGUI::instanceDevices(
|
|||
return 200;
|
||||
}
|
||||
|
||||
int WebAPIAdapterGUI::instanceChannels(
|
||||
int WebAPIAdapter::instanceChannels(
|
||||
int direction,
|
||||
SWGSDRangel::SWGInstanceChannelsResponse& response,
|
||||
SWGSDRangel::SWGErrorResponse& error)
|
||||
|
|
@ -344,7 +343,7 @@ int WebAPIAdapterGUI::instanceChannels(
|
|||
return 200;
|
||||
}
|
||||
|
||||
int WebAPIAdapterGUI::instanceLoggingGet(
|
||||
int WebAPIAdapter::instanceLoggingGet(
|
||||
SWGSDRangel::SWGLoggingInfo& response,
|
||||
SWGSDRangel::SWGErrorResponse& error)
|
||||
{
|
||||
|
|
@ -362,7 +361,7 @@ int WebAPIAdapterGUI::instanceLoggingGet(
|
|||
return 200;
|
||||
}
|
||||
|
||||
int WebAPIAdapterGUI::instanceLoggingPut(
|
||||
int WebAPIAdapter::instanceLoggingPut(
|
||||
SWGSDRangel::SWGLoggingInfo& query,
|
||||
SWGSDRangel::SWGLoggingInfo& response,
|
||||
SWGSDRangel::SWGErrorResponse& error)
|
||||
|
|
@ -401,7 +400,7 @@ int WebAPIAdapterGUI::instanceLoggingPut(
|
|||
return 200;
|
||||
}
|
||||
|
||||
int WebAPIAdapterGUI::instanceAudioGet(
|
||||
int WebAPIAdapter::instanceAudioGet(
|
||||
SWGSDRangel::SWGAudioDevices& response,
|
||||
SWGSDRangel::SWGErrorResponse& error)
|
||||
{
|
||||
|
|
@ -487,7 +486,7 @@ int WebAPIAdapterGUI::instanceAudioGet(
|
|||
return 200;
|
||||
}
|
||||
|
||||
int WebAPIAdapterGUI::instanceAudioInputPatch(
|
||||
int WebAPIAdapter::instanceAudioInputPatch(
|
||||
SWGSDRangel::SWGAudioInputDevice& response,
|
||||
const QStringList& audioInputKeys,
|
||||
SWGSDRangel::SWGErrorResponse& error)
|
||||
|
|
@ -522,7 +521,7 @@ int WebAPIAdapterGUI::instanceAudioInputPatch(
|
|||
return 200;
|
||||
}
|
||||
|
||||
int WebAPIAdapterGUI::instanceAudioOutputPatch(
|
||||
int WebAPIAdapter::instanceAudioOutputPatch(
|
||||
SWGSDRangel::SWGAudioOutputDevice& response,
|
||||
const QStringList& audioOutputKeys,
|
||||
SWGSDRangel::SWGErrorResponse& error)
|
||||
|
|
@ -587,7 +586,7 @@ int WebAPIAdapterGUI::instanceAudioOutputPatch(
|
|||
return 200;
|
||||
}
|
||||
|
||||
int WebAPIAdapterGUI::instanceAudioInputDelete(
|
||||
int WebAPIAdapter::instanceAudioInputDelete(
|
||||
SWGSDRangel::SWGAudioInputDevice& response,
|
||||
SWGSDRangel::SWGErrorResponse& error)
|
||||
{
|
||||
|
|
@ -612,7 +611,7 @@ int WebAPIAdapterGUI::instanceAudioInputDelete(
|
|||
return 200;
|
||||
}
|
||||
|
||||
int WebAPIAdapterGUI::instanceAudioOutputDelete(
|
||||
int WebAPIAdapter::instanceAudioOutputDelete(
|
||||
SWGSDRangel::SWGAudioOutputDevice& response,
|
||||
SWGSDRangel::SWGErrorResponse& error)
|
||||
{
|
||||
|
|
@ -649,7 +648,7 @@ int WebAPIAdapterGUI::instanceAudioOutputDelete(
|
|||
return 200;
|
||||
}
|
||||
|
||||
int WebAPIAdapterGUI::instanceAudioInputCleanupPatch(
|
||||
int WebAPIAdapter::instanceAudioInputCleanupPatch(
|
||||
SWGSDRangel::SWGSuccessResponse& response,
|
||||
SWGSDRangel::SWGErrorResponse& error)
|
||||
{
|
||||
|
|
@ -663,7 +662,7 @@ int WebAPIAdapterGUI::instanceAudioInputCleanupPatch(
|
|||
return 200;
|
||||
}
|
||||
|
||||
int WebAPIAdapterGUI::instanceAudioOutputCleanupPatch(
|
||||
int WebAPIAdapter::instanceAudioOutputCleanupPatch(
|
||||
SWGSDRangel::SWGSuccessResponse& response,
|
||||
SWGSDRangel::SWGErrorResponse& error)
|
||||
{
|
||||
|
|
@ -677,7 +676,7 @@ int WebAPIAdapterGUI::instanceAudioOutputCleanupPatch(
|
|||
return 200;
|
||||
}
|
||||
|
||||
int WebAPIAdapterGUI::instanceLocationGet(
|
||||
int WebAPIAdapter::instanceLocationGet(
|
||||
SWGSDRangel::SWGLocationInformation& response,
|
||||
SWGSDRangel::SWGErrorResponse& error)
|
||||
{
|
||||
|
|
@ -689,7 +688,7 @@ int WebAPIAdapterGUI::instanceLocationGet(
|
|||
return 200;
|
||||
}
|
||||
|
||||
int WebAPIAdapterGUI::instanceLocationPut(
|
||||
int WebAPIAdapter::instanceLocationPut(
|
||||
SWGSDRangel::SWGLocationInformation& response,
|
||||
SWGSDRangel::SWGErrorResponse& error)
|
||||
{
|
||||
|
|
@ -709,7 +708,7 @@ int WebAPIAdapterGUI::instanceLocationPut(
|
|||
return 200;
|
||||
}
|
||||
|
||||
int WebAPIAdapterGUI::instanceDVSerialGet(
|
||||
int WebAPIAdapter::instanceDVSerialGet(
|
||||
SWGSDRangel::SWGDVSerialDevices& response,
|
||||
SWGSDRangel::SWGErrorResponse& error)
|
||||
{
|
||||
|
|
@ -735,7 +734,7 @@ int WebAPIAdapterGUI::instanceDVSerialGet(
|
|||
return 200;
|
||||
}
|
||||
|
||||
int WebAPIAdapterGUI::instanceDVSerialPatch(
|
||||
int WebAPIAdapter::instanceDVSerialPatch(
|
||||
bool dvserial,
|
||||
SWGSDRangel::SWGDVSerialDevices& response,
|
||||
SWGSDRangel::SWGErrorResponse& error)
|
||||
|
|
@ -773,7 +772,7 @@ int WebAPIAdapterGUI::instanceDVSerialPatch(
|
|||
return 200;
|
||||
}
|
||||
|
||||
int WebAPIAdapterGUI::instanceAMBESerialGet(
|
||||
int WebAPIAdapter::instanceAMBESerialGet(
|
||||
SWGSDRangel::SWGDVSerialDevices& response,
|
||||
SWGSDRangel::SWGErrorResponse& error)
|
||||
{
|
||||
|
|
@ -805,7 +804,7 @@ int WebAPIAdapterGUI::instanceAMBESerialGet(
|
|||
return 200;
|
||||
}
|
||||
|
||||
int WebAPIAdapterGUI::instanceAMBEDevicesGet(
|
||||
int WebAPIAdapter::instanceAMBEDevicesGet(
|
||||
SWGSDRangel::SWGAMBEDevices& response,
|
||||
SWGSDRangel::SWGErrorResponse& error)
|
||||
{
|
||||
|
|
@ -832,7 +831,7 @@ int WebAPIAdapterGUI::instanceAMBEDevicesGet(
|
|||
return 200;
|
||||
}
|
||||
|
||||
int WebAPIAdapterGUI::instanceAMBEDevicesDelete(
|
||||
int WebAPIAdapter::instanceAMBEDevicesDelete(
|
||||
SWGSDRangel::SWGSuccessResponse& response,
|
||||
SWGSDRangel::SWGErrorResponse& error)
|
||||
{
|
||||
|
|
@ -846,7 +845,7 @@ int WebAPIAdapterGUI::instanceAMBEDevicesDelete(
|
|||
return 200;
|
||||
}
|
||||
|
||||
int WebAPIAdapterGUI::instanceAMBEDevicesPut(
|
||||
int WebAPIAdapter::instanceAMBEDevicesPut(
|
||||
SWGSDRangel::SWGAMBEDevices& query,
|
||||
SWGSDRangel::SWGAMBEDevices& response,
|
||||
SWGSDRangel::SWGErrorResponse& error)
|
||||
|
|
@ -864,7 +863,7 @@ int WebAPIAdapterGUI::instanceAMBEDevicesPut(
|
|||
return 200;
|
||||
}
|
||||
|
||||
int WebAPIAdapterGUI::instanceAMBEDevicesPatch(
|
||||
int WebAPIAdapter::instanceAMBEDevicesPatch(
|
||||
SWGSDRangel::SWGAMBEDevices& query,
|
||||
SWGSDRangel::SWGAMBEDevices& response,
|
||||
SWGSDRangel::SWGErrorResponse& error)
|
||||
|
|
@ -886,7 +885,7 @@ int WebAPIAdapterGUI::instanceAMBEDevicesPatch(
|
|||
}
|
||||
|
||||
#ifdef HAS_LIMERFEUSB
|
||||
int WebAPIAdapterGUI::instanceLimeRFESerialGet(
|
||||
int WebAPIAdapter::instanceLimeRFESerialGet(
|
||||
SWGSDRangel::SWGLimeRFEDevices& response,
|
||||
SWGSDRangel::SWGErrorResponse& error)
|
||||
{
|
||||
|
|
@ -909,7 +908,7 @@ int WebAPIAdapterGUI::instanceLimeRFESerialGet(
|
|||
return 200;
|
||||
}
|
||||
|
||||
int WebAPIAdapterGUI::instanceLimeRFEConfigGet(
|
||||
int WebAPIAdapter::instanceLimeRFEConfigGet(
|
||||
const QString& serial,
|
||||
SWGSDRangel::SWGLimeRFESettings& response,
|
||||
SWGSDRangel::SWGErrorResponse& error)
|
||||
|
|
@ -961,7 +960,7 @@ int WebAPIAdapterGUI::instanceLimeRFEConfigGet(
|
|||
return 200;
|
||||
}
|
||||
|
||||
int WebAPIAdapterGUI::instanceLimeRFEConfigPut(
|
||||
int WebAPIAdapter::instanceLimeRFEConfigPut(
|
||||
SWGSDRangel::SWGLimeRFESettings& query,
|
||||
SWGSDRangel::SWGSuccessResponse& response,
|
||||
SWGSDRangel::SWGErrorResponse& error)
|
||||
|
|
@ -1012,7 +1011,7 @@ int WebAPIAdapterGUI::instanceLimeRFEConfigPut(
|
|||
return 200;
|
||||
}
|
||||
|
||||
int WebAPIAdapterGUI::instanceLimeRFERunPut(
|
||||
int WebAPIAdapter::instanceLimeRFERunPut(
|
||||
SWGSDRangel::SWGLimeRFESettings& query,
|
||||
SWGSDRangel::SWGSuccessResponse& response,
|
||||
SWGSDRangel::SWGErrorResponse& error)
|
||||
|
|
@ -1047,7 +1046,7 @@ int WebAPIAdapterGUI::instanceLimeRFERunPut(
|
|||
return 200;
|
||||
}
|
||||
|
||||
int WebAPIAdapterGUI::instanceLimeRFEPowerGet(
|
||||
int WebAPIAdapter::instanceLimeRFEPowerGet(
|
||||
const QString& serial,
|
||||
SWGSDRangel::SWGLimeRFEPower& response,
|
||||
SWGSDRangel::SWGErrorResponse& error)
|
||||
|
|
@ -1094,7 +1093,7 @@ int WebAPIAdapterGUI::instanceLimeRFEPowerGet(
|
|||
}
|
||||
#endif
|
||||
|
||||
int WebAPIAdapterGUI::instancePresetsGet(
|
||||
int WebAPIAdapter::instancePresetsGet(
|
||||
SWGSDRangel::SWGPresets& response,
|
||||
SWGSDRangel::SWGErrorResponse& error)
|
||||
{
|
||||
|
|
@ -1140,7 +1139,7 @@ int WebAPIAdapterGUI::instancePresetsGet(
|
|||
return 200;
|
||||
}
|
||||
|
||||
int WebAPIAdapterGUI::instancePresetPatch(
|
||||
int WebAPIAdapter::instancePresetPatch(
|
||||
SWGSDRangel::SWGPresetTransfer& query,
|
||||
SWGSDRangel::SWGPresetIdentifier& response,
|
||||
SWGSDRangel::SWGErrorResponse& error)
|
||||
|
|
@ -1207,7 +1206,7 @@ int WebAPIAdapterGUI::instancePresetPatch(
|
|||
return 202;
|
||||
}
|
||||
|
||||
int WebAPIAdapterGUI::instancePresetPut(
|
||||
int WebAPIAdapter::instancePresetPut(
|
||||
SWGSDRangel::SWGPresetTransfer& query,
|
||||
SWGSDRangel::SWGPresetIdentifier& response,
|
||||
SWGSDRangel::SWGErrorResponse& error)
|
||||
|
|
@ -1276,7 +1275,7 @@ int WebAPIAdapterGUI::instancePresetPut(
|
|||
return 202;
|
||||
}
|
||||
|
||||
int WebAPIAdapterGUI::instancePresetPost(
|
||||
int WebAPIAdapter::instancePresetPost(
|
||||
SWGSDRangel::SWGPresetTransfer& query,
|
||||
SWGSDRangel::SWGPresetIdentifier& response,
|
||||
SWGSDRangel::SWGErrorResponse& error)
|
||||
|
|
@ -1339,7 +1338,7 @@ int WebAPIAdapterGUI::instancePresetPost(
|
|||
return 202;
|
||||
}
|
||||
|
||||
int WebAPIAdapterGUI::instancePresetDelete(
|
||||
int WebAPIAdapter::instancePresetDelete(
|
||||
SWGSDRangel::SWGPresetIdentifier& response,
|
||||
SWGSDRangel::SWGErrorResponse& error)
|
||||
{
|
||||
|
|
@ -1369,7 +1368,7 @@ int WebAPIAdapterGUI::instancePresetDelete(
|
|||
return 202;
|
||||
}
|
||||
|
||||
int WebAPIAdapterGUI::instanceDeviceSetsGet(
|
||||
int WebAPIAdapter::instanceDeviceSetsGet(
|
||||
SWGSDRangel::SWGDeviceSetList& response,
|
||||
SWGSDRangel::SWGErrorResponse& error)
|
||||
{
|
||||
|
|
@ -1378,7 +1377,7 @@ int WebAPIAdapterGUI::instanceDeviceSetsGet(
|
|||
return 200;
|
||||
}
|
||||
|
||||
int WebAPIAdapterGUI::instanceFeatureSetsGet(
|
||||
int WebAPIAdapter::instanceFeatureSetsGet(
|
||||
SWGSDRangel::SWGFeatureSetList& response,
|
||||
SWGSDRangel::SWGErrorResponse& error)
|
||||
{
|
||||
|
|
@ -1387,7 +1386,7 @@ int WebAPIAdapterGUI::instanceFeatureSetsGet(
|
|||
return 200;
|
||||
}
|
||||
|
||||
int WebAPIAdapterGUI::instanceDeviceSetPost(
|
||||
int WebAPIAdapter::instanceDeviceSetPost(
|
||||
int direction,
|
||||
SWGSDRangel::SWGSuccessResponse& response,
|
||||
SWGSDRangel::SWGErrorResponse& error)
|
||||
|
|
@ -1402,7 +1401,7 @@ int WebAPIAdapterGUI::instanceDeviceSetPost(
|
|||
return 202;
|
||||
}
|
||||
|
||||
int WebAPIAdapterGUI::instanceDeviceSetDelete(
|
||||
int WebAPIAdapter::instanceDeviceSetDelete(
|
||||
SWGSDRangel::SWGSuccessResponse& response,
|
||||
SWGSDRangel::SWGErrorResponse& error)
|
||||
{
|
||||
|
|
@ -1425,7 +1424,7 @@ int WebAPIAdapterGUI::instanceDeviceSetDelete(
|
|||
}
|
||||
}
|
||||
|
||||
int WebAPIAdapterGUI::devicesetGet(
|
||||
int WebAPIAdapter::devicesetGet(
|
||||
int deviceSetIndex,
|
||||
SWGSDRangel::SWGDeviceSet& response,
|
||||
SWGSDRangel::SWGErrorResponse& error)
|
||||
|
|
@ -1446,7 +1445,7 @@ int WebAPIAdapterGUI::devicesetGet(
|
|||
}
|
||||
}
|
||||
|
||||
int WebAPIAdapterGUI::devicesetFocusPatch(
|
||||
int WebAPIAdapter::devicesetFocusPatch(
|
||||
int deviceSetIndex,
|
||||
SWGSDRangel::SWGSuccessResponse& response,
|
||||
SWGSDRangel::SWGErrorResponse& error)
|
||||
|
|
@ -1470,7 +1469,7 @@ int WebAPIAdapterGUI::devicesetFocusPatch(
|
|||
}
|
||||
}
|
||||
|
||||
int WebAPIAdapterGUI::devicesetDevicePut(
|
||||
int WebAPIAdapter::devicesetDevicePut(
|
||||
int deviceSetIndex,
|
||||
SWGSDRangel::SWGDeviceListItem& query,
|
||||
SWGSDRangel::SWGDeviceListItem& response,
|
||||
|
|
@ -1577,7 +1576,7 @@ int WebAPIAdapterGUI::devicesetDevicePut(
|
|||
}
|
||||
}
|
||||
|
||||
int WebAPIAdapterGUI::devicesetDeviceSettingsGet(
|
||||
int WebAPIAdapter::devicesetDeviceSettingsGet(
|
||||
int deviceSetIndex,
|
||||
SWGSDRangel::SWGDeviceSettings& response,
|
||||
SWGSDRangel::SWGErrorResponse& error)
|
||||
|
|
@ -1622,7 +1621,7 @@ int WebAPIAdapterGUI::devicesetDeviceSettingsGet(
|
|||
}
|
||||
}
|
||||
|
||||
int WebAPIAdapterGUI::devicesetDeviceActionsPost(
|
||||
int WebAPIAdapter::devicesetDeviceActionsPost(
|
||||
int deviceSetIndex,
|
||||
const QStringList& deviceActionsKeys,
|
||||
SWGSDRangel::SWGDeviceActions& query,
|
||||
|
|
@ -1726,7 +1725,7 @@ int WebAPIAdapterGUI::devicesetDeviceActionsPost(
|
|||
}
|
||||
}
|
||||
|
||||
int WebAPIAdapterGUI::devicesetDeviceSettingsPutPatch(
|
||||
int WebAPIAdapter::devicesetDeviceSettingsPutPatch(
|
||||
int deviceSetIndex,
|
||||
bool force,
|
||||
const QStringList& deviceSettingsKeys,
|
||||
|
|
@ -1806,7 +1805,7 @@ int WebAPIAdapterGUI::devicesetDeviceSettingsPutPatch(
|
|||
}
|
||||
}
|
||||
|
||||
int WebAPIAdapterGUI::devicesetDeviceRunGet(
|
||||
int WebAPIAdapter::devicesetDeviceRunGet(
|
||||
int deviceSetIndex,
|
||||
SWGSDRangel::SWGDeviceState& response,
|
||||
SWGSDRangel::SWGErrorResponse& error)
|
||||
|
|
@ -1842,7 +1841,7 @@ int WebAPIAdapterGUI::devicesetDeviceRunGet(
|
|||
}
|
||||
}
|
||||
|
||||
int WebAPIAdapterGUI::devicesetDeviceSubsystemRunGet(
|
||||
int WebAPIAdapter::devicesetDeviceSubsystemRunGet(
|
||||
int deviceSetIndex,
|
||||
int subsystemIndex,
|
||||
SWGSDRangel::SWGDeviceState& response,
|
||||
|
|
@ -1873,7 +1872,7 @@ int WebAPIAdapterGUI::devicesetDeviceSubsystemRunGet(
|
|||
}
|
||||
}
|
||||
|
||||
int WebAPIAdapterGUI::devicesetDeviceRunPost(
|
||||
int WebAPIAdapter::devicesetDeviceRunPost(
|
||||
int deviceSetIndex,
|
||||
SWGSDRangel::SWGDeviceState& response,
|
||||
SWGSDRangel::SWGErrorResponse& error)
|
||||
|
|
@ -1909,7 +1908,7 @@ int WebAPIAdapterGUI::devicesetDeviceRunPost(
|
|||
}
|
||||
}
|
||||
|
||||
int WebAPIAdapterGUI::devicesetDeviceSubsystemRunPost(
|
||||
int WebAPIAdapter::devicesetDeviceSubsystemRunPost(
|
||||
int deviceSetIndex,
|
||||
int subsystemIndex,
|
||||
SWGSDRangel::SWGDeviceState& response,
|
||||
|
|
@ -1940,7 +1939,7 @@ int WebAPIAdapterGUI::devicesetDeviceSubsystemRunPost(
|
|||
}
|
||||
}
|
||||
|
||||
int WebAPIAdapterGUI::devicesetDeviceRunDelete(
|
||||
int WebAPIAdapter::devicesetDeviceRunDelete(
|
||||
int deviceSetIndex,
|
||||
SWGSDRangel::SWGDeviceState& response,
|
||||
SWGSDRangel::SWGErrorResponse& error)
|
||||
|
|
@ -1976,7 +1975,7 @@ int WebAPIAdapterGUI::devicesetDeviceRunDelete(
|
|||
}
|
||||
}
|
||||
|
||||
int WebAPIAdapterGUI::devicesetDeviceSubsystemRunDelete(
|
||||
int WebAPIAdapter::devicesetDeviceSubsystemRunDelete(
|
||||
int deviceSetIndex,
|
||||
int subsystemIndex,
|
||||
SWGSDRangel::SWGDeviceState& response,
|
||||
|
|
@ -2007,7 +2006,7 @@ int WebAPIAdapterGUI::devicesetDeviceSubsystemRunDelete(
|
|||
}
|
||||
}
|
||||
|
||||
int WebAPIAdapterGUI::devicesetDeviceReportGet(
|
||||
int WebAPIAdapter::devicesetDeviceReportGet(
|
||||
int deviceSetIndex,
|
||||
SWGSDRangel::SWGDeviceReport& response,
|
||||
SWGSDRangel::SWGErrorResponse& error)
|
||||
|
|
@ -2052,7 +2051,7 @@ int WebAPIAdapterGUI::devicesetDeviceReportGet(
|
|||
}
|
||||
}
|
||||
|
||||
int WebAPIAdapterGUI::devicesetChannelsReportGet(
|
||||
int WebAPIAdapter::devicesetChannelsReportGet(
|
||||
int deviceSetIndex,
|
||||
SWGSDRangel::SWGChannelsDetail& response,
|
||||
SWGSDRangel::SWGErrorResponse& error)
|
||||
|
|
@ -2073,7 +2072,7 @@ int WebAPIAdapterGUI::devicesetChannelsReportGet(
|
|||
}
|
||||
}
|
||||
|
||||
int WebAPIAdapterGUI::devicesetChannelPost(
|
||||
int WebAPIAdapter::devicesetChannelPost(
|
||||
int deviceSetIndex,
|
||||
SWGSDRangel::SWGChannelSettings& query,
|
||||
SWGSDRangel::SWGSuccessResponse& response,
|
||||
|
|
@ -2206,7 +2205,7 @@ int WebAPIAdapterGUI::devicesetChannelPost(
|
|||
}
|
||||
}
|
||||
|
||||
int WebAPIAdapterGUI::devicesetChannelDelete(
|
||||
int WebAPIAdapter::devicesetChannelDelete(
|
||||
int deviceSetIndex,
|
||||
int channelIndex,
|
||||
SWGSDRangel::SWGSuccessResponse& response,
|
||||
|
|
@ -2243,7 +2242,7 @@ int WebAPIAdapterGUI::devicesetChannelDelete(
|
|||
}
|
||||
}
|
||||
|
||||
int WebAPIAdapterGUI::devicesetChannelSettingsGet(
|
||||
int WebAPIAdapter::devicesetChannelSettingsGet(
|
||||
int deviceSetIndex,
|
||||
int channelIndex,
|
||||
SWGSDRangel::SWGChannelSettings& response,
|
||||
|
|
@ -2342,7 +2341,7 @@ int WebAPIAdapterGUI::devicesetChannelSettingsGet(
|
|||
}
|
||||
}
|
||||
|
||||
int WebAPIAdapterGUI::devicesetChannelReportGet(
|
||||
int WebAPIAdapter::devicesetChannelReportGet(
|
||||
int deviceSetIndex,
|
||||
int channelIndex,
|
||||
SWGSDRangel::SWGChannelReport& response,
|
||||
|
|
@ -2441,7 +2440,7 @@ int WebAPIAdapterGUI::devicesetChannelReportGet(
|
|||
}
|
||||
}
|
||||
|
||||
int WebAPIAdapterGUI::devicesetChannelActionsPost(
|
||||
int WebAPIAdapter::devicesetChannelActionsPost(
|
||||
int deviceSetIndex,
|
||||
int channelIndex,
|
||||
const QStringList& channelActionsKeys,
|
||||
|
|
@ -2596,7 +2595,7 @@ int WebAPIAdapterGUI::devicesetChannelActionsPost(
|
|||
}
|
||||
}
|
||||
|
||||
int WebAPIAdapterGUI::devicesetChannelSettingsPutPatch(
|
||||
int WebAPIAdapter::devicesetChannelSettingsPutPatch(
|
||||
int deviceSetIndex,
|
||||
int channelIndex,
|
||||
bool force,
|
||||
|
|
@ -2731,7 +2730,7 @@ int WebAPIAdapterGUI::devicesetChannelSettingsPutPatch(
|
|||
}
|
||||
}
|
||||
|
||||
int WebAPIAdapterGUI::featuresetFeaturePost(
|
||||
int WebAPIAdapter::featuresetFeaturePost(
|
||||
int featureSetIndex,
|
||||
SWGSDRangel::SWGFeatureSettings& query,
|
||||
SWGSDRangel::SWGSuccessResponse& response,
|
||||
|
|
@ -2777,7 +2776,7 @@ int WebAPIAdapterGUI::featuresetFeaturePost(
|
|||
}
|
||||
}
|
||||
|
||||
int WebAPIAdapterGUI::featuresetFeatureDelete(
|
||||
int WebAPIAdapter::featuresetFeatureDelete(
|
||||
int featureSetIndex,
|
||||
int featureIndex,
|
||||
SWGSDRangel::SWGSuccessResponse& response,
|
||||
|
|
@ -2814,7 +2813,7 @@ int WebAPIAdapterGUI::featuresetFeatureDelete(
|
|||
}
|
||||
}
|
||||
|
||||
int WebAPIAdapterGUI::featuresetFeatureRunGet(
|
||||
int WebAPIAdapter::featuresetFeatureRunGet(
|
||||
int featureSetIndex,
|
||||
int featureIndex,
|
||||
SWGSDRangel::SWGDeviceState& response,
|
||||
|
|
@ -2847,7 +2846,7 @@ int WebAPIAdapterGUI::featuresetFeatureRunGet(
|
|||
}
|
||||
}
|
||||
|
||||
int WebAPIAdapterGUI::featuresetFeatureRunPost(
|
||||
int WebAPIAdapter::featuresetFeatureRunPost(
|
||||
int featureSetIndex,
|
||||
int featureIndex,
|
||||
SWGSDRangel::SWGDeviceState& response,
|
||||
|
|
@ -2880,7 +2879,7 @@ int WebAPIAdapterGUI::featuresetFeatureRunPost(
|
|||
}
|
||||
}
|
||||
|
||||
int WebAPIAdapterGUI::featuresetFeatureRunDelete(
|
||||
int WebAPIAdapter::featuresetFeatureRunDelete(
|
||||
int featureSetIndex,
|
||||
int featureIndex,
|
||||
SWGSDRangel::SWGDeviceState& response,
|
||||
|
|
@ -2913,7 +2912,7 @@ int WebAPIAdapterGUI::featuresetFeatureRunDelete(
|
|||
}
|
||||
}
|
||||
|
||||
int WebAPIAdapterGUI::featuresetFeatureSettingsGet(
|
||||
int WebAPIAdapter::featuresetFeatureSettingsGet(
|
||||
int featureSetIndex,
|
||||
int featureIndex,
|
||||
SWGSDRangel::SWGFeatureSettings& response,
|
||||
|
|
@ -2945,7 +2944,7 @@ int WebAPIAdapterGUI::featuresetFeatureSettingsGet(
|
|||
}
|
||||
}
|
||||
|
||||
int WebAPIAdapterGUI::featuresetFeatureSettingsPutPatch(
|
||||
int WebAPIAdapter::featuresetFeatureSettingsPutPatch(
|
||||
int featureSetIndex,
|
||||
int featureIndex,
|
||||
bool force,
|
||||
|
|
@ -2991,7 +2990,7 @@ int WebAPIAdapterGUI::featuresetFeatureSettingsPutPatch(
|
|||
}
|
||||
}
|
||||
|
||||
int WebAPIAdapterGUI::featuresetFeatureReportGet(
|
||||
int WebAPIAdapter::featuresetFeatureReportGet(
|
||||
int featureSetIndex,
|
||||
int featureIndex,
|
||||
SWGSDRangel::SWGFeatureReport& response,
|
||||
|
|
@ -3023,7 +3022,7 @@ int WebAPIAdapterGUI::featuresetFeatureReportGet(
|
|||
}
|
||||
}
|
||||
|
||||
int WebAPIAdapterGUI::featuresetFeatureActionsPost(
|
||||
int WebAPIAdapter::featuresetFeatureActionsPost(
|
||||
int featureSetIndex,
|
||||
int featureIndex,
|
||||
const QStringList& featureActionsKeys,
|
||||
|
|
@ -3077,7 +3076,7 @@ int WebAPIAdapterGUI::featuresetFeatureActionsPost(
|
|||
}
|
||||
}
|
||||
|
||||
void WebAPIAdapterGUI::getDeviceSetList(SWGSDRangel::SWGDeviceSetList* deviceSetList)
|
||||
void WebAPIAdapter::getDeviceSetList(SWGSDRangel::SWGDeviceSetList* deviceSetList)
|
||||
{
|
||||
deviceSetList->init();
|
||||
deviceSetList->setDevicesetcount((int) m_mainCore->m_deviceSets.size());
|
||||
|
|
@ -3097,7 +3096,7 @@ void WebAPIAdapterGUI::getDeviceSetList(SWGSDRangel::SWGDeviceSetList* deviceSet
|
|||
}
|
||||
}
|
||||
|
||||
void WebAPIAdapterGUI::getDeviceSet(SWGSDRangel::SWGDeviceSet *deviceSet, const DeviceSet* deviceUISet, int deviceUISetIndex)
|
||||
void WebAPIAdapter::getDeviceSet(SWGSDRangel::SWGDeviceSet *deviceSet, const DeviceSet* deviceUISet, int deviceUISetIndex)
|
||||
{
|
||||
deviceSet->init();
|
||||
SWGSDRangel::SWGSamplingDevice *samplingDevice = deviceSet->getSamplingDevice();
|
||||
|
|
@ -3236,7 +3235,7 @@ void WebAPIAdapterGUI::getDeviceSet(SWGSDRangel::SWGDeviceSet *deviceSet, const
|
|||
}
|
||||
}
|
||||
|
||||
void WebAPIAdapterGUI::getChannelsDetail(SWGSDRangel::SWGChannelsDetail *channelsDetail, const DeviceSet* deviceUISet)
|
||||
void WebAPIAdapter::getChannelsDetail(SWGSDRangel::SWGChannelsDetail *channelsDetail, const DeviceSet* deviceUISet)
|
||||
{
|
||||
channelsDetail->init();
|
||||
SWGSDRangel::SWGChannelReport *channelReport;
|
||||
|
|
@ -3369,7 +3368,7 @@ void WebAPIAdapterGUI::getChannelsDetail(SWGSDRangel::SWGChannelsDetail *channel
|
|||
}
|
||||
}
|
||||
|
||||
int WebAPIAdapterGUI::featuresetGet(
|
||||
int WebAPIAdapter::featuresetGet(
|
||||
int featureSetIndex,
|
||||
SWGSDRangel::SWGFeatureSet& response,
|
||||
SWGSDRangel::SWGErrorResponse& error)
|
||||
|
|
@ -3390,7 +3389,7 @@ int WebAPIAdapterGUI::featuresetGet(
|
|||
}
|
||||
}
|
||||
|
||||
void WebAPIAdapterGUI::getFeatureSetList(SWGSDRangel::SWGFeatureSetList* featureSetList)
|
||||
void WebAPIAdapter::getFeatureSetList(SWGSDRangel::SWGFeatureSetList* featureSetList)
|
||||
{
|
||||
featureSetList->init();
|
||||
featureSetList->setFeaturesetcount((int) m_mainCore->m_featureSets.size());
|
||||
|
|
@ -3406,7 +3405,7 @@ void WebAPIAdapterGUI::getFeatureSetList(SWGSDRangel::SWGFeatureSetList* feature
|
|||
}
|
||||
}
|
||||
|
||||
void WebAPIAdapterGUI::getFeatureSet(SWGSDRangel::SWGFeatureSet *featureSet, const FeatureSet* featureUISet, int featureUISetIndex)
|
||||
void WebAPIAdapter::getFeatureSet(SWGSDRangel::SWGFeatureSet *featureSet, const FeatureSet* featureUISet, int featureUISetIndex)
|
||||
{
|
||||
featureSet->init();
|
||||
featureSet->setFeaturecount(featureUISet->getNumberOfFeatures());
|
||||
|
|
@ -3426,7 +3425,7 @@ void WebAPIAdapterGUI::getFeatureSet(SWGSDRangel::SWGFeatureSet *featureSet, con
|
|||
}
|
||||
}
|
||||
|
||||
QtMsgType WebAPIAdapterGUI::getMsgTypeFromString(const QString& msgTypeString)
|
||||
QtMsgType WebAPIAdapter::getMsgTypeFromString(const QString& msgTypeString)
|
||||
{
|
||||
if (msgTypeString == "debug") {
|
||||
return QtDebugMsg;
|
||||
|
|
@ -3441,7 +3440,7 @@ QtMsgType WebAPIAdapterGUI::getMsgTypeFromString(const QString& msgTypeString)
|
|||
}
|
||||
}
|
||||
|
||||
void WebAPIAdapterGUI::getMsgTypeString(const QtMsgType& msgType, QString& levelStr)
|
||||
void WebAPIAdapter::getMsgTypeString(const QtMsgType& msgType, QString& levelStr)
|
||||
{
|
||||
switch (msgType)
|
||||
{
|
||||
|
|
@ -26,13 +26,14 @@
|
|||
#include "export.h"
|
||||
|
||||
class MainCore;
|
||||
class DeviceSet;
|
||||
class FeatureSet;
|
||||
|
||||
class SDRGUI_API WebAPIAdapterGUI: public WebAPIAdapterInterface
|
||||
class SDRBASE_API WebAPIAdapter: public WebAPIAdapterInterface
|
||||
{
|
||||
public:
|
||||
WebAPIAdapterGUI();
|
||||
virtual ~WebAPIAdapterGUI();
|
||||
WebAPIAdapter();
|
||||
virtual ~WebAPIAdapter();
|
||||
|
||||
virtual int instanceSummary(
|
||||
SWGSDRangel::SWGInstanceSummaryResponse& response,
|
||||
|
|
@ -84,8 +84,6 @@ set(sdrgui_SOURCES
|
|||
soapygui/complexfactorgui.cpp
|
||||
soapygui/arginfogui.cpp
|
||||
|
||||
webapi/webapiadaptergui.cpp
|
||||
|
||||
resources/res.qrc
|
||||
)
|
||||
|
||||
|
|
@ -171,8 +169,6 @@ set(sdrgui_HEADERS
|
|||
soapygui/intervalslidergui.h
|
||||
soapygui/complexfactorgui.h
|
||||
soapygui/arginfogui.h
|
||||
|
||||
webapi/webapiadaptergui.h
|
||||
)
|
||||
|
||||
set(sdrgui_FORMS
|
||||
|
|
|
|||
|
|
@ -72,7 +72,7 @@
|
|||
#include "loggerwithfile.h"
|
||||
#include "webapi/webapirequestmapper.h"
|
||||
#include "webapi/webapiserver.h"
|
||||
#include "webapi/webapiadaptergui.h"
|
||||
#include "webapi/webapiadapter.h"
|
||||
#include "commands/command.h"
|
||||
|
||||
#include "mainwindow.h"
|
||||
|
|
@ -212,7 +212,7 @@ MainWindow::MainWindow(qtwebapp::LoggerWithFile *logger, const MainParser& parse
|
|||
qDebug() << "MainWindow::MainWindow: load current preset settings...";
|
||||
|
||||
loadPresetSettings(m_mainCore->m_settings.getWorkingPreset(), 0);
|
||||
m_apiAdapter = new WebAPIAdapterGUI();
|
||||
m_apiAdapter = new WebAPIAdapter();
|
||||
loadFeatureSetPresetSettings(m_mainCore->m_settings.getWorkingFeatureSetPreset(), 0);
|
||||
|
||||
splash->showStatusMessage("update preset controls...", Qt::white);
|
||||
|
|
|
|||
|
|
@ -50,7 +50,7 @@ class PluginInterface;
|
|||
class QWidget;
|
||||
class WebAPIRequestMapper;
|
||||
class WebAPIServer;
|
||||
class WebAPIAdapterGUI;
|
||||
class WebAPIAdapter;
|
||||
class Preset;
|
||||
class Command;
|
||||
class FeatureSetPreset;
|
||||
|
|
@ -83,8 +83,6 @@ public:
|
|||
const QString& getAPIHost() const { return m_apiHost; }
|
||||
int getAPIPort() const { return m_apiPort; }
|
||||
|
||||
friend class WebAPIAdapterGUI;
|
||||
|
||||
private:
|
||||
enum {
|
||||
PGroup,
|
||||
|
|
@ -123,7 +121,7 @@ private:
|
|||
|
||||
WebAPIRequestMapper *m_requestMapper;
|
||||
WebAPIServer *m_apiServer;
|
||||
WebAPIAdapterGUI *m_apiAdapter;
|
||||
WebAPIAdapter *m_apiAdapter;
|
||||
QString m_apiHost;
|
||||
int m_apiPort;
|
||||
|
||||
|
|
|
|||
|
|
@ -2,12 +2,10 @@ project (sdrsrv)
|
|||
|
||||
set(sdrsrv_SOURCES
|
||||
mainserver.cpp
|
||||
webapi/webapiadaptersrv.cpp
|
||||
)
|
||||
|
||||
set(sdrsrv_HEADERS
|
||||
mainserver.h
|
||||
webapi/webapiadaptersrv.h
|
||||
)
|
||||
|
||||
if (LIMESUITE_FOUND)
|
||||
|
|
|
|||
|
|
@ -32,7 +32,7 @@
|
|||
#include "plugin/pluginmanager.h"
|
||||
#include "webapi/webapirequestmapper.h"
|
||||
#include "webapi/webapiserver.h"
|
||||
#include "webapi/webapiadaptersrv.h"
|
||||
#include "webapi/webapiadapter.h"
|
||||
|
||||
#include "mainparser.h"
|
||||
#include "mainserver.h"
|
||||
|
|
@ -69,7 +69,7 @@ MainServer::MainServer(qtwebapp::LoggerWithFile *logger, const MainParser& parse
|
|||
qDebug() << "MainServer::MainServer: finishing...";
|
||||
QString applicationDirPath = QCoreApplication::instance()->applicationDirPath();
|
||||
|
||||
m_apiAdapter = new WebAPIAdapterSrv(*m_mainCore);
|
||||
m_apiAdapter = new WebAPIAdapter();
|
||||
m_requestMapper = new WebAPIRequestMapper(this);
|
||||
m_requestMapper->setAdapter(m_apiAdapter);
|
||||
m_apiHost = parser.getServerAddress();
|
||||
|
|
|
|||
|
|
@ -39,7 +39,7 @@ class DeviceSet;
|
|||
class FeatureSet;
|
||||
class WebAPIRequestMapper;
|
||||
class WebAPIServer;
|
||||
class WebAPIAdapterSrv;
|
||||
class WebAPIAdapter;
|
||||
|
||||
namespace qtwebapp {
|
||||
class LoggerWithFile;
|
||||
|
|
@ -71,8 +71,6 @@ public:
|
|||
const QString& getAPIHost() const { return m_apiHost; }
|
||||
int getAPIPort() const { return m_apiPort; }
|
||||
|
||||
friend class WebAPIAdapterSrv;
|
||||
|
||||
signals:
|
||||
void finished();
|
||||
|
||||
|
|
@ -88,7 +86,7 @@ private:
|
|||
|
||||
WebAPIRequestMapper *m_requestMapper;
|
||||
WebAPIServer *m_apiServer;
|
||||
WebAPIAdapterSrv *m_apiAdapter;
|
||||
WebAPIAdapter *m_apiAdapter;
|
||||
|
||||
void loadSettings();
|
||||
void applySettings();
|
||||
|
|
|
|||
Plik diff jest za duży
Load Diff
|
|
@ -1,413 +0,0 @@
|
|||
///////////////////////////////////////////////////////////////////////////////////
|
||||
// Copyright (C) 2017 Edouard Griffiths, F4EXB. //
|
||||
// //
|
||||
// Swagger server adapter interface //
|
||||
// //
|
||||
// This program is free software; you can redistribute it and/or modify //
|
||||
// it under the terms of the GNU General Public License as published by //
|
||||
// the Free Software Foundation as version 3 of the License, or //
|
||||
// (at your option) any later version. //
|
||||
// //
|
||||
// This program is distributed in the hope that it will be useful, //
|
||||
// but WITHOUT ANY WARRANTY; without even the implied warranty of //
|
||||
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the //
|
||||
// GNU General Public License V3 for more details. //
|
||||
// //
|
||||
// You should have received a copy of the GNU General Public License //
|
||||
// along with this program. If not, see <http://www.gnu.org/licenses/>. //
|
||||
///////////////////////////////////////////////////////////////////////////////////
|
||||
|
||||
#ifndef SDRSRV_WEBAPI_WEBAPIADAPTERSRV_H_
|
||||
#define SDRSRV_WEBAPI_WEBAPIADAPTERSRV_H_
|
||||
|
||||
#include <QtGlobal>
|
||||
|
||||
#include "webapi/webapiadapterinterface.h"
|
||||
|
||||
class MainCore;
|
||||
class DeviceSet;
|
||||
class FeatureSet;
|
||||
|
||||
class WebAPIAdapterSrv: public WebAPIAdapterInterface
|
||||
{
|
||||
public:
|
||||
WebAPIAdapterSrv(MainCore& mainCore);
|
||||
virtual ~WebAPIAdapterSrv();
|
||||
|
||||
virtual int instanceSummary(
|
||||
SWGSDRangel::SWGInstanceSummaryResponse& response,
|
||||
SWGSDRangel::SWGErrorResponse& error);
|
||||
|
||||
virtual int instanceDelete(
|
||||
SWGSDRangel::SWGSuccessResponse& response,
|
||||
SWGSDRangel::SWGErrorResponse& error);
|
||||
|
||||
virtual int instanceConfigGet(
|
||||
SWGSDRangel::SWGInstanceConfigResponse& response,
|
||||
SWGSDRangel::SWGErrorResponse& error);
|
||||
|
||||
virtual int instanceConfigPutPatch(
|
||||
bool force, // PUT else PATCH
|
||||
SWGSDRangel::SWGInstanceConfigResponse& query,
|
||||
const ConfigKeys& configKeys,
|
||||
SWGSDRangel::SWGSuccessResponse& response,
|
||||
SWGSDRangel::SWGErrorResponse& error);
|
||||
|
||||
virtual int instanceDevices(
|
||||
int direction,
|
||||
SWGSDRangel::SWGInstanceDevicesResponse& response,
|
||||
SWGSDRangel::SWGErrorResponse& error);
|
||||
|
||||
virtual int instanceChannels(
|
||||
int direction,
|
||||
SWGSDRangel::SWGInstanceChannelsResponse& response,
|
||||
SWGSDRangel::SWGErrorResponse& error);
|
||||
|
||||
virtual int instanceLoggingGet(
|
||||
SWGSDRangel::SWGLoggingInfo& response,
|
||||
SWGSDRangel::SWGErrorResponse& error);
|
||||
|
||||
virtual int instanceLoggingPut(
|
||||
SWGSDRangel::SWGLoggingInfo& query,
|
||||
SWGSDRangel::SWGLoggingInfo& response,
|
||||
SWGSDRangel::SWGErrorResponse& error);
|
||||
|
||||
virtual int instanceAudioGet(
|
||||
SWGSDRangel::SWGAudioDevices& response,
|
||||
SWGSDRangel::SWGErrorResponse& error);
|
||||
|
||||
virtual int instanceAudioInputPatch(
|
||||
SWGSDRangel::SWGAudioInputDevice& response,
|
||||
const QStringList& audioInputKeys,
|
||||
SWGSDRangel::SWGErrorResponse& error);
|
||||
|
||||
virtual int instanceAudioOutputPatch(
|
||||
SWGSDRangel::SWGAudioOutputDevice& response,
|
||||
const QStringList& audioOutputKeys,
|
||||
SWGSDRangel::SWGErrorResponse& error);
|
||||
|
||||
virtual int instanceAudioInputDelete(
|
||||
SWGSDRangel::SWGAudioInputDevice& response,
|
||||
SWGSDRangel::SWGErrorResponse& error);
|
||||
|
||||
virtual int instanceAudioOutputDelete(
|
||||
SWGSDRangel::SWGAudioOutputDevice& response,
|
||||
SWGSDRangel::SWGErrorResponse& error);
|
||||
|
||||
virtual int instanceAudioInputCleanupPatch(
|
||||
SWGSDRangel::SWGSuccessResponse& response,
|
||||
SWGSDRangel::SWGErrorResponse& error);
|
||||
|
||||
virtual int instanceAudioOutputCleanupPatch(
|
||||
SWGSDRangel::SWGSuccessResponse& response,
|
||||
SWGSDRangel::SWGErrorResponse& error);
|
||||
|
||||
virtual int instanceLocationGet(
|
||||
SWGSDRangel::SWGLocationInformation& response,
|
||||
SWGSDRangel::SWGErrorResponse& error);
|
||||
|
||||
virtual int instanceLocationPut(
|
||||
SWGSDRangel::SWGLocationInformation& response,
|
||||
SWGSDRangel::SWGErrorResponse& error);
|
||||
|
||||
virtual int instanceDVSerialGet(
|
||||
SWGSDRangel::SWGDVSerialDevices& response,
|
||||
SWGSDRangel::SWGErrorResponse& error);
|
||||
|
||||
virtual int instanceDVSerialPatch(
|
||||
bool dvserial,
|
||||
SWGSDRangel::SWGDVSerialDevices& response,
|
||||
SWGSDRangel::SWGErrorResponse& error);
|
||||
|
||||
virtual int instanceAMBESerialGet(
|
||||
SWGSDRangel::SWGDVSerialDevices& response,
|
||||
SWGSDRangel::SWGErrorResponse& error);
|
||||
|
||||
virtual int instanceAMBEDevicesGet(
|
||||
SWGSDRangel::SWGAMBEDevices& response,
|
||||
SWGSDRangel::SWGErrorResponse& error);
|
||||
|
||||
virtual int instanceAMBEDevicesPut(
|
||||
SWGSDRangel::SWGAMBEDevices& query,
|
||||
SWGSDRangel::SWGAMBEDevices& response,
|
||||
SWGSDRangel::SWGErrorResponse& error);
|
||||
|
||||
virtual int instanceAMBEDevicesPatch(
|
||||
SWGSDRangel::SWGAMBEDevices& query,
|
||||
SWGSDRangel::SWGAMBEDevices& response,
|
||||
SWGSDRangel::SWGErrorResponse& error);
|
||||
|
||||
virtual int instanceAMBEDevicesDelete(
|
||||
SWGSDRangel::SWGSuccessResponse& response,
|
||||
SWGSDRangel::SWGErrorResponse& error);
|
||||
|
||||
#ifdef HAS_LIMERFEUSB
|
||||
virtual int instanceLimeRFESerialGet(
|
||||
SWGSDRangel::SWGLimeRFEDevices& response,
|
||||
SWGSDRangel::SWGErrorResponse& error);
|
||||
|
||||
virtual int instanceLimeRFEConfigGet(
|
||||
const QString& serial,
|
||||
SWGSDRangel::SWGLimeRFESettings& response,
|
||||
SWGSDRangel::SWGErrorResponse& error);
|
||||
|
||||
virtual int instanceLimeRFEConfigPut(
|
||||
SWGSDRangel::SWGLimeRFESettings& query,
|
||||
SWGSDRangel::SWGSuccessResponse& response,
|
||||
SWGSDRangel::SWGErrorResponse& error);
|
||||
|
||||
virtual int instanceLimeRFERunPut(
|
||||
SWGSDRangel::SWGLimeRFESettings& query,
|
||||
SWGSDRangel::SWGSuccessResponse& response,
|
||||
SWGSDRangel::SWGErrorResponse& error);
|
||||
|
||||
virtual int instanceLimeRFEPowerGet(
|
||||
const QString& serial,
|
||||
SWGSDRangel::SWGLimeRFEPower& response,
|
||||
SWGSDRangel::SWGErrorResponse& error);
|
||||
#endif
|
||||
|
||||
virtual int instancePresetFilePut(
|
||||
SWGSDRangel::SWGPresetImport& query,
|
||||
SWGSDRangel::SWGPresetIdentifier& response,
|
||||
SWGSDRangel::SWGErrorResponse& error);
|
||||
|
||||
virtual int instancePresetFilePost(
|
||||
SWGSDRangel::SWGPresetExport& query,
|
||||
SWGSDRangel::SWGPresetIdentifier& response,
|
||||
SWGSDRangel::SWGErrorResponse& error);
|
||||
|
||||
virtual int instancePresetsGet(
|
||||
SWGSDRangel::SWGPresets& response,
|
||||
SWGSDRangel::SWGErrorResponse& error);
|
||||
|
||||
virtual int instancePresetPatch(
|
||||
SWGSDRangel::SWGPresetTransfer& query,
|
||||
SWGSDRangel::SWGPresetIdentifier& response,
|
||||
SWGSDRangel::SWGErrorResponse& error);
|
||||
|
||||
virtual int instancePresetPut(
|
||||
SWGSDRangel::SWGPresetTransfer& query,
|
||||
SWGSDRangel::SWGPresetIdentifier& response,
|
||||
SWGSDRangel::SWGErrorResponse& error);
|
||||
|
||||
virtual int instancePresetPost(
|
||||
SWGSDRangel::SWGPresetTransfer& query,
|
||||
SWGSDRangel::SWGPresetIdentifier& response,
|
||||
SWGSDRangel::SWGErrorResponse& error);
|
||||
|
||||
virtual int instancePresetDelete(
|
||||
SWGSDRangel::SWGPresetIdentifier& response,
|
||||
SWGSDRangel::SWGErrorResponse& error);
|
||||
|
||||
virtual int instanceDeviceSetsGet(
|
||||
SWGSDRangel::SWGDeviceSetList& response,
|
||||
SWGSDRangel::SWGErrorResponse& error);
|
||||
|
||||
virtual int instanceFeatureSetsGet(
|
||||
SWGSDRangel::SWGFeatureSetList& response,
|
||||
SWGSDRangel::SWGErrorResponse& error);
|
||||
|
||||
virtual int instanceDeviceSetPost(
|
||||
int direction,
|
||||
SWGSDRangel::SWGSuccessResponse& response,
|
||||
SWGSDRangel::SWGErrorResponse& error);
|
||||
|
||||
virtual int instanceDeviceSetDelete(
|
||||
SWGSDRangel::SWGSuccessResponse& response,
|
||||
SWGSDRangel::SWGErrorResponse& error);
|
||||
|
||||
virtual int devicesetGet(
|
||||
int deviceSetIndex,
|
||||
SWGSDRangel::SWGDeviceSet& response,
|
||||
SWGSDRangel::SWGErrorResponse& error);
|
||||
|
||||
virtual int devicesetFocusPatch(
|
||||
int deviceSetIndex,
|
||||
SWGSDRangel::SWGSuccessResponse& response,
|
||||
SWGSDRangel::SWGErrorResponse& error);
|
||||
|
||||
virtual int devicesetDevicePut(
|
||||
int deviceSetIndex,
|
||||
SWGSDRangel::SWGDeviceListItem& query,
|
||||
SWGSDRangel::SWGDeviceListItem& response,
|
||||
SWGSDRangel::SWGErrorResponse& error);
|
||||
|
||||
virtual int devicesetDeviceSettingsGet(
|
||||
int deviceSetIndex,
|
||||
SWGSDRangel::SWGDeviceSettings& response,
|
||||
SWGSDRangel::SWGErrorResponse& error);
|
||||
|
||||
virtual int devicesetDeviceActionsPost(
|
||||
int deviceSetIndex,
|
||||
const QStringList& deviceActionsKeys,
|
||||
SWGSDRangel::SWGDeviceActions& query,
|
||||
SWGSDRangel::SWGSuccessResponse& response,
|
||||
SWGSDRangel::SWGErrorResponse& error);
|
||||
|
||||
virtual int devicesetDeviceSettingsPutPatch(
|
||||
int deviceSetIndex,
|
||||
bool force,
|
||||
const QStringList& deviceSettingsKeys,
|
||||
SWGSDRangel::SWGDeviceSettings& response,
|
||||
SWGSDRangel::SWGErrorResponse& error);
|
||||
|
||||
virtual int devicesetDeviceRunGet(
|
||||
int deviceSetIndex,
|
||||
SWGSDRangel::SWGDeviceState& response,
|
||||
SWGSDRangel::SWGErrorResponse& error);
|
||||
|
||||
virtual int devicesetDeviceRunPost(
|
||||
int deviceSetIndex,
|
||||
SWGSDRangel::SWGDeviceState& response,
|
||||
SWGSDRangel::SWGErrorResponse& error);
|
||||
|
||||
virtual int devicesetDeviceRunDelete(
|
||||
int deviceSetIndex,
|
||||
SWGSDRangel::SWGDeviceState& response,
|
||||
SWGSDRangel::SWGErrorResponse& error);
|
||||
|
||||
virtual int devicesetDeviceSubsystemRunGet(
|
||||
int deviceSetIndex,
|
||||
int subsystemIndex,
|
||||
SWGSDRangel::SWGDeviceState& response,
|
||||
SWGSDRangel::SWGErrorResponse& error);
|
||||
|
||||
virtual int devicesetDeviceSubsystemRunPost(
|
||||
int deviceSetIndex,
|
||||
int subsystemIndex,
|
||||
SWGSDRangel::SWGDeviceState& response,
|
||||
SWGSDRangel::SWGErrorResponse& error);
|
||||
|
||||
virtual int devicesetDeviceSubsystemRunDelete(
|
||||
int deviceSetIndex,
|
||||
int subsystemIndex,
|
||||
SWGSDRangel::SWGDeviceState& response,
|
||||
SWGSDRangel::SWGErrorResponse& error);
|
||||
|
||||
virtual int devicesetDeviceReportGet(
|
||||
int deviceSetIndex,
|
||||
SWGSDRangel::SWGDeviceReport& response,
|
||||
SWGSDRangel::SWGErrorResponse& error);
|
||||
|
||||
virtual int devicesetChannelsReportGet(
|
||||
int deviceSetIndex,
|
||||
SWGSDRangel::SWGChannelsDetail& response,
|
||||
SWGSDRangel::SWGErrorResponse& error);
|
||||
|
||||
virtual int devicesetChannelPost(
|
||||
int deviceSetIndex,
|
||||
SWGSDRangel::SWGChannelSettings& query,
|
||||
SWGSDRangel::SWGSuccessResponse& response,
|
||||
SWGSDRangel::SWGErrorResponse& error);
|
||||
|
||||
virtual int devicesetChannelDelete(
|
||||
int deviceSetIndex,
|
||||
int channelIndex,
|
||||
SWGSDRangel::SWGSuccessResponse& response,
|
||||
SWGSDRangel::SWGErrorResponse& error);
|
||||
|
||||
virtual int devicesetChannelSettingsGet(
|
||||
int deviceSetIndex,
|
||||
int channelIndex,
|
||||
SWGSDRangel::SWGChannelSettings& response,
|
||||
SWGSDRangel::SWGErrorResponse& error);
|
||||
|
||||
virtual int devicesetChannelActionsPost(
|
||||
int deviceSetIndex,
|
||||
int channelIndex,
|
||||
const QStringList& channelActionsKeys,
|
||||
SWGSDRangel::SWGChannelActions& query,
|
||||
SWGSDRangel::SWGSuccessResponse& response,
|
||||
SWGSDRangel::SWGErrorResponse& error);
|
||||
|
||||
virtual int devicesetChannelSettingsPutPatch(
|
||||
int deviceSetIndex,
|
||||
int channelIndex,
|
||||
bool force,
|
||||
const QStringList& channelSettingsKeys,
|
||||
SWGSDRangel::SWGChannelSettings& response,
|
||||
SWGSDRangel::SWGErrorResponse& error);
|
||||
|
||||
virtual int devicesetChannelReportGet(
|
||||
int deviceSetIndex,
|
||||
int channelIndex,
|
||||
SWGSDRangel::SWGChannelReport& response,
|
||||
SWGSDRangel::SWGErrorResponse& error);
|
||||
|
||||
virtual int featuresetGet(
|
||||
int deviceSetIndex,
|
||||
SWGSDRangel::SWGFeatureSet& response,
|
||||
SWGSDRangel::SWGErrorResponse& error);
|
||||
|
||||
virtual int featuresetFeaturePost(
|
||||
int featureSetIndex,
|
||||
SWGSDRangel::SWGFeatureSettings& query,
|
||||
SWGSDRangel::SWGSuccessResponse& response,
|
||||
SWGSDRangel::SWGErrorResponse& error);
|
||||
|
||||
virtual int featuresetFeatureDelete(
|
||||
int featureSetIndex,
|
||||
int featureIndex,
|
||||
SWGSDRangel::SWGSuccessResponse& response,
|
||||
SWGSDRangel::SWGErrorResponse& error);
|
||||
|
||||
virtual int featuresetFeatureRunGet(
|
||||
int featureSetIndex,
|
||||
int featureIndex,
|
||||
SWGSDRangel::SWGDeviceState& response,
|
||||
SWGSDRangel::SWGErrorResponse& error);
|
||||
|
||||
virtual int featuresetFeatureRunPost(
|
||||
int featureSetIndex,
|
||||
int featureIndex,
|
||||
SWGSDRangel::SWGDeviceState& response,
|
||||
SWGSDRangel::SWGErrorResponse& error);
|
||||
|
||||
virtual int featuresetFeatureRunDelete(
|
||||
int featureSetIndex,
|
||||
int featureIndex,
|
||||
SWGSDRangel::SWGDeviceState& response,
|
||||
SWGSDRangel::SWGErrorResponse& error);
|
||||
|
||||
virtual int featuresetFeatureSettingsGet(
|
||||
int featureSetIndex,
|
||||
int featureIndex,
|
||||
SWGSDRangel::SWGFeatureSettings& response,
|
||||
SWGSDRangel::SWGErrorResponse& error);
|
||||
|
||||
virtual int featuresetFeatureSettingsPutPatch(
|
||||
int featureSetIndex,
|
||||
int featureIndex,
|
||||
bool force,
|
||||
const QStringList& featureSettingsKeys,
|
||||
SWGSDRangel::SWGFeatureSettings& response,
|
||||
SWGSDRangel::SWGErrorResponse& error);
|
||||
|
||||
virtual int featuresetFeatureReportGet(
|
||||
int featureSetIndex,
|
||||
int featureIndex,
|
||||
SWGSDRangel::SWGFeatureReport& response,
|
||||
SWGSDRangel::SWGErrorResponse& error);
|
||||
|
||||
virtual int featuresetFeatureActionsPost(
|
||||
int featureSetIndex,
|
||||
int featureIndex,
|
||||
const QStringList& featureActionsKeys,
|
||||
SWGSDRangel::SWGFeatureActions& query,
|
||||
SWGSDRangel::SWGSuccessResponse& response,
|
||||
SWGSDRangel::SWGErrorResponse& error);
|
||||
|
||||
private:
|
||||
MainCore& m_mainCore;
|
||||
|
||||
void getDeviceSetList(SWGSDRangel::SWGDeviceSetList* deviceSetList);
|
||||
void getDeviceSet(SWGSDRangel::SWGDeviceSet *swgDeviceSet, const DeviceSet* deviceSet, int deviceUISetIndex);
|
||||
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);
|
||||
};
|
||||
|
||||
#endif /* SDRSRV_WEBAPI_WEBAPIADAPTERSRV_H_ */
|
||||
Ładowanie…
Reference in New Issue