From 7fcc24e06c3ff9aca7d8f470ab6d58052132cbfd Mon Sep 17 00:00:00 2001 From: f4exb Date: Sun, 7 Jul 2019 00:33:00 +0200 Subject: [PATCH] FileSource input: renaming of settings and report --- .../samplesource/filesource/CMakeLists.txt | 4 +- .../samplesource/filesource/filesourcegui.cpp | 6 +- .../samplesource/filesource/filesourcegui.h | 4 +- .../filesource/filesourceinput.cpp | 77 +++++++++---------- .../samplesource/filesource/filesourceinput.h | 18 ++--- ...ttings.cpp => filesourceinputsettings.cpp} | 16 ++-- ...cesettings.h => filesourceinputsettings.h} | 12 +-- .../filesource/filesourceplugin.cpp | 2 +- sdrbase/resources/webapi.qrc | 2 +- sdrbase/resources/webapi/doc/html2/index.html | 14 ++-- .../{FileSource.yaml => FileSourceInput.yaml} | 4 +- .../resources/webapi/doc/swagger/swagger.yaml | 8 +- sdrbase/webapi/webapirequestmapper.cpp | 8 +- .../{FileSource.yaml => FileSourceInput.yaml} | 4 +- swagger/sdrangel/api/swagger/swagger.yaml | 8 +- swagger/sdrangel/code/html2/index.html | 14 ++-- .../code/qt5/client/SWGDeviceReport.cpp | 32 ++++---- .../code/qt5/client/SWGDeviceReport.h | 10 +-- .../code/qt5/client/SWGDeviceSettings.cpp | 32 ++++---- .../code/qt5/client/SWGDeviceSettings.h | 10 +-- ...eport.cpp => SWGFileSourceInputReport.cpp} | 48 ++++++------ ...rceReport.h => SWGFileSourceInputReport.h} | 18 ++--- ...ngs.cpp => SWGFileSourceInputSettings.cpp} | 52 ++++++------- ...ettings.h => SWGFileSourceInputSettings.h} | 18 ++--- .../code/qt5/client/SWGModelFactory.h | 12 +-- 25 files changed, 216 insertions(+), 217 deletions(-) rename plugins/samplesource/filesource/{filesourcesettings.cpp => filesourceinputsettings.cpp} (88%) rename plugins/samplesource/filesource/{filesourcesettings.h => filesourceinputsettings.h} (86%) rename sdrbase/resources/webapi/doc/swagger/include/{FileSource.yaml => FileSourceInput.yaml} (95%) rename swagger/sdrangel/api/swagger/include/{FileSource.yaml => FileSourceInput.yaml} (95%) rename swagger/sdrangel/code/qt5/client/{SWGFileSourceReport.cpp => SWGFileSourceInputReport.cpp} (83%) rename swagger/sdrangel/code/qt5/client/{SWGFileSourceReport.h => SWGFileSourceInputReport.h} (87%) rename swagger/sdrangel/code/qt5/client/{SWGFileSourceSettings.cpp => SWGFileSourceInputSettings.cpp} (81%) rename swagger/sdrangel/code/qt5/client/{SWGFileSourceSettings.h => SWGFileSourceInputSettings.h} (87%) diff --git a/plugins/samplesource/filesource/CMakeLists.txt b/plugins/samplesource/filesource/CMakeLists.txt index 62c91a731..32193e25b 100644 --- a/plugins/samplesource/filesource/CMakeLists.txt +++ b/plugins/samplesource/filesource/CMakeLists.txt @@ -4,14 +4,14 @@ set(filesource_SOURCES filesourceinput.cpp filesourceplugin.cpp filesourcethread.cpp - filesourcesettings.cpp + filesourceinputsettings.cpp ) set(filesource_HEADERS filesourceinput.h filesourceplugin.h filesourcethread.h - filesourcesettings.h + filesourceinputsettings.h ) include_directories( diff --git a/plugins/samplesource/filesource/filesourcegui.cpp b/plugins/samplesource/filesource/filesourcegui.cpp index a63b4340e..6eb629868 100644 --- a/plugins/samplesource/filesource/filesourcegui.cpp +++ b/plugins/samplesource/filesource/filesourcegui.cpp @@ -242,7 +242,7 @@ void FileSourceGui::displaySettings() { blockApplySettings(true); ui->playLoop->setChecked(m_settings.m_loop); - ui->acceleration->setCurrentIndex(FileSourceSettings::getAccelerationIndex(m_settings.m_accelerationFactor)); + ui->acceleration->setCurrentIndex(FileSourceInputSettings::getAccelerationIndex(m_settings.m_accelerationFactor)); blockApplySettings(false); } @@ -335,7 +335,7 @@ void FileSourceGui::on_acceleration_currentIndexChanged(int index) { if (m_doApplySettings) { - m_settings.m_accelerationFactor = FileSourceSettings::getAccelerationValue(index); + m_settings.m_accelerationFactor = FileSourceInputSettings::getAccelerationValue(index); FileSourceInput::MsgConfigureFileSource *message = FileSourceInput::MsgConfigureFileSource::create(m_settings, false); m_sampleSource->getInputMessageQueue()->push(message); } @@ -412,7 +412,7 @@ void FileSourceGui::setAccelerationCombo() ui->acceleration->clear(); ui->acceleration->addItem(QString("1")); - for (unsigned int i = 0; i <= FileSourceSettings::m_accelerationMaxScale; i++) + for (unsigned int i = 0; i <= FileSourceInputSettings::m_accelerationMaxScale; i++) { QString s; int m = pow(10.0, i); diff --git a/plugins/samplesource/filesource/filesourcegui.h b/plugins/samplesource/filesource/filesourcegui.h index ea429dcba..dbaa07427 100644 --- a/plugins/samplesource/filesource/filesourcegui.h +++ b/plugins/samplesource/filesource/filesourcegui.h @@ -24,7 +24,7 @@ #include "util/messagequeue.h" -#include "filesourcesettings.h" +#include "filesourceinputsettings.h" #include "filesourceinput.h" class DeviceUISet; @@ -56,7 +56,7 @@ private: Ui::FileSourceGui* ui; DeviceUISet* m_deviceUISet; - FileSourceSettings m_settings; + FileSourceInputSettings m_settings; bool m_doApplySettings; QTimer m_statusTimer; std::vector m_gains; diff --git a/plugins/samplesource/filesource/filesourceinput.cpp b/plugins/samplesource/filesource/filesourceinput.cpp index ba93feca3..e2178a38e 100644 --- a/plugins/samplesource/filesource/filesourceinput.cpp +++ b/plugins/samplesource/filesource/filesourceinput.cpp @@ -23,10 +23,9 @@ #include #include "SWGDeviceSettings.h" -#include "SWGFileSourceSettings.h" +#include "SWGFileSourceInputSettings.h" #include "SWGDeviceState.h" #include "SWGDeviceReport.h" -#include "SWGFileSourceSettings.h" #include "util/simpleserializer.h" #include "dsp/dspcommands.h" @@ -275,7 +274,7 @@ quint64 FileSourceInput::getCenterFrequency() const void FileSourceInput::setCenterFrequency(qint64 centerFrequency) { - FileSourceSettings settings = m_settings; + FileSourceInputSettings settings = m_settings; settings.m_centerFrequency = centerFrequency; MsgConfigureFileSource* message = MsgConfigureFileSource::create(m_settings, false); @@ -298,7 +297,7 @@ bool FileSourceInput::handleMessage(const Message& message) if (MsgConfigureFileSource::match(message)) { MsgConfigureFileSource& conf = (MsgConfigureFileSource&) message; - FileSourceSettings settings = conf.getSettings(); + FileSourceInputSettings settings = conf.getSettings(); applySettings(settings); return true; } @@ -404,7 +403,7 @@ bool FileSourceInput::handleMessage(const Message& message) } } -bool FileSourceInput::applySettings(const FileSourceSettings& settings, bool force) +bool FileSourceInput::applySettings(const FileSourceInputSettings& settings, bool force) { QList reverseAPIKeys; @@ -452,8 +451,8 @@ int FileSourceInput::webapiSettingsGet( QString& errorMessage) { (void) errorMessage; - response.setFileSourceSettings(new SWGSDRangel::SWGFileSourceSettings()); - response.getFileSourceSettings()->init(); + response.setFileSourceInputSettings(new SWGSDRangel::SWGFileSourceInputSettings()); + response.getFileSourceInputSettings()->init(); webapiFormatDeviceSettings(response, m_settings); return 200; } @@ -465,28 +464,28 @@ int FileSourceInput::webapiSettingsPutPatch( QString& errorMessage) { (void) errorMessage; - FileSourceSettings settings = m_settings; + FileSourceInputSettings settings = m_settings; if (deviceSettingsKeys.contains("fileName")) { - settings.m_fileName = *response.getFileSourceSettings()->getFileName(); + settings.m_fileName = *response.getFileSourceInputSettings()->getFileName(); } if (deviceSettingsKeys.contains("accelerationFactor")) { - settings.m_accelerationFactor = response.getFileSourceSettings()->getAccelerationFactor(); + settings.m_accelerationFactor = response.getFileSourceInputSettings()->getAccelerationFactor(); } if (deviceSettingsKeys.contains("loop")) { - settings.m_loop = response.getFileSourceSettings()->getLoop() != 0; + settings.m_loop = response.getFileSourceInputSettings()->getLoop() != 0; } if (deviceSettingsKeys.contains("useReverseAPI")) { - settings.m_useReverseAPI = response.getFileSourceSettings()->getUseReverseApi() != 0; + settings.m_useReverseAPI = response.getFileSourceInputSettings()->getUseReverseApi() != 0; } if (deviceSettingsKeys.contains("reverseAPIAddress")) { - settings.m_reverseAPIAddress = *response.getFileSourceSettings()->getReverseApiAddress(); + settings.m_reverseAPIAddress = *response.getFileSourceInputSettings()->getReverseApiAddress(); } if (deviceSettingsKeys.contains("reverseAPIPort")) { - settings.m_reverseAPIPort = response.getFileSourceSettings()->getReverseApiPort(); + settings.m_reverseAPIPort = response.getFileSourceInputSettings()->getReverseApiPort(); } if (deviceSettingsKeys.contains("reverseAPIDeviceIndex")) { - settings.m_reverseAPIDeviceIndex = response.getFileSourceSettings()->getReverseApiDeviceIndex(); + settings.m_reverseAPIDeviceIndex = response.getFileSourceInputSettings()->getReverseApiDeviceIndex(); } MsgConfigureFileSource *msg = MsgConfigureFileSource::create(settings, force); @@ -535,28 +534,28 @@ int FileSourceInput::webapiReportGet( QString& errorMessage) { (void) errorMessage; - response.setFileSourceReport(new SWGSDRangel::SWGFileSourceReport()); - response.getFileSourceReport()->init(); + response.setFileSourceInputReport(new SWGSDRangel::SWGFileSourceInputReport()); + response.getFileSourceInputReport()->init(); webapiFormatDeviceReport(response); return 200; } -void FileSourceInput::webapiFormatDeviceSettings(SWGSDRangel::SWGDeviceSettings& response, const FileSourceSettings& settings) +void FileSourceInput::webapiFormatDeviceSettings(SWGSDRangel::SWGDeviceSettings& response, const FileSourceInputSettings& settings) { - response.getFileSourceSettings()->setFileName(new QString(settings.m_fileName)); - response.getFileSourceSettings()->setAccelerationFactor(settings.m_accelerationFactor); - response.getFileSourceSettings()->setLoop(settings.m_loop ? 1 : 0); + response.getFileSourceInputSettings()->setFileName(new QString(settings.m_fileName)); + response.getFileSourceInputSettings()->setAccelerationFactor(settings.m_accelerationFactor); + response.getFileSourceInputSettings()->setLoop(settings.m_loop ? 1 : 0); - response.getFileSourceSettings()->setUseReverseApi(settings.m_useReverseAPI ? 1 : 0); + response.getFileSourceInputSettings()->setUseReverseApi(settings.m_useReverseAPI ? 1 : 0); - if (response.getFileSourceSettings()->getReverseApiAddress()) { - *response.getFileSourceSettings()->getReverseApiAddress() = settings.m_reverseAPIAddress; + if (response.getFileSourceInputSettings()->getReverseApiAddress()) { + *response.getFileSourceInputSettings()->getReverseApiAddress() = settings.m_reverseAPIAddress; } else { - response.getFileSourceSettings()->setReverseApiAddress(new QString(settings.m_reverseAPIAddress)); + response.getFileSourceInputSettings()->setReverseApiAddress(new QString(settings.m_reverseAPIAddress)); } - response.getFileSourceSettings()->setReverseApiPort(settings.m_reverseAPIPort); - response.getFileSourceSettings()->setReverseApiDeviceIndex(settings.m_reverseAPIDeviceIndex); + response.getFileSourceInputSettings()->setReverseApiPort(settings.m_reverseAPIPort); + response.getFileSourceInputSettings()->setReverseApiDeviceIndex(settings.m_reverseAPIDeviceIndex); } void FileSourceInput::webapiFormatDeviceReport(SWGSDRangel::SWGDeviceReport& response) @@ -578,42 +577,42 @@ void FileSourceInput::webapiFormatDeviceReport(SWGSDRangel::SWGDeviceReport& res QTime t(0, 0, 0, 0); t = t.addSecs(t_sec); t = t.addMSecs(t_msec); - response.getFileSourceReport()->setElapsedTime(new QString(t.toString("HH:mm:ss.zzz"))); + response.getFileSourceInputReport()->setElapsedTime(new QString(t.toString("HH:mm:ss.zzz"))); qint64 startingTimeStampMsec = m_startingTimeStamp * 1000LL; QDateTime dt = QDateTime::fromMSecsSinceEpoch(startingTimeStampMsec); dt = dt.addSecs(t_sec); dt = dt.addMSecs(t_msec); - response.getFileSourceReport()->setAbsoluteTime(new QString(dt.toString("yyyy-MM-dd HH:mm:ss.zzz"))); + response.getFileSourceInputReport()->setAbsoluteTime(new QString(dt.toString("yyyy-MM-dd HH:mm:ss.zzz"))); QTime recordLength(0, 0, 0, 0); recordLength = recordLength.addSecs(m_recordLength); - response.getFileSourceReport()->setDurationTime(new QString(recordLength.toString("HH:mm:ss"))); + response.getFileSourceInputReport()->setDurationTime(new QString(recordLength.toString("HH:mm:ss"))); - response.getFileSourceReport()->setFileName(new QString(m_fileName)); - response.getFileSourceReport()->setSampleRate(m_sampleRate); - response.getFileSourceReport()->setSampleSize(m_sampleSize); + response.getFileSourceInputReport()->setFileName(new QString(m_fileName)); + response.getFileSourceInputReport()->setSampleRate(m_sampleRate); + response.getFileSourceInputReport()->setSampleSize(m_sampleSize); } -void FileSourceInput::webapiReverseSendSettings(QList& deviceSettingsKeys, const FileSourceSettings& settings, bool force) +void FileSourceInput::webapiReverseSendSettings(QList& deviceSettingsKeys, const FileSourceInputSettings& settings, bool force) { SWGSDRangel::SWGDeviceSettings *swgDeviceSettings = new SWGSDRangel::SWGDeviceSettings(); swgDeviceSettings->setDirection(0); // single Rx swgDeviceSettings->setOriginatorIndex(m_deviceAPI->getDeviceSetIndex()); swgDeviceSettings->setDeviceHwType(new QString("FileSource")); - swgDeviceSettings->setFileSourceSettings(new SWGSDRangel::SWGFileSourceSettings()); - SWGSDRangel::SWGFileSourceSettings *swgFileSourceSettings = swgDeviceSettings->getFileSourceSettings(); + swgDeviceSettings->setFileSourceInputSettings(new SWGSDRangel::SWGFileSourceInputSettings()); + SWGSDRangel::SWGFileSourceInputSettings *swgFileSourceInputSettings = swgDeviceSettings->getFileSourceInputSettings(); // transfer data that has been modified. When force is on transfer all data except reverse API data if (deviceSettingsKeys.contains("accelerationFactor") || force) { - swgFileSourceSettings->setAccelerationFactor(settings.m_accelerationFactor); + swgFileSourceInputSettings->setAccelerationFactor(settings.m_accelerationFactor); } if (deviceSettingsKeys.contains("loop") || force) { - swgFileSourceSettings->setLoop(settings.m_loop); + swgFileSourceInputSettings->setLoop(settings.m_loop); } if (deviceSettingsKeys.contains("fileName") || force) { - swgFileSourceSettings->setFileName(new QString(settings.m_fileName)); + swgFileSourceInputSettings->setFileName(new QString(settings.m_fileName)); } QString deviceSettingsURL = QString("http://%1:%2/sdrangel/deviceset/%3/device/settings") diff --git a/plugins/samplesource/filesource/filesourceinput.h b/plugins/samplesource/filesource/filesourceinput.h index c7f872809..98250784a 100644 --- a/plugins/samplesource/filesource/filesourceinput.h +++ b/plugins/samplesource/filesource/filesourceinput.h @@ -28,7 +28,7 @@ #include #include "dsp/devicesamplesource.h" -#include "filesourcesettings.h" +#include "filesourceinputsettings.h" class QNetworkAccessManager; class QNetworkReply; @@ -42,19 +42,19 @@ public: MESSAGE_CLASS_DECLARATION public: - const FileSourceSettings& getSettings() const { return m_settings; } + const FileSourceInputSettings& getSettings() const { return m_settings; } bool getForce() const { return m_force; } - static MsgConfigureFileSource* create(const FileSourceSettings& settings, bool force) + static MsgConfigureFileSource* create(const FileSourceInputSettings& settings, bool force) { return new MsgConfigureFileSource(settings, force); } private: - FileSourceSettings m_settings; + FileSourceInputSettings m_settings; bool m_force; - MsgConfigureFileSource(const FileSourceSettings& settings, bool force) : + MsgConfigureFileSource(const FileSourceInputSettings& settings, bool force) : Message(), m_settings(settings), m_force(force) @@ -322,7 +322,7 @@ public: private: DeviceAPI *m_deviceAPI; QMutex m_mutex; - FileSourceSettings m_settings; + FileSourceInputSettings m_settings; std::ifstream m_ifstream; FileSourceThread* m_fileSourceThread; QString m_deviceDescription; @@ -338,10 +338,10 @@ public: void openFileStream(); void seekFileStream(int seekMillis); - bool applySettings(const FileSourceSettings& settings, bool force = false); - void webapiFormatDeviceSettings(SWGSDRangel::SWGDeviceSettings& response, const FileSourceSettings& settings); + bool applySettings(const FileSourceInputSettings& settings, bool force = false); + void webapiFormatDeviceSettings(SWGSDRangel::SWGDeviceSettings& response, const FileSourceInputSettings& settings); void webapiFormatDeviceReport(SWGSDRangel::SWGDeviceReport& response); - void webapiReverseSendSettings(QList& deviceSettingsKeys, const FileSourceSettings& settings, bool force); + void webapiReverseSendSettings(QList& deviceSettingsKeys, const FileSourceInputSettings& settings, bool force); void webapiReverseSendStartStop(bool start); private slots: diff --git a/plugins/samplesource/filesource/filesourcesettings.cpp b/plugins/samplesource/filesource/filesourceinputsettings.cpp similarity index 88% rename from plugins/samplesource/filesource/filesourcesettings.cpp rename to plugins/samplesource/filesource/filesourceinputsettings.cpp index 0ea21dbe3..3d0979cc8 100644 --- a/plugins/samplesource/filesource/filesourcesettings.cpp +++ b/plugins/samplesource/filesource/filesourceinputsettings.cpp @@ -17,16 +17,16 @@ #include "util/simpleserializer.h" -#include "filesourcesettings.h" +#include "filesourceinputsettings.h" -const unsigned int FileSourceSettings::m_accelerationMaxScale = 2; +const unsigned int FileSourceInputSettings::m_accelerationMaxScale = 2; -FileSourceSettings::FileSourceSettings() +FileSourceInputSettings::FileSourceInputSettings() { resetToDefaults(); } -void FileSourceSettings::resetToDefaults() +void FileSourceInputSettings::resetToDefaults() { m_centerFrequency = 435000000; m_sampleRate = 48000; @@ -39,7 +39,7 @@ void FileSourceSettings::resetToDefaults() m_reverseAPIDeviceIndex = 0; } -QByteArray FileSourceSettings::serialize() const +QByteArray FileSourceInputSettings::serialize() const { SimpleSerializer s(1); s.writeString(1, m_fileName); @@ -53,7 +53,7 @@ QByteArray FileSourceSettings::serialize() const return s.final(); } -bool FileSourceSettings::deserialize(const QByteArray& data) +bool FileSourceInputSettings::deserialize(const QByteArray& data) { SimpleDeserializer d(data); @@ -91,7 +91,7 @@ bool FileSourceSettings::deserialize(const QByteArray& data) } } -int FileSourceSettings::getAccelerationIndex(int accelerationValue) +int FileSourceInputSettings::getAccelerationIndex(int accelerationValue) { if (accelerationValue <= 1) { return 0; @@ -123,7 +123,7 @@ int FileSourceSettings::getAccelerationIndex(int accelerationValue) return 3*m_accelerationMaxScale + 3; } -int FileSourceSettings::getAccelerationValue(int accelerationIndex) +int FileSourceInputSettings::getAccelerationValue(int accelerationIndex) { if (accelerationIndex <= 0) { return 1; diff --git a/plugins/samplesource/filesource/filesourcesettings.h b/plugins/samplesource/filesource/filesourceinputsettings.h similarity index 86% rename from plugins/samplesource/filesource/filesourcesettings.h rename to plugins/samplesource/filesource/filesourceinputsettings.h index 3d0218846..f0b26970a 100644 --- a/plugins/samplesource/filesource/filesourcesettings.h +++ b/plugins/samplesource/filesource/filesourceinputsettings.h @@ -15,13 +15,13 @@ // along with this program. If not, see . // /////////////////////////////////////////////////////////////////////////////////// -#ifndef PLUGINS_SAMPLESOURCE_FILESOURCE_FILESOURCESETTINGS_H_ -#define PLUGINS_SAMPLESOURCE_FILESOURCE_FILESOURCESETTINGS_H_ +#ifndef PLUGINS_SAMPLESOURCE_FILESOURCE_FILESOURCEINPUTSETTINGS_H_ +#define PLUGINS_SAMPLESOURCE_FILESOURCE_FILESOURCEINPUTSETTINGS_H_ #include #include -struct FileSourceSettings { +struct FileSourceInputSettings { quint64 m_centerFrequency; qint32 m_sampleRate; QString m_fileName; @@ -34,8 +34,8 @@ struct FileSourceSettings { static const unsigned int m_accelerationMaxScale; //!< Max power of 10 multiplier to 2,5,10 base ex: 2 -> 2,5,10,20,50,100,200,500,1000 - FileSourceSettings(); - ~FileSourceSettings() {} + FileSourceInputSettings(); + ~FileSourceInputSettings() {} void resetToDefaults(); QByteArray serialize() const; @@ -44,4 +44,4 @@ struct FileSourceSettings { static int getAccelerationValue(int averagingIndex); }; -#endif /* PLUGINS_SAMPLESOURCE_FILESOURCE_FILESOURCESETTINGS_H_ */ +#endif /* PLUGINS_SAMPLESOURCE_FILESOURCE_FILESOURCEINPUTSETTINGS_H_ */ diff --git a/plugins/samplesource/filesource/filesourceplugin.cpp b/plugins/samplesource/filesource/filesourceplugin.cpp index d8a90cd64..19d7790df 100644 --- a/plugins/samplesource/filesource/filesourceplugin.cpp +++ b/plugins/samplesource/filesource/filesourceplugin.cpp @@ -29,7 +29,7 @@ const PluginDescriptor FileSourcePlugin::m_pluginDescriptor = { QString("File source input"), - QString("4.5.2"), + QString("4.11.0"), QString("(c) Edouard Griffiths, F4EXB"), QString("https://github.com/f4exb/sdrangel"), true, diff --git a/sdrbase/resources/webapi.qrc b/sdrbase/resources/webapi.qrc index fb37821b5..d07995072 100644 --- a/sdrbase/resources/webapi.qrc +++ b/sdrbase/resources/webapi.qrc @@ -14,7 +14,7 @@ webapi/doc/swagger/include/DSDDemod.yaml webapi/doc/swagger/include/FCDPro.yaml webapi/doc/swagger/include/FCDProPlus.yaml - webapi/doc/swagger/include/FileSource.yaml + webapi/doc/swagger/include/FileSourceInput.yaml webapi/doc/swagger/include/FreeDVDemod.yaml webapi/doc/swagger/include/FreeDVMod.yaml webapi/doc/swagger/include/FreqTracker.yaml diff --git a/sdrbase/resources/webapi/doc/html2/index.html b/sdrbase/resources/webapi/doc/html2/index.html index 762b634cc..6bce39608 100644 --- a/sdrbase/resources/webapi/doc/html2/index.html +++ b/sdrbase/resources/webapi/doc/html2/index.html @@ -2157,8 +2157,8 @@ margin-bottom: 20px; "bladeRF2OutputReport" : { "$ref" : "#/definitions/BladeRF2OutputReport" }, - "fileSourceReport" : { - "$ref" : "#/definitions/FileSourceReport" + "fileSourceInputReport" : { + "$ref" : "#/definitions/FileSourceInputReport" }, "limeSdrInputReport" : { "$ref" : "#/definitions/LimeSdrInputReport" @@ -2291,8 +2291,8 @@ margin-bottom: 20px; "fcdProPlusSettings" : { "$ref" : "#/definitions/FCDProPlusSettings" }, - "fileSourceSettings" : { - "$ref" : "#/definitions/FileSourceSettings" + "fileSourceInputSettings" : { + "$ref" : "#/definitions/FileSourceInputSettings" }, "hackRFInputSettings" : { "$ref" : "#/definitions/HackRFInputSettings" @@ -2543,7 +2543,7 @@ margin-bottom: 20px; }, "description" : "FCDPro" }; - defs.FileSourceReport = { + defs.FileSourceInputReport = { "properties" : { "fileName" : { "type" : "string" @@ -2571,7 +2571,7 @@ margin-bottom: 20px; }, "description" : "FileSource" }; - defs.FileSourceSettings = { + defs.FileSourceInputSettings = { "properties" : { "fileName" : { "type" : "string", @@ -25154,7 +25154,7 @@ except ApiException as e:
- Generated 2019-06-09T20:39:26.572+02:00 + Generated 2019-07-07T00:08:06.460+02:00
diff --git a/sdrbase/resources/webapi/doc/swagger/include/FileSource.yaml b/sdrbase/resources/webapi/doc/swagger/include/FileSourceInput.yaml similarity index 95% rename from sdrbase/resources/webapi/doc/swagger/include/FileSource.yaml rename to sdrbase/resources/webapi/doc/swagger/include/FileSourceInput.yaml index 872a69c03..aa612b02b 100644 --- a/sdrbase/resources/webapi/doc/swagger/include/FileSource.yaml +++ b/sdrbase/resources/webapi/doc/swagger/include/FileSourceInput.yaml @@ -1,4 +1,4 @@ -FileSourceSettings: +FileSourceInputSettings: description: FileSource properties: fileName: @@ -20,7 +20,7 @@ FileSourceSettings: reverseAPIDeviceIndex: type: integer -FileSourceReport: +FileSourceInputReport: description: FileSource properties: fileName: diff --git a/sdrbase/resources/webapi/doc/swagger/swagger.yaml b/sdrbase/resources/webapi/doc/swagger/swagger.yaml index 41c349ec8..87cd39cb2 100644 --- a/sdrbase/resources/webapi/doc/swagger/swagger.yaml +++ b/sdrbase/resources/webapi/doc/swagger/swagger.yaml @@ -1796,8 +1796,8 @@ definitions: $ref: "/doc/swagger/include/FCDPro.yaml#/FCDProSettings" fcdProPlusSettings: $ref: "/doc/swagger/include/FCDProPlus.yaml#/FCDProPlusSettings" - fileSourceSettings: - $ref: "/doc/swagger/include/FileSource.yaml#/FileSourceSettings" + fileSourceInputSettings: + $ref: "/doc/swagger/include/FileSourceInput.yaml#/FileSourceInputSettings" hackRFInputSettings: $ref: "/doc/swagger/include/HackRF.yaml#/HackRFInputSettings" hackRFOutputSettings: @@ -1861,8 +1861,8 @@ definitions: $ref: "/doc/swagger/include/BladeRF2.yaml#/BladeRF2InputReport" bladeRF2OutputReport: $ref: "/doc/swagger/include/BladeRF2.yaml#/BladeRF2OutputReport" - fileSourceReport: - $ref: "/doc/swagger/include/FileSource.yaml#/FileSourceReport" + fileSourceInputReport: + $ref: "/doc/swagger/include/FileSourceInput.yaml#/FileSourceInputReport" limeSdrInputReport: $ref: "/doc/swagger/include/LimeSdr.yaml#/LimeSdrInputReport" kiwiSDRReport: diff --git a/sdrbase/webapi/webapirequestmapper.cpp b/sdrbase/webapi/webapirequestmapper.cpp index 1c3b679e6..153770658 100644 --- a/sdrbase/webapi/webapirequestmapper.cpp +++ b/sdrbase/webapi/webapirequestmapper.cpp @@ -1905,8 +1905,8 @@ bool WebAPIRequestMapper::validateDeviceSettings( { QJsonObject fileSourceSettingsJsonObject = jsonObject["fileSourceSettings"].toObject(); deviceSettingsKeys = fileSourceSettingsJsonObject.keys(); - deviceSettings.setFileSourceSettings(new SWGSDRangel::SWGFileSourceSettings()); - deviceSettings.getFileSourceSettings()->fromJsonObject(fileSourceSettingsJsonObject); + deviceSettings.setFileSourceInputSettings(new SWGSDRangel::SWGFileSourceInputSettings()); + deviceSettings.getFileSourceInputSettings()->fromJsonObject(fileSourceSettingsJsonObject); return true; } else @@ -2685,7 +2685,7 @@ void WebAPIRequestMapper::resetDeviceSettings(SWGSDRangel::SWGDeviceSettings& de deviceSettings.setBladeRf1OutputSettings(0); deviceSettings.setFcdProPlusSettings(0); deviceSettings.setFcdProSettings(0); - deviceSettings.setFileSourceSettings(0); + deviceSettings.setFileSourceInputSettings(0); deviceSettings.setHackRfInputSettings(0); deviceSettings.setHackRfOutputSettings(0); deviceSettings.setLimeSdrInputSettings(0); @@ -2706,7 +2706,7 @@ void WebAPIRequestMapper::resetDeviceReport(SWGSDRangel::SWGDeviceReport& device deviceReport.setDeviceHwType(0); deviceReport.setAirspyHfReport(0); deviceReport.setAirspyReport(0); - deviceReport.setFileSourceReport(0); + deviceReport.setFileSourceInputReport(0); deviceReport.setLimeSdrInputReport(0); deviceReport.setLimeSdrOutputReport(0); deviceReport.setPerseusReport(0); diff --git a/swagger/sdrangel/api/swagger/include/FileSource.yaml b/swagger/sdrangel/api/swagger/include/FileSourceInput.yaml similarity index 95% rename from swagger/sdrangel/api/swagger/include/FileSource.yaml rename to swagger/sdrangel/api/swagger/include/FileSourceInput.yaml index 872a69c03..aa612b02b 100644 --- a/swagger/sdrangel/api/swagger/include/FileSource.yaml +++ b/swagger/sdrangel/api/swagger/include/FileSourceInput.yaml @@ -1,4 +1,4 @@ -FileSourceSettings: +FileSourceInputSettings: description: FileSource properties: fileName: @@ -20,7 +20,7 @@ FileSourceSettings: reverseAPIDeviceIndex: type: integer -FileSourceReport: +FileSourceInputReport: description: FileSource properties: fileName: diff --git a/swagger/sdrangel/api/swagger/swagger.yaml b/swagger/sdrangel/api/swagger/swagger.yaml index 47643599b..f632e4031 100644 --- a/swagger/sdrangel/api/swagger/swagger.yaml +++ b/swagger/sdrangel/api/swagger/swagger.yaml @@ -1796,8 +1796,8 @@ definitions: $ref: "http://localhost:8081/api/swagger/include/FCDPro.yaml#/FCDProSettings" fcdProPlusSettings: $ref: "http://localhost:8081/api/swagger/include/FCDProPlus.yaml#/FCDProPlusSettings" - fileSourceSettings: - $ref: "http://localhost:8081/api/swagger/include/FileSource.yaml#/FileSourceSettings" + fileSourceInputSettings: + $ref: "http://localhost:8081/api/swagger/include/FileSourceInput.yaml#/FileSourceInputSettings" hackRFInputSettings: $ref: "http://localhost:8081/api/swagger/include/HackRF.yaml#/HackRFInputSettings" hackRFOutputSettings: @@ -1861,8 +1861,8 @@ definitions: $ref: "http://localhost:8081/api/swagger/include/BladeRF2.yaml#/BladeRF2InputReport" bladeRF2OutputReport: $ref: "http://localhost:8081/api/swagger/include/BladeRF2.yaml#/BladeRF2OutputReport" - fileSourceReport: - $ref: "http://localhost:8081/api/swagger/include/FileSource.yaml#/FileSourceReport" + fileSourceInputReport: + $ref: "http://localhost:8081/api/swagger/include/FileSourceInput.yaml#/FileSourceInputReport" limeSdrInputReport: $ref: "http://localhost:8081/api/swagger/include/LimeSdr.yaml#/LimeSdrInputReport" kiwiSDRReport: diff --git a/swagger/sdrangel/code/html2/index.html b/swagger/sdrangel/code/html2/index.html index 762b634cc..6bce39608 100644 --- a/swagger/sdrangel/code/html2/index.html +++ b/swagger/sdrangel/code/html2/index.html @@ -2157,8 +2157,8 @@ margin-bottom: 20px; "bladeRF2OutputReport" : { "$ref" : "#/definitions/BladeRF2OutputReport" }, - "fileSourceReport" : { - "$ref" : "#/definitions/FileSourceReport" + "fileSourceInputReport" : { + "$ref" : "#/definitions/FileSourceInputReport" }, "limeSdrInputReport" : { "$ref" : "#/definitions/LimeSdrInputReport" @@ -2291,8 +2291,8 @@ margin-bottom: 20px; "fcdProPlusSettings" : { "$ref" : "#/definitions/FCDProPlusSettings" }, - "fileSourceSettings" : { - "$ref" : "#/definitions/FileSourceSettings" + "fileSourceInputSettings" : { + "$ref" : "#/definitions/FileSourceInputSettings" }, "hackRFInputSettings" : { "$ref" : "#/definitions/HackRFInputSettings" @@ -2543,7 +2543,7 @@ margin-bottom: 20px; }, "description" : "FCDPro" }; - defs.FileSourceReport = { + defs.FileSourceInputReport = { "properties" : { "fileName" : { "type" : "string" @@ -2571,7 +2571,7 @@ margin-bottom: 20px; }, "description" : "FileSource" }; - defs.FileSourceSettings = { + defs.FileSourceInputSettings = { "properties" : { "fileName" : { "type" : "string", @@ -25154,7 +25154,7 @@ except ApiException as e:
- Generated 2019-06-09T20:39:26.572+02:00 + Generated 2019-07-07T00:08:06.460+02:00
diff --git a/swagger/sdrangel/code/qt5/client/SWGDeviceReport.cpp b/swagger/sdrangel/code/qt5/client/SWGDeviceReport.cpp index 7d89beacf..53df48cf9 100644 --- a/swagger/sdrangel/code/qt5/client/SWGDeviceReport.cpp +++ b/swagger/sdrangel/code/qt5/client/SWGDeviceReport.cpp @@ -40,8 +40,8 @@ SWGDeviceReport::SWGDeviceReport() { m_blade_rf2_input_report_isSet = false; blade_rf2_output_report = nullptr; m_blade_rf2_output_report_isSet = false; - file_source_report = nullptr; - m_file_source_report_isSet = false; + file_source_input_report = nullptr; + m_file_source_input_report_isSet = false; lime_sdr_input_report = nullptr; m_lime_sdr_input_report_isSet = false; kiwi_sdr_report = nullptr; @@ -94,8 +94,8 @@ SWGDeviceReport::init() { m_blade_rf2_input_report_isSet = false; blade_rf2_output_report = new SWGBladeRF2OutputReport(); m_blade_rf2_output_report_isSet = false; - file_source_report = new SWGFileSourceReport(); - m_file_source_report_isSet = false; + file_source_input_report = new SWGFileSourceInputReport(); + m_file_source_input_report_isSet = false; lime_sdr_input_report = new SWGLimeSdrInputReport(); m_lime_sdr_input_report_isSet = false; kiwi_sdr_report = new SWGKiwiSDRReport(); @@ -148,8 +148,8 @@ SWGDeviceReport::cleanup() { if(blade_rf2_output_report != nullptr) { delete blade_rf2_output_report; } - if(file_source_report != nullptr) { - delete file_source_report; + if(file_source_input_report != nullptr) { + delete file_source_input_report; } if(lime_sdr_input_report != nullptr) { delete lime_sdr_input_report; @@ -224,7 +224,7 @@ SWGDeviceReport::fromJsonObject(QJsonObject &pJson) { ::SWGSDRangel::setValue(&blade_rf2_output_report, pJson["bladeRF2OutputReport"], "SWGBladeRF2OutputReport", "SWGBladeRF2OutputReport"); - ::SWGSDRangel::setValue(&file_source_report, pJson["fileSourceReport"], "SWGFileSourceReport", "SWGFileSourceReport"); + ::SWGSDRangel::setValue(&file_source_input_report, pJson["fileSourceInputReport"], "SWGFileSourceInputReport", "SWGFileSourceInputReport"); ::SWGSDRangel::setValue(&lime_sdr_input_report, pJson["limeSdrInputReport"], "SWGLimeSdrInputReport", "SWGLimeSdrInputReport"); @@ -292,8 +292,8 @@ SWGDeviceReport::asJsonObject() { if((blade_rf2_output_report != nullptr) && (blade_rf2_output_report->isSet())){ toJsonValue(QString("bladeRF2OutputReport"), blade_rf2_output_report, obj, QString("SWGBladeRF2OutputReport")); } - if((file_source_report != nullptr) && (file_source_report->isSet())){ - toJsonValue(QString("fileSourceReport"), file_source_report, obj, QString("SWGFileSourceReport")); + if((file_source_input_report != nullptr) && (file_source_input_report->isSet())){ + toJsonValue(QString("fileSourceInputReport"), file_source_input_report, obj, QString("SWGFileSourceInputReport")); } if((lime_sdr_input_report != nullptr) && (lime_sdr_input_report->isSet())){ toJsonValue(QString("limeSdrInputReport"), lime_sdr_input_report, obj, QString("SWGLimeSdrInputReport")); @@ -407,14 +407,14 @@ SWGDeviceReport::setBladeRf2OutputReport(SWGBladeRF2OutputReport* blade_rf2_outp this->m_blade_rf2_output_report_isSet = true; } -SWGFileSourceReport* -SWGDeviceReport::getFileSourceReport() { - return file_source_report; +SWGFileSourceInputReport* +SWGDeviceReport::getFileSourceInputReport() { + return file_source_input_report; } void -SWGDeviceReport::setFileSourceReport(SWGFileSourceReport* file_source_report) { - this->file_source_report = file_source_report; - this->m_file_source_report_isSet = true; +SWGDeviceReport::setFileSourceInputReport(SWGFileSourceInputReport* file_source_input_report) { + this->file_source_input_report = file_source_input_report; + this->m_file_source_input_report_isSet = true; } SWGLimeSdrInputReport* @@ -588,7 +588,7 @@ SWGDeviceReport::isSet(){ if(airspy_hf_report != nullptr && airspy_hf_report->isSet()){ isObjectUpdated = true; break;} if(blade_rf2_input_report != nullptr && blade_rf2_input_report->isSet()){ isObjectUpdated = true; break;} if(blade_rf2_output_report != nullptr && blade_rf2_output_report->isSet()){ isObjectUpdated = true; break;} - if(file_source_report != nullptr && file_source_report->isSet()){ isObjectUpdated = true; break;} + if(file_source_input_report != nullptr && file_source_input_report->isSet()){ isObjectUpdated = true; break;} if(lime_sdr_input_report != nullptr && lime_sdr_input_report->isSet()){ isObjectUpdated = true; break;} if(kiwi_sdr_report != nullptr && kiwi_sdr_report->isSet()){ isObjectUpdated = true; break;} if(lime_sdr_output_report != nullptr && lime_sdr_output_report->isSet()){ isObjectUpdated = true; break;} diff --git a/swagger/sdrangel/code/qt5/client/SWGDeviceReport.h b/swagger/sdrangel/code/qt5/client/SWGDeviceReport.h index 370598103..51450c6b1 100644 --- a/swagger/sdrangel/code/qt5/client/SWGDeviceReport.h +++ b/swagger/sdrangel/code/qt5/client/SWGDeviceReport.h @@ -26,7 +26,7 @@ #include "SWGAirspyReport.h" #include "SWGBladeRF2InputReport.h" #include "SWGBladeRF2OutputReport.h" -#include "SWGFileSourceReport.h" +#include "SWGFileSourceInputReport.h" #include "SWGKiwiSDRReport.h" #include "SWGLimeSdrInputReport.h" #include "SWGLimeSdrOutputReport.h" @@ -80,8 +80,8 @@ public: SWGBladeRF2OutputReport* getBladeRf2OutputReport(); void setBladeRf2OutputReport(SWGBladeRF2OutputReport* blade_rf2_output_report); - SWGFileSourceReport* getFileSourceReport(); - void setFileSourceReport(SWGFileSourceReport* file_source_report); + SWGFileSourceInputReport* getFileSourceInputReport(); + void setFileSourceInputReport(SWGFileSourceInputReport* file_source_input_report); SWGLimeSdrInputReport* getLimeSdrInputReport(); void setLimeSdrInputReport(SWGLimeSdrInputReport* lime_sdr_input_report); @@ -153,8 +153,8 @@ private: SWGBladeRF2OutputReport* blade_rf2_output_report; bool m_blade_rf2_output_report_isSet; - SWGFileSourceReport* file_source_report; - bool m_file_source_report_isSet; + SWGFileSourceInputReport* file_source_input_report; + bool m_file_source_input_report_isSet; SWGLimeSdrInputReport* lime_sdr_input_report; bool m_lime_sdr_input_report_isSet; diff --git a/swagger/sdrangel/code/qt5/client/SWGDeviceSettings.cpp b/swagger/sdrangel/code/qt5/client/SWGDeviceSettings.cpp index 7ee2aad35..a1815e194 100644 --- a/swagger/sdrangel/code/qt5/client/SWGDeviceSettings.cpp +++ b/swagger/sdrangel/code/qt5/client/SWGDeviceSettings.cpp @@ -50,8 +50,8 @@ SWGDeviceSettings::SWGDeviceSettings() { m_fcd_pro_settings_isSet = false; fcd_pro_plus_settings = nullptr; m_fcd_pro_plus_settings_isSet = false; - file_source_settings = nullptr; - m_file_source_settings_isSet = false; + file_source_input_settings = nullptr; + m_file_source_input_settings_isSet = false; hack_rf_input_settings = nullptr; m_hack_rf_input_settings_isSet = false; hack_rf_output_settings = nullptr; @@ -122,8 +122,8 @@ SWGDeviceSettings::init() { m_fcd_pro_settings_isSet = false; fcd_pro_plus_settings = new SWGFCDProPlusSettings(); m_fcd_pro_plus_settings_isSet = false; - file_source_settings = new SWGFileSourceSettings(); - m_file_source_settings_isSet = false; + file_source_input_settings = new SWGFileSourceInputSettings(); + m_file_source_input_settings_isSet = false; hack_rf_input_settings = new SWGHackRFInputSettings(); m_hack_rf_input_settings_isSet = false; hack_rf_output_settings = new SWGHackRFOutputSettings(); @@ -197,8 +197,8 @@ SWGDeviceSettings::cleanup() { if(fcd_pro_plus_settings != nullptr) { delete fcd_pro_plus_settings; } - if(file_source_settings != nullptr) { - delete file_source_settings; + if(file_source_input_settings != nullptr) { + delete file_source_input_settings; } if(hack_rf_input_settings != nullptr) { delete hack_rf_input_settings; @@ -295,7 +295,7 @@ SWGDeviceSettings::fromJsonObject(QJsonObject &pJson) { ::SWGSDRangel::setValue(&fcd_pro_plus_settings, pJson["fcdProPlusSettings"], "SWGFCDProPlusSettings", "SWGFCDProPlusSettings"); - ::SWGSDRangel::setValue(&file_source_settings, pJson["fileSourceSettings"], "SWGFileSourceSettings", "SWGFileSourceSettings"); + ::SWGSDRangel::setValue(&file_source_input_settings, pJson["fileSourceInputSettings"], "SWGFileSourceInputSettings", "SWGFileSourceInputSettings"); ::SWGSDRangel::setValue(&hack_rf_input_settings, pJson["hackRFInputSettings"], "SWGHackRFInputSettings", "SWGHackRFInputSettings"); @@ -386,8 +386,8 @@ SWGDeviceSettings::asJsonObject() { if((fcd_pro_plus_settings != nullptr) && (fcd_pro_plus_settings->isSet())){ toJsonValue(QString("fcdProPlusSettings"), fcd_pro_plus_settings, obj, QString("SWGFCDProPlusSettings")); } - if((file_source_settings != nullptr) && (file_source_settings->isSet())){ - toJsonValue(QString("fileSourceSettings"), file_source_settings, obj, QString("SWGFileSourceSettings")); + if((file_source_input_settings != nullptr) && (file_source_input_settings->isSet())){ + toJsonValue(QString("fileSourceInputSettings"), file_source_input_settings, obj, QString("SWGFileSourceInputSettings")); } if((hack_rf_input_settings != nullptr) && (hack_rf_input_settings->isSet())){ toJsonValue(QString("hackRFInputSettings"), hack_rf_input_settings, obj, QString("SWGHackRFInputSettings")); @@ -563,14 +563,14 @@ SWGDeviceSettings::setFcdProPlusSettings(SWGFCDProPlusSettings* fcd_pro_plus_set this->m_fcd_pro_plus_settings_isSet = true; } -SWGFileSourceSettings* -SWGDeviceSettings::getFileSourceSettings() { - return file_source_settings; +SWGFileSourceInputSettings* +SWGDeviceSettings::getFileSourceInputSettings() { + return file_source_input_settings; } void -SWGDeviceSettings::setFileSourceSettings(SWGFileSourceSettings* file_source_settings) { - this->file_source_settings = file_source_settings; - this->m_file_source_settings_isSet = true; +SWGDeviceSettings::setFileSourceInputSettings(SWGFileSourceInputSettings* file_source_input_settings) { + this->file_source_input_settings = file_source_input_settings; + this->m_file_source_input_settings_isSet = true; } SWGHackRFInputSettings* @@ -789,7 +789,7 @@ SWGDeviceSettings::isSet(){ if(blade_rf2_output_settings != nullptr && blade_rf2_output_settings->isSet()){ isObjectUpdated = true; break;} if(fcd_pro_settings != nullptr && fcd_pro_settings->isSet()){ isObjectUpdated = true; break;} if(fcd_pro_plus_settings != nullptr && fcd_pro_plus_settings->isSet()){ isObjectUpdated = true; break;} - if(file_source_settings != nullptr && file_source_settings->isSet()){ isObjectUpdated = true; break;} + if(file_source_input_settings != nullptr && file_source_input_settings->isSet()){ isObjectUpdated = true; break;} if(hack_rf_input_settings != nullptr && hack_rf_input_settings->isSet()){ isObjectUpdated = true; break;} if(hack_rf_output_settings != nullptr && hack_rf_output_settings->isSet()){ isObjectUpdated = true; break;} if(kiwi_sdr_settings != nullptr && kiwi_sdr_settings->isSet()){ isObjectUpdated = true; break;} diff --git a/swagger/sdrangel/code/qt5/client/SWGDeviceSettings.h b/swagger/sdrangel/code/qt5/client/SWGDeviceSettings.h index ba1ee762b..ee6f30810 100644 --- a/swagger/sdrangel/code/qt5/client/SWGDeviceSettings.h +++ b/swagger/sdrangel/code/qt5/client/SWGDeviceSettings.h @@ -30,7 +30,7 @@ #include "SWGBladeRF2OutputSettings.h" #include "SWGFCDProPlusSettings.h" #include "SWGFCDProSettings.h" -#include "SWGFileSourceSettings.h" +#include "SWGFileSourceInputSettings.h" #include "SWGHackRFInputSettings.h" #include "SWGHackRFOutputSettings.h" #include "SWGKiwiSDRSettings.h" @@ -104,8 +104,8 @@ public: SWGFCDProPlusSettings* getFcdProPlusSettings(); void setFcdProPlusSettings(SWGFCDProPlusSettings* fcd_pro_plus_settings); - SWGFileSourceSettings* getFileSourceSettings(); - void setFileSourceSettings(SWGFileSourceSettings* file_source_settings); + SWGFileSourceInputSettings* getFileSourceInputSettings(); + void setFileSourceInputSettings(SWGFileSourceInputSettings* file_source_input_settings); SWGHackRFInputSettings* getHackRfInputSettings(); void setHackRfInputSettings(SWGHackRFInputSettings* hack_rf_input_settings); @@ -204,8 +204,8 @@ private: SWGFCDProPlusSettings* fcd_pro_plus_settings; bool m_fcd_pro_plus_settings_isSet; - SWGFileSourceSettings* file_source_settings; - bool m_file_source_settings_isSet; + SWGFileSourceInputSettings* file_source_input_settings; + bool m_file_source_input_settings_isSet; SWGHackRFInputSettings* hack_rf_input_settings; bool m_hack_rf_input_settings_isSet; diff --git a/swagger/sdrangel/code/qt5/client/SWGFileSourceReport.cpp b/swagger/sdrangel/code/qt5/client/SWGFileSourceInputReport.cpp similarity index 83% rename from swagger/sdrangel/code/qt5/client/SWGFileSourceReport.cpp rename to swagger/sdrangel/code/qt5/client/SWGFileSourceInputReport.cpp index 15da5c01f..823f5d93a 100644 --- a/swagger/sdrangel/code/qt5/client/SWGFileSourceReport.cpp +++ b/swagger/sdrangel/code/qt5/client/SWGFileSourceInputReport.cpp @@ -11,7 +11,7 @@ */ -#include "SWGFileSourceReport.h" +#include "SWGFileSourceInputReport.h" #include "SWGHelpers.h" @@ -22,12 +22,12 @@ namespace SWGSDRangel { -SWGFileSourceReport::SWGFileSourceReport(QString* json) { +SWGFileSourceInputReport::SWGFileSourceInputReport(QString* json) { init(); this->fromJson(*json); } -SWGFileSourceReport::SWGFileSourceReport() { +SWGFileSourceInputReport::SWGFileSourceInputReport() { file_name = nullptr; m_file_name_isSet = false; sample_rate = 0; @@ -42,12 +42,12 @@ SWGFileSourceReport::SWGFileSourceReport() { m_duration_time_isSet = false; } -SWGFileSourceReport::~SWGFileSourceReport() { +SWGFileSourceInputReport::~SWGFileSourceInputReport() { this->cleanup(); } void -SWGFileSourceReport::init() { +SWGFileSourceInputReport::init() { file_name = new QString(""); m_file_name_isSet = false; sample_rate = 0; @@ -63,7 +63,7 @@ SWGFileSourceReport::init() { } void -SWGFileSourceReport::cleanup() { +SWGFileSourceInputReport::cleanup() { if(file_name != nullptr) { delete file_name; } @@ -80,8 +80,8 @@ SWGFileSourceReport::cleanup() { } } -SWGFileSourceReport* -SWGFileSourceReport::fromJson(QString &json) { +SWGFileSourceInputReport* +SWGFileSourceInputReport::fromJson(QString &json) { QByteArray array (json.toStdString().c_str()); QJsonDocument doc = QJsonDocument::fromJson(array); QJsonObject jsonObject = doc.object(); @@ -90,7 +90,7 @@ SWGFileSourceReport::fromJson(QString &json) { } void -SWGFileSourceReport::fromJsonObject(QJsonObject &pJson) { +SWGFileSourceInputReport::fromJsonObject(QJsonObject &pJson) { ::SWGSDRangel::setValue(&file_name, pJson["fileName"], "QString", "QString"); ::SWGSDRangel::setValue(&sample_rate, pJson["sampleRate"], "qint32", ""); @@ -106,7 +106,7 @@ SWGFileSourceReport::fromJsonObject(QJsonObject &pJson) { } QString -SWGFileSourceReport::asJson () +SWGFileSourceInputReport::asJson () { QJsonObject* obj = this->asJsonObject(); @@ -117,7 +117,7 @@ SWGFileSourceReport::asJson () } QJsonObject* -SWGFileSourceReport::asJsonObject() { +SWGFileSourceInputReport::asJsonObject() { QJsonObject* obj = new QJsonObject(); if(file_name != nullptr && *file_name != QString("")){ toJsonValue(QString("fileName"), file_name, obj, QString("QString")); @@ -142,68 +142,68 @@ SWGFileSourceReport::asJsonObject() { } QString* -SWGFileSourceReport::getFileName() { +SWGFileSourceInputReport::getFileName() { return file_name; } void -SWGFileSourceReport::setFileName(QString* file_name) { +SWGFileSourceInputReport::setFileName(QString* file_name) { this->file_name = file_name; this->m_file_name_isSet = true; } qint32 -SWGFileSourceReport::getSampleRate() { +SWGFileSourceInputReport::getSampleRate() { return sample_rate; } void -SWGFileSourceReport::setSampleRate(qint32 sample_rate) { +SWGFileSourceInputReport::setSampleRate(qint32 sample_rate) { this->sample_rate = sample_rate; this->m_sample_rate_isSet = true; } qint32 -SWGFileSourceReport::getSampleSize() { +SWGFileSourceInputReport::getSampleSize() { return sample_size; } void -SWGFileSourceReport::setSampleSize(qint32 sample_size) { +SWGFileSourceInputReport::setSampleSize(qint32 sample_size) { this->sample_size = sample_size; this->m_sample_size_isSet = true; } QString* -SWGFileSourceReport::getAbsoluteTime() { +SWGFileSourceInputReport::getAbsoluteTime() { return absolute_time; } void -SWGFileSourceReport::setAbsoluteTime(QString* absolute_time) { +SWGFileSourceInputReport::setAbsoluteTime(QString* absolute_time) { this->absolute_time = absolute_time; this->m_absolute_time_isSet = true; } QString* -SWGFileSourceReport::getElapsedTime() { +SWGFileSourceInputReport::getElapsedTime() { return elapsed_time; } void -SWGFileSourceReport::setElapsedTime(QString* elapsed_time) { +SWGFileSourceInputReport::setElapsedTime(QString* elapsed_time) { this->elapsed_time = elapsed_time; this->m_elapsed_time_isSet = true; } QString* -SWGFileSourceReport::getDurationTime() { +SWGFileSourceInputReport::getDurationTime() { return duration_time; } void -SWGFileSourceReport::setDurationTime(QString* duration_time) { +SWGFileSourceInputReport::setDurationTime(QString* duration_time) { this->duration_time = duration_time; this->m_duration_time_isSet = true; } bool -SWGFileSourceReport::isSet(){ +SWGFileSourceInputReport::isSet(){ bool isObjectUpdated = false; do{ if(file_name != nullptr && *file_name != QString("")){ isObjectUpdated = true; break;} diff --git a/swagger/sdrangel/code/qt5/client/SWGFileSourceReport.h b/swagger/sdrangel/code/qt5/client/SWGFileSourceInputReport.h similarity index 87% rename from swagger/sdrangel/code/qt5/client/SWGFileSourceReport.h rename to swagger/sdrangel/code/qt5/client/SWGFileSourceInputReport.h index f3c65cbfd..a0e1c333b 100644 --- a/swagger/sdrangel/code/qt5/client/SWGFileSourceReport.h +++ b/swagger/sdrangel/code/qt5/client/SWGFileSourceInputReport.h @@ -11,13 +11,13 @@ */ /* - * SWGFileSourceReport.h + * SWGFileSourceInputReport.h * * FileSource */ -#ifndef SWGFileSourceReport_H_ -#define SWGFileSourceReport_H_ +#ifndef SWGFileSourceInputReport_H_ +#define SWGFileSourceInputReport_H_ #include @@ -29,18 +29,18 @@ namespace SWGSDRangel { -class SWG_API SWGFileSourceReport: public SWGObject { +class SWG_API SWGFileSourceInputReport: public SWGObject { public: - SWGFileSourceReport(); - SWGFileSourceReport(QString* json); - virtual ~SWGFileSourceReport(); + SWGFileSourceInputReport(); + SWGFileSourceInputReport(QString* json); + virtual ~SWGFileSourceInputReport(); void init(); void cleanup(); virtual QString asJson () override; virtual QJsonObject* asJsonObject() override; virtual void fromJsonObject(QJsonObject &json) override; - virtual SWGFileSourceReport* fromJson(QString &jsonString) override; + virtual SWGFileSourceInputReport* fromJson(QString &jsonString) override; QString* getFileName(); void setFileName(QString* file_name); @@ -86,4 +86,4 @@ private: } -#endif /* SWGFileSourceReport_H_ */ +#endif /* SWGFileSourceInputReport_H_ */ diff --git a/swagger/sdrangel/code/qt5/client/SWGFileSourceSettings.cpp b/swagger/sdrangel/code/qt5/client/SWGFileSourceInputSettings.cpp similarity index 81% rename from swagger/sdrangel/code/qt5/client/SWGFileSourceSettings.cpp rename to swagger/sdrangel/code/qt5/client/SWGFileSourceInputSettings.cpp index e91ef519c..c4049e124 100644 --- a/swagger/sdrangel/code/qt5/client/SWGFileSourceSettings.cpp +++ b/swagger/sdrangel/code/qt5/client/SWGFileSourceInputSettings.cpp @@ -11,7 +11,7 @@ */ -#include "SWGFileSourceSettings.h" +#include "SWGFileSourceInputSettings.h" #include "SWGHelpers.h" @@ -22,12 +22,12 @@ namespace SWGSDRangel { -SWGFileSourceSettings::SWGFileSourceSettings(QString* json) { +SWGFileSourceInputSettings::SWGFileSourceInputSettings(QString* json) { init(); this->fromJson(*json); } -SWGFileSourceSettings::SWGFileSourceSettings() { +SWGFileSourceInputSettings::SWGFileSourceInputSettings() { file_name = nullptr; m_file_name_isSet = false; acceleration_factor = 0; @@ -44,12 +44,12 @@ SWGFileSourceSettings::SWGFileSourceSettings() { m_reverse_api_device_index_isSet = false; } -SWGFileSourceSettings::~SWGFileSourceSettings() { +SWGFileSourceInputSettings::~SWGFileSourceInputSettings() { this->cleanup(); } void -SWGFileSourceSettings::init() { +SWGFileSourceInputSettings::init() { file_name = new QString(""); m_file_name_isSet = false; acceleration_factor = 0; @@ -67,7 +67,7 @@ SWGFileSourceSettings::init() { } void -SWGFileSourceSettings::cleanup() { +SWGFileSourceInputSettings::cleanup() { if(file_name != nullptr) { delete file_name; } @@ -81,8 +81,8 @@ SWGFileSourceSettings::cleanup() { } -SWGFileSourceSettings* -SWGFileSourceSettings::fromJson(QString &json) { +SWGFileSourceInputSettings* +SWGFileSourceInputSettings::fromJson(QString &json) { QByteArray array (json.toStdString().c_str()); QJsonDocument doc = QJsonDocument::fromJson(array); QJsonObject jsonObject = doc.object(); @@ -91,7 +91,7 @@ SWGFileSourceSettings::fromJson(QString &json) { } void -SWGFileSourceSettings::fromJsonObject(QJsonObject &pJson) { +SWGFileSourceInputSettings::fromJsonObject(QJsonObject &pJson) { ::SWGSDRangel::setValue(&file_name, pJson["fileName"], "QString", "QString"); ::SWGSDRangel::setValue(&acceleration_factor, pJson["accelerationFactor"], "qint32", ""); @@ -109,7 +109,7 @@ SWGFileSourceSettings::fromJsonObject(QJsonObject &pJson) { } QString -SWGFileSourceSettings::asJson () +SWGFileSourceInputSettings::asJson () { QJsonObject* obj = this->asJsonObject(); @@ -120,7 +120,7 @@ SWGFileSourceSettings::asJson () } QJsonObject* -SWGFileSourceSettings::asJsonObject() { +SWGFileSourceInputSettings::asJsonObject() { QJsonObject* obj = new QJsonObject(); if(file_name != nullptr && *file_name != QString("")){ toJsonValue(QString("fileName"), file_name, obj, QString("QString")); @@ -148,78 +148,78 @@ SWGFileSourceSettings::asJsonObject() { } QString* -SWGFileSourceSettings::getFileName() { +SWGFileSourceInputSettings::getFileName() { return file_name; } void -SWGFileSourceSettings::setFileName(QString* file_name) { +SWGFileSourceInputSettings::setFileName(QString* file_name) { this->file_name = file_name; this->m_file_name_isSet = true; } qint32 -SWGFileSourceSettings::getAccelerationFactor() { +SWGFileSourceInputSettings::getAccelerationFactor() { return acceleration_factor; } void -SWGFileSourceSettings::setAccelerationFactor(qint32 acceleration_factor) { +SWGFileSourceInputSettings::setAccelerationFactor(qint32 acceleration_factor) { this->acceleration_factor = acceleration_factor; this->m_acceleration_factor_isSet = true; } qint32 -SWGFileSourceSettings::getLoop() { +SWGFileSourceInputSettings::getLoop() { return loop; } void -SWGFileSourceSettings::setLoop(qint32 loop) { +SWGFileSourceInputSettings::setLoop(qint32 loop) { this->loop = loop; this->m_loop_isSet = true; } qint32 -SWGFileSourceSettings::getUseReverseApi() { +SWGFileSourceInputSettings::getUseReverseApi() { return use_reverse_api; } void -SWGFileSourceSettings::setUseReverseApi(qint32 use_reverse_api) { +SWGFileSourceInputSettings::setUseReverseApi(qint32 use_reverse_api) { this->use_reverse_api = use_reverse_api; this->m_use_reverse_api_isSet = true; } QString* -SWGFileSourceSettings::getReverseApiAddress() { +SWGFileSourceInputSettings::getReverseApiAddress() { return reverse_api_address; } void -SWGFileSourceSettings::setReverseApiAddress(QString* reverse_api_address) { +SWGFileSourceInputSettings::setReverseApiAddress(QString* reverse_api_address) { this->reverse_api_address = reverse_api_address; this->m_reverse_api_address_isSet = true; } qint32 -SWGFileSourceSettings::getReverseApiPort() { +SWGFileSourceInputSettings::getReverseApiPort() { return reverse_api_port; } void -SWGFileSourceSettings::setReverseApiPort(qint32 reverse_api_port) { +SWGFileSourceInputSettings::setReverseApiPort(qint32 reverse_api_port) { this->reverse_api_port = reverse_api_port; this->m_reverse_api_port_isSet = true; } qint32 -SWGFileSourceSettings::getReverseApiDeviceIndex() { +SWGFileSourceInputSettings::getReverseApiDeviceIndex() { return reverse_api_device_index; } void -SWGFileSourceSettings::setReverseApiDeviceIndex(qint32 reverse_api_device_index) { +SWGFileSourceInputSettings::setReverseApiDeviceIndex(qint32 reverse_api_device_index) { this->reverse_api_device_index = reverse_api_device_index; this->m_reverse_api_device_index_isSet = true; } bool -SWGFileSourceSettings::isSet(){ +SWGFileSourceInputSettings::isSet(){ bool isObjectUpdated = false; do{ if(file_name != nullptr && *file_name != QString("")){ isObjectUpdated = true; break;} diff --git a/swagger/sdrangel/code/qt5/client/SWGFileSourceSettings.h b/swagger/sdrangel/code/qt5/client/SWGFileSourceInputSettings.h similarity index 87% rename from swagger/sdrangel/code/qt5/client/SWGFileSourceSettings.h rename to swagger/sdrangel/code/qt5/client/SWGFileSourceInputSettings.h index 791804740..a4e86bd91 100644 --- a/swagger/sdrangel/code/qt5/client/SWGFileSourceSettings.h +++ b/swagger/sdrangel/code/qt5/client/SWGFileSourceInputSettings.h @@ -11,13 +11,13 @@ */ /* - * SWGFileSourceSettings.h + * SWGFileSourceInputSettings.h * * FileSource */ -#ifndef SWGFileSourceSettings_H_ -#define SWGFileSourceSettings_H_ +#ifndef SWGFileSourceInputSettings_H_ +#define SWGFileSourceInputSettings_H_ #include @@ -29,18 +29,18 @@ namespace SWGSDRangel { -class SWG_API SWGFileSourceSettings: public SWGObject { +class SWG_API SWGFileSourceInputSettings: public SWGObject { public: - SWGFileSourceSettings(); - SWGFileSourceSettings(QString* json); - virtual ~SWGFileSourceSettings(); + SWGFileSourceInputSettings(); + SWGFileSourceInputSettings(QString* json); + virtual ~SWGFileSourceInputSettings(); void init(); void cleanup(); virtual QString asJson () override; virtual QJsonObject* asJsonObject() override; virtual void fromJsonObject(QJsonObject &json) override; - virtual SWGFileSourceSettings* fromJson(QString &jsonString) override; + virtual SWGFileSourceInputSettings* fromJson(QString &jsonString) override; QString* getFileName(); void setFileName(QString* file_name); @@ -92,4 +92,4 @@ private: } -#endif /* SWGFileSourceSettings_H_ */ +#endif /* SWGFileSourceInputSettings_H_ */ diff --git a/swagger/sdrangel/code/qt5/client/SWGModelFactory.h b/swagger/sdrangel/code/qt5/client/SWGModelFactory.h index 8701d26dc..afcb93de5 100644 --- a/swagger/sdrangel/code/qt5/client/SWGModelFactory.h +++ b/swagger/sdrangel/code/qt5/client/SWGModelFactory.h @@ -58,8 +58,8 @@ #include "SWGErrorResponse.h" #include "SWGFCDProPlusSettings.h" #include "SWGFCDProSettings.h" -#include "SWGFileSourceReport.h" -#include "SWGFileSourceSettings.h" +#include "SWGFileSourceInputReport.h" +#include "SWGFileSourceInputSettings.h" #include "SWGFreeDVDemodReport.h" #include "SWGFreeDVDemodSettings.h" #include "SWGFreeDVModReport.h" @@ -285,11 +285,11 @@ namespace SWGSDRangel { if(QString("SWGFCDProSettings").compare(type) == 0) { return new SWGFCDProSettings(); } - if(QString("SWGFileSourceReport").compare(type) == 0) { - return new SWGFileSourceReport(); + if(QString("SWGFileSourceInputReport").compare(type) == 0) { + return new SWGFileSourceInputReport(); } - if(QString("SWGFileSourceSettings").compare(type) == 0) { - return new SWGFileSourceSettings(); + if(QString("SWGFileSourceInputSettings").compare(type) == 0) { + return new SWGFileSourceInputSettings(); } if(QString("SWGFreeDVDemodReport").compare(type) == 0) { return new SWGFreeDVDemodReport();