VE7UWU/sdrangel
1
0
Fork 0
mirror of https://github.com/f4exb/sdrangel.git synced 2026-06-01 21:54:55 -04:00
Code Issues Projects Releases Wiki Activity

REST API: config: PUT (5): mapper work and rework. ChannelAnalyzer complements

Browse Source
This commit is contained in:
f4exb
2019-08-09 18:45:10 +02:00
parent 4897e82e28
commit c777ec881d
9 changed files with 360 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files
sdrbase/webapi/webapiadapterbase.cpp
+69
View File
@@ -60,9 +60,38 @@ void WebAPIAdapterBase::webapiInitConfig(
void WebAPIAdapterBase::webapiUpdatePreferences(
SWGSDRangel::SWGPreferences *apiPreferences,
const QStringList& preferenceKeys,
Preferences& preferences
)
{
if (preferenceKeys.contains("consoleMinLogLevel")) {
preferences.setConsoleMinLogLevel((QtMsgType) apiPreferences->getConsoleMinLogLevel());
}
if (preferenceKeys.contains("fileMinLogLevel")) {
preferences.setFileMinLogLevel((QtMsgType) apiPreferences->getFileMinLogLevel());
}
if (preferenceKeys.contains("latitude")) {
preferences.setLatitude(apiPreferences->getLatitude());
}
if (preferenceKeys.contains("logFileName")) {
preferences.setLogFileName(*apiPreferences->getLogFileName());
}
if (preferenceKeys.contains("longitude")) {
preferences.setLongitude(apiPreferences->getLongitude());
}
if (preferenceKeys.contains("sourceDevice")) {
preferences.setSourceDevice(*apiPreferences->getSourceDevice());
}
if (preferenceKeys.contains("sourceIndex")) {
preferences.setSourceIndex(apiPreferences->getSourceIndex());
}
if (preferenceKeys.contains("useLogFile")) {
preferences.setUseLogFile(apiPreferences->getUseLogFile() != 0);
}
if (preferenceKeys.contains("consoleMinLogLevel"))
if (apiPreferences->getSourceDevice()) {
preferences.setSourceDevice(*apiPreferences->getSourceDevice());
}
@@ -170,6 +199,14 @@ void WebAPIAdapterBase::webapiFormatPreset(
}
}
void WebAPIAdapterBase::webapiUpdatePreset(
SWGSDRangel::SWGPreset *apiPreset,
const WebAPIAdapterInterface::PresetKeys& presetKeys,
Preset& preset
)
{
}
void WebAPIAdapterBase::webapiFormatCommand(
SWGSDRangel::SWGCommand *apiCommand,
const Command& command
@@ -186,6 +223,38 @@ void WebAPIAdapterBase::webapiFormatCommand(
apiCommand->setRelease(command.getRelease() ? 1 : 0);
}
void WebAPIAdapterBase::webapiUpdateCommand(
SWGSDRangel::SWGCommand *apiCommand,
const WebAPIAdapterInterface::CommandKeys& commandKeys,
Command& command
)
{
if (commandKeys.m_keys.contains("argString")) {
command.setArgString(*apiCommand->getArgString());
}
if (commandKeys.m_keys.contains("associateKey")) {
command.setAssociateKey(apiCommand->getAssociateKey());
}
if (commandKeys.m_keys.contains("command")) {
command.setCommand(*apiCommand->getCommand());
}
if (commandKeys.m_keys.contains("description")) {
command.setDescription(*apiCommand->getDescription());
}
if (commandKeys.m_keys.contains("group")) {
command.setGroup(*apiCommand->getGroup());
}
if (commandKeys.m_keys.contains("key")) {
command.setKey((Qt::Key) apiCommand->getKey());
}
if (commandKeys.m_keys.contains("keyModifiers")) {
command.setKeyModifiers((Qt::KeyboardModifiers) apiCommand->getKeyModifiers());
}
if (commandKeys.m_keys.contains("release")) {
command.setRelease(apiCommand->getRelease() != 0);
}
}
ChannelWebAPIAdapter *WebAPIAdapterBase::WebAPIChannelAdapters::getChannelWebAPIAdapter(const QString& channelURI, const PluginManager *pluginManager)
{
QString registeredChannelURI = ChannelUtils::getRegisteredChannelURI(channelURI);