diff --git a/plugins/channelmimo/interferometer/interferometerwebapiadapter.cpp b/plugins/channelmimo/interferometer/interferometerwebapiadapter.cpp index a3d0be2b4..00721418e 100644 --- a/plugins/channelmimo/interferometer/interferometerwebapiadapter.cpp +++ b/plugins/channelmimo/interferometer/interferometerwebapiadapter.cpp @@ -70,7 +70,6 @@ void InterferometerWebAPIAdapter::webapiFormatChannelSettings( { swgScope->getTracesData()->append(new SWGSDRangel::SWGTraceData); swgScope->getTracesData()->back()->setAmp(traceIt->m_amp); - swgScope->getTracesData()->back()->setAmpIndex(traceIt->m_ampIndex); swgScope->getTracesData()->back()->setHasTextOverlay(traceIt->m_hasTextOverlay ? 1 : 0); swgScope->getTracesData()->back()->setStreamIndex(traceIt->m_streamIndex); swgScope->getTracesData()->back()->setOfs(traceIt->m_ofs); @@ -206,9 +205,6 @@ void InterferometerWebAPIAdapter::webapiUpdateChannelSettings( if (channelSettingsKeys.contains(QString("scopeConfig.tracesData[%1].amp").arg(i))) { scopeSettings.m_tracesData.back().m_amp = traceData->getAmp(); } - if (channelSettingsKeys.contains(QString("scopeConfig.tracesData[%1].ampIndex").arg(i))) { - scopeSettings.m_tracesData.back().m_ampIndex = traceData->getAmpIndex(); - } if (channelSettingsKeys.contains(QString("scopeConfig.tracesData[%1].hasTextOverlay").arg(i))) { scopeSettings.m_tracesData.back().m_hasTextOverlay = traceData->getHasTextOverlay() != 0; } diff --git a/plugins/channelrx/chanalyzer/chanalyzerwebapiadapter.cpp b/plugins/channelrx/chanalyzer/chanalyzerwebapiadapter.cpp index 0a98e6986..9b9b2e2b4 100644 --- a/plugins/channelrx/chanalyzer/chanalyzerwebapiadapter.cpp +++ b/plugins/channelrx/chanalyzer/chanalyzerwebapiadapter.cpp @@ -87,7 +87,6 @@ void ChannelAnalyzerWebAPIAdapter::webapiFormatChannelSettings( swgScope->getTracesData()->append(new SWGSDRangel::SWGTraceData); swgScope->getTracesData()->back()->setStreamIndex(traceIt->m_streamIndex); swgScope->getTracesData()->back()->setAmp(traceIt->m_amp); - swgScope->getTracesData()->back()->setAmpIndex(traceIt->m_ampIndex); swgScope->getTracesData()->back()->setHasTextOverlay(traceIt->m_hasTextOverlay ? 1 : 0); swgScope->getTracesData()->back()->setStreamIndex(traceIt->m_streamIndex); swgScope->getTracesData()->back()->setOfs(traceIt->m_ofs); @@ -272,9 +271,6 @@ void ChannelAnalyzerWebAPIAdapter::webapiUpdateChannelSettings( if (channelSettingsKeys.contains(QString("scopeConfig.tracesData[%1].amp").arg(i))) { scopeSettings.m_tracesData.back().m_amp = traceData->getAmp(); } - if (channelSettingsKeys.contains(QString("scopeConfig.tracesData[%1].ampIndex").arg(i))) { - scopeSettings.m_tracesData.back().m_ampIndex = traceData->getAmpIndex(); - } if (channelSettingsKeys.contains(QString("scopeConfig.tracesData[%1].hasTextOverlay").arg(i))) { scopeSettings.m_tracesData.back().m_hasTextOverlay = traceData->getHasTextOverlay() != 0; } diff --git a/plugins/channelrx/demodais/aisdemodgui.cpp b/plugins/channelrx/demodais/aisdemodgui.cpp index 8b439eb8c..4676f4281 100644 --- a/plugins/channelrx/demodais/aisdemodgui.cpp +++ b/plugins/channelrx/demodais/aisdemodgui.cpp @@ -425,12 +425,10 @@ AISDemodGUI::AISDemodGUI(PluginAPI* pluginAPI, DeviceUISet *deviceUISet, Baseban GLScopeSettings::TraceData traceDataI, traceDataQ; traceDataI.m_projectionType = Projector::ProjectionReal; traceDataI.m_amp = 1.0; // for -1 to +1 - traceDataI.m_ampIndex = 0; traceDataI.m_ofs = 0.0; // vertical offset traceDataI.m_ofsCoarse = 0; traceDataQ.m_projectionType = Projector::ProjectionImag; traceDataQ.m_amp = 1.0; - traceDataQ.m_ampIndex = 0; traceDataQ.m_ofs = 0.0; traceDataQ.m_ofsCoarse = 0; ui->scopeGUI->changeTrace(0, traceDataI); diff --git a/plugins/channelrx/demodatv/atvdemodgui.cpp b/plugins/channelrx/demodatv/atvdemodgui.cpp index 497a167ba..4c36be6a2 100644 --- a/plugins/channelrx/demodatv/atvdemodgui.cpp +++ b/plugins/channelrx/demodatv/atvdemodgui.cpp @@ -254,7 +254,6 @@ ATVDemodGUI::ATVDemodGUI(PluginAPI* objPluginAPI, DeviceUISet *deviceUISet, Base ui->scopeGUI->setPreTrigger(1); GLScopeSettings::TraceData traceData; traceData.m_amp = 2.0; // amplification factor - traceData.m_ampIndex = 1; // this is second step traceData.m_ofs = 0.5; // direct offset traceData.m_ofsCoarse = 50; // this is 50 coarse steps ui->scopeGUI->changeTrace(0, traceData); diff --git a/plugins/channeltx/mod802.15.4/ieee_802_15_4_modgui.cpp b/plugins/channeltx/mod802.15.4/ieee_802_15_4_modgui.cpp index 8499ef2e8..12f26c36f 100644 --- a/plugins/channeltx/mod802.15.4/ieee_802_15_4_modgui.cpp +++ b/plugins/channeltx/mod802.15.4/ieee_802_15_4_modgui.cpp @@ -370,12 +370,10 @@ IEEE_802_15_4_ModGUI::IEEE_802_15_4_ModGUI(PluginAPI* pluginAPI, DeviceUISet *de GLScopeSettings::TraceData traceDataI, traceDataQ; traceDataI.m_projectionType = Projector::ProjectionReal; traceDataI.m_amp = 1.0; // for -1 to +1 - traceDataI.m_ampIndex = 0; traceDataI.m_ofs = 0.0; // vertical offset traceDataI.m_ofsCoarse = 0; traceDataQ.m_projectionType = Projector::ProjectionImag; traceDataQ.m_amp = 1.0; - traceDataQ.m_ampIndex = 0; traceDataQ.m_ofs = 0.0; traceDataQ.m_ofsCoarse = 0; ui->scopeGUI->changeTrace(0, traceDataI); diff --git a/plugins/channeltx/modais/aismodgui.cpp b/plugins/channeltx/modais/aismodgui.cpp index f7f701d03..bcb4bab30 100644 --- a/plugins/channeltx/modais/aismodgui.cpp +++ b/plugins/channeltx/modais/aismodgui.cpp @@ -500,12 +500,10 @@ AISModGUI::AISModGUI(PluginAPI* pluginAPI, DeviceUISet *deviceUISet, BasebandSam GLScopeSettings::TraceData traceDataI, traceDataQ; traceDataI.m_projectionType = Projector::ProjectionReal; traceDataI.m_amp = 1.0; // for -1 to +1 - traceDataI.m_ampIndex = 0; traceDataI.m_ofs = 0.0; // vertical offset traceDataI.m_ofsCoarse = 0; traceDataQ.m_projectionType = Projector::ProjectionImag; traceDataQ.m_amp = 1.0; - traceDataQ.m_ampIndex = 0; traceDataQ.m_ofs = 0.0; traceDataQ.m_ofsCoarse = 0; ui->scopeGUI->changeTrace(0, traceDataI); diff --git a/sdrbase/dsp/glscopesettings.cpp b/sdrbase/dsp/glscopesettings.cpp index dbcb0e4cd..037e3fca5 100644 --- a/sdrbase/dsp/glscopesettings.cpp +++ b/sdrbase/dsp/glscopesettings.cpp @@ -92,7 +92,7 @@ QByteArray GLScopeSettings::serialize() const } s.writeS32(20 + 16*i, (int) traceDataIt->m_projectionType); - s.writeU32(21 + 16*i, traceDataIt->m_ampIndex); + s.writeFloat(21 + 16*i, traceDataIt->m_amp); s.writeS32(22 + 16*i, traceDataIt->m_ofsCoarse); s.writeS32(23 + 16*i, traceDataIt->m_ofsFine); s.writeS32(24 + 16*i, traceDataIt->m_traceDelayCoarse); @@ -168,9 +168,7 @@ bool GLScopeSettings::deserialize(const QByteArray& data) d.readS32(20 + 16*iTrace, &intValue, 0); m_tracesData.back().m_projectionType = (Projector::ProjectionType) intValue; - d.readU32(21 + 16*iTrace, &uintValue, 0); - m_tracesData.back().m_ampIndex = uintValue; - m_tracesData.back().m_amp = 0.2 / AMPS[m_tracesData.back().m_ampIndex < 27 ? m_tracesData.back().m_ampIndex : 26]; + d.readFloat(21 + 16*iTrace, &m_tracesData.back().m_amp, 1.0f); d.readS32(22 + 16*iTrace, &intValue, 0); m_tracesData.back().m_ofsCoarse = intValue; d.readS32(23 + 16*iTrace, &intValue, 0); diff --git a/sdrbase/dsp/glscopesettings.h b/sdrbase/dsp/glscopesettings.h index a11c306cd..6f8b7112b 100644 --- a/sdrbase/dsp/glscopesettings.h +++ b/sdrbase/dsp/glscopesettings.h @@ -45,7 +45,6 @@ public: uint32_t m_streamIndex; //!< I/Q stream index Projector::ProjectionType m_projectionType; //!< Complex to real projection type float m_amp; //!< Amplification factor - uint32_t m_ampIndex; //!< Index in list of amplification factors float m_ofs; //!< Offset factor int m_ofsCoarse; //!< Coarse offset slider value int m_ofsFine; //!< Fine offset slider value @@ -81,7 +80,6 @@ public: m_streamIndex = 0; m_projectionType = Projector::ProjectionReal; m_amp = 1.0f; - m_ampIndex = 0; m_ofs = 0.0f; m_ofsCoarse = 0; m_ofsFine = 0; diff --git a/sdrbase/resources/webapi/doc/html2/index.html b/sdrbase/resources/webapi/doc/html2/index.html index 9738a4bd4..ea274bac6 100644 --- a/sdrbase/resources/webapi/doc/html2/index.html +++ b/sdrbase/resources/webapi/doc/html2/index.html @@ -3072,6 +3072,9 @@ margin-bottom: 20px; "SSBDemodReport" : { "$ref" : "#/definitions/SSBDemodReport" }, + "RadioClockReport" : { + "$ref" : "#/definitions/RadioClockReport" + }, "RemoteSourceReport" : { "$ref" : "#/definitions/RemoteSourceReport" }, @@ -3218,6 +3221,9 @@ margin-bottom: 20px; "PacketModSettings" : { "$ref" : "#/definitions/PacketModSettings" }, + "RadioClockSettings" : { + "$ref" : "#/definitions/RadioClockSettings" + }, "RemoteSinkSettings" : { "$ref" : "#/definitions/RemoteSinkSettings" }, @@ -8783,6 +8789,78 @@ margin-bottom: 20px; "format" : "float" } } +}; + defs.RadioClockReport = { + "properties" : { + "channelPowerDB" : { + "type" : "number", + "format" : "float", + "description" : "power received in channel (dB)" + }, + "channelSampleRate" : { + "type" : "integer" + }, + "date" : { + "type" : "string" + }, + "time" : { + "type" : "string" + } + }, + "description" : "RadioClock" +}; + defs.RadioClockSettings = { + "properties" : { + "inputFrequencyOffset" : { + "type" : "integer", + "format" : "int64", + "description" : "channel center frequency shift from baseband center in Hz" + }, + "rfBandwidth" : { + "type" : "number", + "format" : "float", + "description" : "channel RF bandwidth in Hz" + }, + "threshold" : { + "type" : "number", + "format" : "float" + }, + "modulation" : { + "type" : "integer", + "description" : "0 - MSF, 1 - DCF77, 2 - TDF" + }, + "timezone" : { + "type" : "integer", + "description" : "0 - Broadcast, 1 - Local, 2 - UTC" + }, + "rgbColor" : { + "type" : "integer" + }, + "title" : { + "type" : "string" + }, + "streamIndex" : { + "type" : "integer", + "description" : "MIMO channel. Not relevant when connected to SI (single Rx)." + }, + "useReverseAPI" : { + "type" : "integer", + "description" : "Synchronize with reverse API (1 for yes, 0 for no)" + }, + "reverseAPIAddress" : { + "type" : "string" + }, + "reverseAPIPort" : { + "type" : "integer" + }, + "reverseAPIDeviceIndex" : { + "type" : "integer" + }, + "reverseAPIChannelIndex" : { + "type" : "integer" + } + }, + "description" : "RadioClock" }; defs.Range = { "properties" : { @@ -10808,10 +10886,6 @@ margin-bottom: 20px; "format" : "float", "description" : "Amplification factor" }, - "ampIndex" : { - "type" : "integer", - "description" : "Index in list of amplification factors" - }, "ofs" : { "type" : "number", "format" : "float", @@ -46776,7 +46850,7 @@ except ApiException as e:
- Generated 2021-06-14T15:03:45.792+02:00 + Generated 2021-06-26T10:56:36.867+02:00
diff --git a/sdrbase/resources/webapi/doc/swagger/include/ChannelReport.yaml b/sdrbase/resources/webapi/doc/swagger/include/ChannelReport.yaml index 7315de929..e88297ad3 100644 --- a/sdrbase/resources/webapi/doc/swagger/include/ChannelReport.yaml +++ b/sdrbase/resources/webapi/doc/swagger/include/ChannelReport.yaml @@ -53,6 +53,8 @@ ChannelReport: $ref: "/doc/swagger/include/NoiseFigure.yaml#/NoiseFigureReport" SSBDemodReport: $ref: "/doc/swagger/include/SSBDemod.yaml#/SSBDemodReport" + RadioClockReport: + $ref: "/doc/swagger/include/RadioClock.yaml#/RadioClockReport" RemoteSourceReport: $ref: "/doc/swagger/include/RemoteSource.yaml#/RemoteSourceReport" PacketModReport: diff --git a/sdrbase/resources/webapi/doc/swagger/include/ChannelSettings.yaml b/sdrbase/resources/webapi/doc/swagger/include/ChannelSettings.yaml index 1001e69c6..0596bb494 100644 --- a/sdrbase/resources/webapi/doc/swagger/include/ChannelSettings.yaml +++ b/sdrbase/resources/webapi/doc/swagger/include/ChannelSettings.yaml @@ -79,6 +79,8 @@ ChannelSettings: $ref: "/doc/swagger/include/PacketDemod.yaml#/PacketDemodSettings" PacketModSettings: $ref: "/doc/swagger/include/PacketMod.yaml#/PacketModSettings" + RadioClockSettings: + $ref: "/doc/swagger/include/RadioClock.yaml#/RadioClockSettings" RemoteSinkSettings: $ref: "/doc/swagger/include/RemoteSink.yaml#/RemoteSinkSettings" RemoteSourceSettings: diff --git a/sdrbase/resources/webapi/doc/swagger/include/GLScope.yaml b/sdrbase/resources/webapi/doc/swagger/include/GLScope.yaml index 953a8a071..082d3fc45 100644 --- a/sdrbase/resources/webapi/doc/swagger/include/GLScope.yaml +++ b/sdrbase/resources/webapi/doc/swagger/include/GLScope.yaml @@ -14,9 +14,6 @@ TraceData: description: Amplification factor type: number format: float - ampIndex: - description: Index in list of amplification factors - type: integer ofs: description: Offset factor type: number diff --git a/sdrbase/util/db.cpp b/sdrbase/util/db.cpp index 6b18d89ae..6cb091777 100644 --- a/sdrbase/util/db.cpp +++ b/sdrbase/util/db.cpp @@ -35,3 +35,9 @@ double CalcDb::powerFromdB(double powerdB) { return pow(10.0, powerdB / 10.0); } + +double CalcDb::frexp10(double arg, int *exp) +{ + *exp = (arg == 0) ? 0 : 1 + (int)std::floor(std::log10(std::fabs(arg) ) ); + return arg * std::pow(10 , -(*exp)); +} diff --git a/sdrbase/util/db.h b/sdrbase/util/db.h index 633c80072..1cdec8244 100644 --- a/sdrbase/util/db.h +++ b/sdrbase/util/db.h @@ -26,6 +26,7 @@ class SDRBASE_API CalcDb public: static double dbPower(double magsq, double floor = 1e-12); static double powerFromdB(double powerdB); + static double frexp10(double arg, int *exp); }; #endif /* INCLUDE_UTIL_DB_H_ */ diff --git a/sdrgui/gui/glscope.cpp b/sdrgui/gui/glscope.cpp index 0d078e0be..8d6daefc2 100644 --- a/sdrgui/gui/glscope.cpp +++ b/sdrgui/gui/glscope.cpp @@ -1876,33 +1876,49 @@ void GLScope::setYScale(ScaleEngine &scale, uint32_t highlightedTraceIndex) break; case Projector::ProjectionMagLin: case Projector::ProjectionMagSq: - if (amp_range < 1e-6) { + if (amp_range < 1e-9) { + scale.setRange(Unit::None, amp_ofs * 1e12, amp_range * 1e12 + amp_ofs * 1e12); + } else if (amp_range < 1e-6) { scale.setRange(Unit::None, amp_ofs * 1e9, amp_range * 1e9 + amp_ofs * 1e9); } else if (amp_range < 1e-3) { scale.setRange(Unit::None, amp_ofs * 1e6, amp_range * 1e6 + amp_ofs * 1e6); } else if (amp_range < 1.0) { scale.setRange(Unit::None, amp_ofs * 1e3, amp_range * 1e3 + amp_ofs * 1e3); + } else if (amp_range < 1e3) { + scale.setRange(Unit::None, amp_ofs * 1e0, amp_range * 1e0 + amp_ofs * 1e0); + } else if (amp_range < 1e6) { + scale.setRange(Unit::None, amp_ofs * 1e3, amp_range * 1e3 + amp_ofs * 1e3); + } else if (amp_range < 1e9) { + scale.setRange(Unit::None, amp_ofs * 1e6, amp_range * 1e6 + amp_ofs * 1e6); } else { - scale.setRange(Unit::None, amp_ofs, amp_range + amp_ofs); + scale.setRange(Unit::None, amp_ofs * 1e9, amp_range * 1e9 + amp_ofs * 1e9); } break; - case Projector::ProjectionPhase: // Phase or frequency + case Projector::ProjectionPhase: // Phase or frequency (should be +/- 1) case Projector::ProjectionDOAP: case Projector::ProjectionDOAN: case Projector::ProjectionDPhase: - scale.setRange(Unit::None, -1.0 / traceData.m_amp + amp_ofs, 1.0 / traceData.m_amp + amp_ofs); - break; + // scale.setRange(Unit::None, -1.0 / traceData.m_amp + amp_ofs, 1.0 / traceData.m_amp + amp_ofs); + // break; case Projector::ProjectionReal: // Linear generic case Projector::ProjectionImag: default: - if (amp_range < 1e-6) { - scale.setRange(Unit::None, -amp_range * 5e8 + amp_ofs * 1e9, amp_range * 5e8 + amp_ofs * 1e9); + if (amp_range < 1e-9) { + scale.setRange(Unit::None, -amp_range * 5e11 + amp_ofs * 1e12, amp_range * 5e11 + amp_ofs * 1e12); + } else if (amp_range < 1e-6) { + scale.setRange(Unit::None, -amp_range * 5e8 + amp_ofs * 1e9, amp_range * 5e8 + amp_ofs * 1e9); } else if (amp_range < 1e-3) { - scale.setRange(Unit::None, -amp_range * 5e5 + amp_ofs * 1e6, amp_range * 5e5 + amp_ofs * 1e6); + scale.setRange(Unit::None, -amp_range * 5e5 + amp_ofs * 1e6, amp_range * 5e5 + amp_ofs * 1e6); } else if (amp_range < 1.0) { - scale.setRange(Unit::None, -amp_range * 5e2 + amp_ofs * 1e3, amp_range * 5e2 + amp_ofs * 1e3); + scale.setRange(Unit::None, -amp_range * 5e2 + amp_ofs * 1e3, amp_range * 5e2 + amp_ofs * 1e3); + } else if (amp_range < 1e3) { + scale.setRange(Unit::None, -amp_range * 5e-1 + amp_ofs * 1e0, amp_range * 5e-1 + amp_ofs * 1e0); + } else if (amp_range < 1e6) { + scale.setRange(Unit::None, -amp_range * 5e-4 + amp_ofs * 1e3, amp_range * 5e-4 + amp_ofs * 1e3); + } else if (amp_range < 1e9) { + scale.setRange(Unit::None, -amp_range * 5e-7 + amp_ofs * 1e6, amp_range * 5e-7 + amp_ofs * 1e6); } else { - scale.setRange(Unit::None, -amp_range * 0.5 + amp_ofs, amp_range * 0.5 + amp_ofs); + scale.setRange(Unit::None, -amp_range * 5e-10 + amp_ofs * 1e9, amp_range * 5e-10 + amp_ofs * 1e9); } break; } diff --git a/sdrgui/gui/glscopegui.cpp b/sdrgui/gui/glscopegui.cpp index 970735a16..f9cdcb5d3 100644 --- a/sdrgui/gui/glscopegui.cpp +++ b/sdrgui/gui/glscopegui.cpp @@ -24,18 +24,7 @@ #include "glscope.h" #include "ui_glscopegui.h" #include "util/simpleserializer.h" - -const double GLScopeGUI::amps[27] = { - 2e-1, 1e-1, 5e-2, - 2e-2, 1e-2, 5e-3, - 2e-3, 1e-3, 5e-4, - 2e-4, 1e-4, 5e-5, - 2e-5, 1e-5, 5e-6, - 2e-6, 1e-6, 5e-7, - 2e-7, 1e-7, 5e-8, - 2e-8, 1e-8, 5e-9, - 2e-9, 1e-9, 5e-10, -}; +#include "util/db.h" GLScopeGUI::GLScopeGUI(QWidget* parent) : QWidget(parent), @@ -198,7 +187,7 @@ QByteArray GLScopeGUI::serialize() const for (; traceDataIt != tracesData.end(); ++traceDataIt, i++) { s.writeS32(20 + 16*i, (int) traceDataIt->m_projectionType); - s.writeU32(21 + 16*i, traceDataIt->m_ampIndex); + s.writeFloat(21 + 16*i, traceDataIt->m_amp); s.writeS32(22 + 16*i, traceDataIt->m_ofsCoarse); s.writeS32(23 + 16*i, traceDataIt->m_ofsFine); s.writeS32(24 + 16*i, traceDataIt->m_traceDelayCoarse); @@ -287,25 +276,29 @@ bool GLScopeGUI::deserialize(const QByteArray& data) float r, g, b; d.readS32(20 + 16*iTrace, &intValue, 0); - ui->traceMode->setCurrentIndex(intValue); - d.readU32(21 + 16*iTrace, &uintValue, 0); - ui->amp->setValue(uintValue); + traceData.m_projectionType = (Projector::ProjectionType) intValue; + d.readFloat(21 + 16*iTrace, &traceData.m_amp, 1.0f); d.readS32(22 + 16*iTrace, &intValue, 0); - ui->ofsCoarse->setValue(intValue); + traceData.m_ofsCoarse = intValue; d.readS32(23 + 16*iTrace, &intValue, 0); - ui->ofsFine->setValue(intValue); + traceData.m_ofsFine = intValue; d.readS32(24 + 16*iTrace, &intValue, 0); - ui->traceDelayCoarse->setValue(intValue); + traceData.m_traceDelayCoarse = intValue; d.readS32(25 + 16*iTrace, &intValue, 0); - ui->traceDelayFine->setValue(intValue); + traceData.m_traceDelayFine = intValue; d.readFloat(26 + 16*iTrace, &r, 1.0f); d.readFloat(27 + 16*iTrace, &g, 1.0f); d.readFloat(28 + 16*iTrace, &b, 1.0f); - m_focusedTraceColor.setRgbF(r, g, b); + traceData.m_traceColorR = r; + traceData.m_traceColorG = g; + traceData.m_traceColorB = b; + traceData.m_traceColor.setRedF(r); + traceData.m_traceColor.setGreenF(g); + traceData.m_traceColor.setBlueF(b); d.readU32(29 + 16*iTrace, &uintValue, 0); - ui->traceStream->setCurrentIndex(uintValue); + traceData.m_streamIndex = uintValue; - fillTraceData(traceData); + setTraceUI(traceData); if (iTrace < tracesData.size()) // change existing traces { @@ -872,6 +865,20 @@ void GLScopeGUI::on_amp_valueChanged(int value) changeCurrentTrace(); } +void GLScopeGUI::on_ampCoarse_valueChanged(int value) +{ + (void) value; + setAmpScaleDisplay(); + changeCurrentTrace(); +} + +void GLScopeGUI::on_ampExp_valueChanged(int value) +{ + (void) value; + setAmpScaleDisplay(); + changeCurrentTrace(); +} + void GLScopeGUI::on_ofsCoarse_valueChanged(int value) { (void) value; @@ -1223,31 +1230,38 @@ void GLScopeGUI::setTimeOfsDisplay() void GLScopeGUI::setAmpScaleDisplay() { Projector::ProjectionType projectionType = (Projector::ProjectionType) ui->traceMode->currentIndex(); - double ampValue = amps[ui->amp->value()]; + double amp = (ui->amp->value() / 1000.0) + ui->ampCoarse->value(); + int ampExp = ui->ampExp->value(); + double ampValue = amp * pow(10.0, ampExp); + ui->ampText->setText(tr("%1").arg(amp, 0, 'f', 3)); if (projectionType == Projector::ProjectionMagDB) { - double displayValue = ampValue*500.0f; - - if (displayValue < 10.0f) { - ui->ampText->setText(tr("%1\ndB").arg(displayValue, 0, 'f', 2)); - } - else { - ui->ampText->setText(tr("%1\ndB").arg(displayValue, 0, 'f', 1)); - } + ui->ampExpText->setText(tr("e%1%2").arg(ampExp+2 < 0 ? "" : "+").arg(ampExp+2)); + ui->ampMultiplierText->setText("-"); } else { - double a = ampValue*10.0f; + ui->ampExpText->setText(tr("e%1%2").arg(ampExp < 0 ? "" : "+").arg(ampExp)); + double ampValue2 = 2.0 * ampValue; - if(a < 0.000001) - ui->ampText->setText(tr("%1\nn").arg(a * 1000000000.0)); - else if(a < 0.001) - ui->ampText->setText(tr("%1\nµ").arg(a * 1000000.0)); - else if(a < 1.0) - ui->ampText->setText(tr("%1\nm").arg(a * 1000.0)); - else - ui->ampText->setText(tr("%1").arg(a * 1.0)); + if (ampValue2 < 1e-9) { + ui->ampMultiplierText->setText("p"); + } else if (ampValue2 < 1e-6) { + ui->ampMultiplierText->setText("n"); + } else if (ampValue2 < 1e-3) { + ui->ampMultiplierText->setText("µ"); + } else if (ampValue2 < 1e0) { + ui->ampMultiplierText->setText("m"); + } else if (ampValue2 <= 1e3) { + ui->ampMultiplierText->setText("-"); + } else if (ampValue2 <= 1e6) { + ui->ampMultiplierText->setText("k"); + } else if (ampValue2 <= 1e9) { + ui->ampMultiplierText->setText("M"); + } else { + ui->ampMultiplierText->setText("G"); + } } } @@ -1477,10 +1491,11 @@ void GLScopeGUI::fillTraceData(GLScopeSettings::TraceData& traceData) { traceData.m_streamIndex = ui->traceStream->currentIndex(); traceData.m_projectionType = (Projector::ProjectionType) ui->traceMode->currentIndex(); - traceData.m_hasTextOverlay = (traceData.m_projectionType == Projector::ProjectionMagDB) || (traceData.m_projectionType == Projector::ProjectionMagSq); + traceData.m_hasTextOverlay = (traceData.m_projectionType == Projector::ProjectionMagDB) + || (traceData.m_projectionType == Projector::ProjectionMagSq); traceData.m_textOverlay.clear(); - traceData.m_amp = 0.2 / amps[ui->amp->value()]; - traceData.m_ampIndex = ui->amp->value(); + double ampValue = ((ui->amp->value() / 1000.0) + ui->ampCoarse->value()) * pow(10.0, ui->ampExp->value()); + traceData.m_amp = 1.0 / ampValue; traceData.m_ofsCoarse = ui->ofsCoarse->value(); traceData.m_ofsFine = ui->ofsFine->value(); @@ -1522,7 +1537,15 @@ void GLScopeGUI::setTraceUI(const GLScopeSettings::TraceData& traceData) ui->traceStream->setCurrentIndex(traceData.m_streamIndex); ui->traceMode->setCurrentIndex((int) traceData.m_projectionType); - ui->amp->setValue(traceData.m_ampIndex); + double ampValue = 1.0 / traceData.m_amp; + int ampExp; + double ampMant = CalcDb::frexp10(ampValue, &Exp) * 10.0; + int ampCoarse = (int) ampMant; + int ampFine = round((ampMant - ampCoarse) * 1000.0); + ampExp -= 1; + ui->amp->setValue(ampFine); + ui->ampCoarse->setValue(ampCoarse); + ui->ampExp->setValue(ampExp); setAmpScaleDisplay(); ui->ofsCoarse->setValue(traceData.m_ofsCoarse); diff --git a/sdrgui/gui/glscopegui.h b/sdrgui/gui/glscopegui.h index 8bb420fdf..1eb5430af 100644 --- a/sdrgui/gui/glscopegui.h +++ b/sdrgui/gui/glscopegui.h @@ -155,8 +155,6 @@ private: int m_ctlTraceIndex; //!< controlled trace index int m_ctlTriggerIndex; //!< controlled trigger index - static const double amps[27]; - void applySettings(const GLScopeSettings& settings, bool force = false); void displaySettings(); // First row @@ -222,6 +220,8 @@ private slots: void on_traceStream_currentIndexChanged(int index); void on_traceMode_currentIndexChanged(int index); void on_amp_valueChanged(int value); + void on_ampCoarse_valueChanged(int value); + void on_ampExp_valueChanged(int value); void on_ofsCoarse_valueChanged(int value); void on_ofsFine_valueChanged(int value); void on_traceDelayCoarse_valueChanged(int value); diff --git a/sdrgui/gui/glscopegui.ui b/sdrgui/gui/glscopegui.ui index 0b605ca5d..9c015b338 100644 --- a/sdrgui/gui/glscopegui.ui +++ b/sdrgui/gui/glscopegui.ui @@ -7,7 +7,7 @@ 0 0 758 - 138 + 180 @@ -642,6 +642,7 @@ kS/s + Liberation Sans 10 @@ -700,6 +701,7 @@ kS/s + Liberation Sans 10 @@ -833,39 +835,166 @@ kS/s - - - - 36 - 0 - + + + 6 - - Vertical range value + + 6 - - 000 - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - - - - - Vertical range - - - 26 - - - 1 - - - Qt::Horizontal - - + + + + 6 + + + 6 + + + 6 + + + 6 + + + + + + 36 + 0 + + + + Vertical range value + + + 1.000 + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + + + + + Vertical range (fine) + + + 0 + + + 999 + + + 1 + + + 0 + + + Qt::Horizontal + + + + + + + + 24 + 24 + + + + Vertical range (coarse) + + + 1 + + + 9 + + + 1 + + + + + + + + + 6 + + + 6 + + + 6 + + + 6 + + + + + + 36 + 0 + + + + Vertical range value + + + e+0 + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + + + + + Vertical range exponent + + + -10 + + + 10 + + + 1 + + + Qt::Horizontal + + + + + + + + 20 + 0 + + + + Vertical range value + + + - + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + + + + @@ -1315,6 +1444,7 @@ kS/s + Liberation Sans 10 @@ -1373,6 +1503,7 @@ kS/s + Liberation Sans 10 diff --git a/swagger/sdrangel/api/swagger/include/GLScope.yaml b/swagger/sdrangel/api/swagger/include/GLScope.yaml index 1e677c009..c870a0a19 100644 --- a/swagger/sdrangel/api/swagger/include/GLScope.yaml +++ b/swagger/sdrangel/api/swagger/include/GLScope.yaml @@ -14,9 +14,6 @@ TraceData: description: Amplification factor type: number format: float - ampIndex: - description: Index in list of amplification factors - type: integer ofs: description: Offset factor type: number diff --git a/swagger/sdrangel/code/html2/index.html b/swagger/sdrangel/code/html2/index.html index 9738a4bd4..ea274bac6 100644 --- a/swagger/sdrangel/code/html2/index.html +++ b/swagger/sdrangel/code/html2/index.html @@ -3072,6 +3072,9 @@ margin-bottom: 20px; "SSBDemodReport" : { "$ref" : "#/definitions/SSBDemodReport" }, + "RadioClockReport" : { + "$ref" : "#/definitions/RadioClockReport" + }, "RemoteSourceReport" : { "$ref" : "#/definitions/RemoteSourceReport" }, @@ -3218,6 +3221,9 @@ margin-bottom: 20px; "PacketModSettings" : { "$ref" : "#/definitions/PacketModSettings" }, + "RadioClockSettings" : { + "$ref" : "#/definitions/RadioClockSettings" + }, "RemoteSinkSettings" : { "$ref" : "#/definitions/RemoteSinkSettings" }, @@ -8783,6 +8789,78 @@ margin-bottom: 20px; "format" : "float" } } +}; + defs.RadioClockReport = { + "properties" : { + "channelPowerDB" : { + "type" : "number", + "format" : "float", + "description" : "power received in channel (dB)" + }, + "channelSampleRate" : { + "type" : "integer" + }, + "date" : { + "type" : "string" + }, + "time" : { + "type" : "string" + } + }, + "description" : "RadioClock" +}; + defs.RadioClockSettings = { + "properties" : { + "inputFrequencyOffset" : { + "type" : "integer", + "format" : "int64", + "description" : "channel center frequency shift from baseband center in Hz" + }, + "rfBandwidth" : { + "type" : "number", + "format" : "float", + "description" : "channel RF bandwidth in Hz" + }, + "threshold" : { + "type" : "number", + "format" : "float" + }, + "modulation" : { + "type" : "integer", + "description" : "0 - MSF, 1 - DCF77, 2 - TDF" + }, + "timezone" : { + "type" : "integer", + "description" : "0 - Broadcast, 1 - Local, 2 - UTC" + }, + "rgbColor" : { + "type" : "integer" + }, + "title" : { + "type" : "string" + }, + "streamIndex" : { + "type" : "integer", + "description" : "MIMO channel. Not relevant when connected to SI (single Rx)." + }, + "useReverseAPI" : { + "type" : "integer", + "description" : "Synchronize with reverse API (1 for yes, 0 for no)" + }, + "reverseAPIAddress" : { + "type" : "string" + }, + "reverseAPIPort" : { + "type" : "integer" + }, + "reverseAPIDeviceIndex" : { + "type" : "integer" + }, + "reverseAPIChannelIndex" : { + "type" : "integer" + } + }, + "description" : "RadioClock" }; defs.Range = { "properties" : { @@ -10808,10 +10886,6 @@ margin-bottom: 20px; "format" : "float", "description" : "Amplification factor" }, - "ampIndex" : { - "type" : "integer", - "description" : "Index in list of amplification factors" - }, "ofs" : { "type" : "number", "format" : "float", @@ -46776,7 +46850,7 @@ except ApiException as e:
- Generated 2021-06-14T15:03:45.792+02:00 + Generated 2021-06-26T10:56:36.867+02:00
diff --git a/swagger/sdrangel/code/qt5/client/SWGModelFactory.h b/swagger/sdrangel/code/qt5/client/SWGModelFactory.h index fa36daafc..f6b18a1d3 100644 --- a/swagger/sdrangel/code/qt5/client/SWGModelFactory.h +++ b/swagger/sdrangel/code/qt5/client/SWGModelFactory.h @@ -279,784 +279,1304 @@ namespace SWGSDRangel { inline void* create(QString type) { if(QString("SWGADSBDemodReport").compare(type) == 0) { - return new SWGADSBDemodReport(); + SWGADSBDemodReport *obj = new SWGADSBDemodReport(); + obj->init(); + return obj; } if(QString("SWGADSBDemodSettings").compare(type) == 0) { - return new SWGADSBDemodSettings(); + SWGADSBDemodSettings *obj = new SWGADSBDemodSettings(); + obj->init(); + return obj; } if(QString("SWGAFCActions").compare(type) == 0) { - return new SWGAFCActions(); + SWGAFCActions *obj = new SWGAFCActions(); + obj->init(); + return obj; } if(QString("SWGAFCReport").compare(type) == 0) { - return new SWGAFCReport(); + SWGAFCReport *obj = new SWGAFCReport(); + obj->init(); + return obj; } if(QString("SWGAFCSettings").compare(type) == 0) { - return new SWGAFCSettings(); + SWGAFCSettings *obj = new SWGAFCSettings(); + obj->init(); + return obj; } if(QString("SWGAISDemodReport").compare(type) == 0) { - return new SWGAISDemodReport(); + SWGAISDemodReport *obj = new SWGAISDemodReport(); + obj->init(); + return obj; } if(QString("SWGAISDemodSettings").compare(type) == 0) { - return new SWGAISDemodSettings(); + SWGAISDemodSettings *obj = new SWGAISDemodSettings(); + obj->init(); + return obj; } if(QString("SWGAISModActions").compare(type) == 0) { - return new SWGAISModActions(); + SWGAISModActions *obj = new SWGAISModActions(); + obj->init(); + return obj; } if(QString("SWGAISModActions_tx").compare(type) == 0) { - return new SWGAISModActions_tx(); + SWGAISModActions_tx *obj = new SWGAISModActions_tx(); + obj->init(); + return obj; } if(QString("SWGAISModReport").compare(type) == 0) { - return new SWGAISModReport(); + SWGAISModReport *obj = new SWGAISModReport(); + obj->init(); + return obj; } if(QString("SWGAISModSettings").compare(type) == 0) { - return new SWGAISModSettings(); + SWGAISModSettings *obj = new SWGAISModSettings(); + obj->init(); + return obj; } if(QString("SWGAISSettings").compare(type) == 0) { - return new SWGAISSettings(); + SWGAISSettings *obj = new SWGAISSettings(); + obj->init(); + return obj; } if(QString("SWGAMBEDevice").compare(type) == 0) { - return new SWGAMBEDevice(); + SWGAMBEDevice *obj = new SWGAMBEDevice(); + obj->init(); + return obj; } if(QString("SWGAMBEDevices").compare(type) == 0) { - return new SWGAMBEDevices(); + SWGAMBEDevices *obj = new SWGAMBEDevices(); + obj->init(); + return obj; } if(QString("SWGAMDemodReport").compare(type) == 0) { - return new SWGAMDemodReport(); + SWGAMDemodReport *obj = new SWGAMDemodReport(); + obj->init(); + return obj; } if(QString("SWGAMDemodSettings").compare(type) == 0) { - return new SWGAMDemodSettings(); + SWGAMDemodSettings *obj = new SWGAMDemodSettings(); + obj->init(); + return obj; } if(QString("SWGAMModReport").compare(type) == 0) { - return new SWGAMModReport(); + SWGAMModReport *obj = new SWGAMModReport(); + obj->init(); + return obj; } if(QString("SWGAMModSettings").compare(type) == 0) { - return new SWGAMModSettings(); + SWGAMModSettings *obj = new SWGAMModSettings(); + obj->init(); + return obj; } if(QString("SWGAPRSSettings").compare(type) == 0) { - return new SWGAPRSSettings(); + SWGAPRSSettings *obj = new SWGAPRSSettings(); + obj->init(); + return obj; } if(QString("SWGAPTDemodActions").compare(type) == 0) { - return new SWGAPTDemodActions(); + SWGAPTDemodActions *obj = new SWGAPTDemodActions(); + obj->init(); + return obj; } if(QString("SWGAPTDemodActions_aos").compare(type) == 0) { - return new SWGAPTDemodActions_aos(); + SWGAPTDemodActions_aos *obj = new SWGAPTDemodActions_aos(); + obj->init(); + return obj; } if(QString("SWGAPTDemodActions_los").compare(type) == 0) { - return new SWGAPTDemodActions_los(); + SWGAPTDemodActions_los *obj = new SWGAPTDemodActions_los(); + obj->init(); + return obj; } if(QString("SWGAPTDemodSettings").compare(type) == 0) { - return new SWGAPTDemodSettings(); + SWGAPTDemodSettings *obj = new SWGAPTDemodSettings(); + obj->init(); + return obj; } if(QString("SWGATVDemodSettings").compare(type) == 0) { - return new SWGATVDemodSettings(); + SWGATVDemodSettings *obj = new SWGATVDemodSettings(); + obj->init(); + return obj; } if(QString("SWGATVModReport").compare(type) == 0) { - return new SWGATVModReport(); + SWGATVModReport *obj = new SWGATVModReport(); + obj->init(); + return obj; } if(QString("SWGATVModSettings").compare(type) == 0) { - return new SWGATVModSettings(); + SWGATVModSettings *obj = new SWGATVModSettings(); + obj->init(); + return obj; } if(QString("SWGAirspyHFReport").compare(type) == 0) { - return new SWGAirspyHFReport(); + SWGAirspyHFReport *obj = new SWGAirspyHFReport(); + obj->init(); + return obj; } if(QString("SWGAirspyHFSettings").compare(type) == 0) { - return new SWGAirspyHFSettings(); + SWGAirspyHFSettings *obj = new SWGAirspyHFSettings(); + obj->init(); + return obj; } if(QString("SWGAirspyReport").compare(type) == 0) { - return new SWGAirspyReport(); + SWGAirspyReport *obj = new SWGAirspyReport(); + obj->init(); + return obj; } if(QString("SWGAirspySettings").compare(type) == 0) { - return new SWGAirspySettings(); + SWGAirspySettings *obj = new SWGAirspySettings(); + obj->init(); + return obj; } if(QString("SWGAntennaToolsSettings").compare(type) == 0) { - return new SWGAntennaToolsSettings(); + SWGAntennaToolsSettings *obj = new SWGAntennaToolsSettings(); + obj->init(); + return obj; } if(QString("SWGArgInfo").compare(type) == 0) { - return new SWGArgInfo(); + SWGArgInfo *obj = new SWGArgInfo(); + obj->init(); + return obj; } if(QString("SWGArgValue").compare(type) == 0) { - return new SWGArgValue(); + SWGArgValue *obj = new SWGArgValue(); + obj->init(); + return obj; } if(QString("SWGAudioDevices").compare(type) == 0) { - return new SWGAudioDevices(); + SWGAudioDevices *obj = new SWGAudioDevices(); + obj->init(); + return obj; } if(QString("SWGAudioInputDevice").compare(type) == 0) { - return new SWGAudioInputDevice(); + SWGAudioInputDevice *obj = new SWGAudioInputDevice(); + obj->init(); + return obj; } if(QString("SWGAudioInputSettings").compare(type) == 0) { - return new SWGAudioInputSettings(); + SWGAudioInputSettings *obj = new SWGAudioInputSettings(); + obj->init(); + return obj; } if(QString("SWGAudioOutputDevice").compare(type) == 0) { - return new SWGAudioOutputDevice(); + SWGAudioOutputDevice *obj = new SWGAudioOutputDevice(); + obj->init(); + return obj; } if(QString("SWGAudioOutputSettings").compare(type) == 0) { - return new SWGAudioOutputSettings(); + SWGAudioOutputSettings *obj = new SWGAudioOutputSettings(); + obj->init(); + return obj; } if(QString("SWGBFMDemodReport").compare(type) == 0) { - return new SWGBFMDemodReport(); + SWGBFMDemodReport *obj = new SWGBFMDemodReport(); + obj->init(); + return obj; } if(QString("SWGBFMDemodSettings").compare(type) == 0) { - return new SWGBFMDemodSettings(); + SWGBFMDemodSettings *obj = new SWGBFMDemodSettings(); + obj->init(); + return obj; } if(QString("SWGBandwidth").compare(type) == 0) { - return new SWGBandwidth(); + SWGBandwidth *obj = new SWGBandwidth(); + obj->init(); + return obj; } if(QString("SWGBeamSteeringCWModSettings").compare(type) == 0) { - return new SWGBeamSteeringCWModSettings(); + SWGBeamSteeringCWModSettings *obj = new SWGBeamSteeringCWModSettings(); + obj->init(); + return obj; } if(QString("SWGBladeRF1InputSettings").compare(type) == 0) { - return new SWGBladeRF1InputSettings(); + SWGBladeRF1InputSettings *obj = new SWGBladeRF1InputSettings(); + obj->init(); + return obj; } if(QString("SWGBladeRF1OutputSettings").compare(type) == 0) { - return new SWGBladeRF1OutputSettings(); + SWGBladeRF1OutputSettings *obj = new SWGBladeRF1OutputSettings(); + obj->init(); + return obj; } if(QString("SWGBladeRF2InputReport").compare(type) == 0) { - return new SWGBladeRF2InputReport(); + SWGBladeRF2InputReport *obj = new SWGBladeRF2InputReport(); + obj->init(); + return obj; } if(QString("SWGBladeRF2InputSettings").compare(type) == 0) { - return new SWGBladeRF2InputSettings(); + SWGBladeRF2InputSettings *obj = new SWGBladeRF2InputSettings(); + obj->init(); + return obj; } if(QString("SWGBladeRF2MIMOReport").compare(type) == 0) { - return new SWGBladeRF2MIMOReport(); + SWGBladeRF2MIMOReport *obj = new SWGBladeRF2MIMOReport(); + obj->init(); + return obj; } if(QString("SWGBladeRF2MIMOSettings").compare(type) == 0) { - return new SWGBladeRF2MIMOSettings(); + SWGBladeRF2MIMOSettings *obj = new SWGBladeRF2MIMOSettings(); + obj->init(); + return obj; } if(QString("SWGBladeRF2OutputReport").compare(type) == 0) { - return new SWGBladeRF2OutputReport(); + SWGBladeRF2OutputReport *obj = new SWGBladeRF2OutputReport(); + obj->init(); + return obj; } if(QString("SWGBladeRF2OutputSettings").compare(type) == 0) { - return new SWGBladeRF2OutputSettings(); + SWGBladeRF2OutputSettings *obj = new SWGBladeRF2OutputSettings(); + obj->init(); + return obj; } if(QString("SWGCWKeyerSettings").compare(type) == 0) { - return new SWGCWKeyerSettings(); + SWGCWKeyerSettings *obj = new SWGCWKeyerSettings(); + obj->init(); + return obj; } if(QString("SWGCapture").compare(type) == 0) { - return new SWGCapture(); + SWGCapture *obj = new SWGCapture(); + obj->init(); + return obj; } if(QString("SWGChannel").compare(type) == 0) { - return new SWGChannel(); + SWGChannel *obj = new SWGChannel(); + obj->init(); + return obj; } if(QString("SWGChannelActions").compare(type) == 0) { - return new SWGChannelActions(); + SWGChannelActions *obj = new SWGChannelActions(); + obj->init(); + return obj; } if(QString("SWGChannelAnalyzerSettings").compare(type) == 0) { - return new SWGChannelAnalyzerSettings(); + SWGChannelAnalyzerSettings *obj = new SWGChannelAnalyzerSettings(); + obj->init(); + return obj; } if(QString("SWGChannelConfig").compare(type) == 0) { - return new SWGChannelConfig(); + SWGChannelConfig *obj = new SWGChannelConfig(); + obj->init(); + return obj; } if(QString("SWGChannelListItem").compare(type) == 0) { - return new SWGChannelListItem(); + SWGChannelListItem *obj = new SWGChannelListItem(); + obj->init(); + return obj; } if(QString("SWGChannelReport").compare(type) == 0) { - return new SWGChannelReport(); + SWGChannelReport *obj = new SWGChannelReport(); + obj->init(); + return obj; } if(QString("SWGChannelSettings").compare(type) == 0) { - return new SWGChannelSettings(); + SWGChannelSettings *obj = new SWGChannelSettings(); + obj->init(); + return obj; } if(QString("SWGChannelsDetail").compare(type) == 0) { - return new SWGChannelsDetail(); + SWGChannelsDetail *obj = new SWGChannelsDetail(); + obj->init(); + return obj; } if(QString("SWGChirpChatDemodReport").compare(type) == 0) { - return new SWGChirpChatDemodReport(); + SWGChirpChatDemodReport *obj = new SWGChirpChatDemodReport(); + obj->init(); + return obj; } if(QString("SWGChirpChatDemodSettings").compare(type) == 0) { - return new SWGChirpChatDemodSettings(); + SWGChirpChatDemodSettings *obj = new SWGChirpChatDemodSettings(); + obj->init(); + return obj; } if(QString("SWGChirpChatModReport").compare(type) == 0) { - return new SWGChirpChatModReport(); + SWGChirpChatModReport *obj = new SWGChirpChatModReport(); + obj->init(); + return obj; } if(QString("SWGChirpChatModSettings").compare(type) == 0) { - return new SWGChirpChatModSettings(); + SWGChirpChatModSettings *obj = new SWGChirpChatModSettings(); + obj->init(); + return obj; } if(QString("SWGCommand").compare(type) == 0) { - return new SWGCommand(); + SWGCommand *obj = new SWGCommand(); + obj->init(); + return obj; } if(QString("SWGComplex").compare(type) == 0) { - return new SWGComplex(); + SWGComplex *obj = new SWGComplex(); + obj->init(); + return obj; } if(QString("SWGDABDemodSettings").compare(type) == 0) { - return new SWGDABDemodSettings(); + SWGDABDemodSettings *obj = new SWGDABDemodSettings(); + obj->init(); + return obj; } if(QString("SWGDATVDemodSettings").compare(type) == 0) { - return new SWGDATVDemodSettings(); + SWGDATVDemodSettings *obj = new SWGDATVDemodSettings(); + obj->init(); + return obj; } if(QString("SWGDATVModReport").compare(type) == 0) { - return new SWGDATVModReport(); + SWGDATVModReport *obj = new SWGDATVModReport(); + obj->init(); + return obj; } if(QString("SWGDATVModSettings").compare(type) == 0) { - return new SWGDATVModSettings(); + SWGDATVModSettings *obj = new SWGDATVModSettings(); + obj->init(); + return obj; } if(QString("SWGDSDDemodReport").compare(type) == 0) { - return new SWGDSDDemodReport(); + SWGDSDDemodReport *obj = new SWGDSDDemodReport(); + obj->init(); + return obj; } if(QString("SWGDSDDemodSettings").compare(type) == 0) { - return new SWGDSDDemodSettings(); + SWGDSDDemodSettings *obj = new SWGDSDDemodSettings(); + obj->init(); + return obj; } if(QString("SWGDVSerialDevice").compare(type) == 0) { - return new SWGDVSerialDevice(); + SWGDVSerialDevice *obj = new SWGDVSerialDevice(); + obj->init(); + return obj; } if(QString("SWGDVSerialDevices").compare(type) == 0) { - return new SWGDVSerialDevices(); + SWGDVSerialDevices *obj = new SWGDVSerialDevices(); + obj->init(); + return obj; } if(QString("SWGDemodAnalyzerSettings").compare(type) == 0) { - return new SWGDemodAnalyzerSettings(); + SWGDemodAnalyzerSettings *obj = new SWGDemodAnalyzerSettings(); + obj->init(); + return obj; } if(QString("SWGDeviceActions").compare(type) == 0) { - return new SWGDeviceActions(); + SWGDeviceActions *obj = new SWGDeviceActions(); + obj->init(); + return obj; } if(QString("SWGDeviceConfig").compare(type) == 0) { - return new SWGDeviceConfig(); + SWGDeviceConfig *obj = new SWGDeviceConfig(); + obj->init(); + return obj; } if(QString("SWGDeviceListItem").compare(type) == 0) { - return new SWGDeviceListItem(); + SWGDeviceListItem *obj = new SWGDeviceListItem(); + obj->init(); + return obj; } if(QString("SWGDeviceReport").compare(type) == 0) { - return new SWGDeviceReport(); + SWGDeviceReport *obj = new SWGDeviceReport(); + obj->init(); + return obj; } if(QString("SWGDeviceSet").compare(type) == 0) { - return new SWGDeviceSet(); + SWGDeviceSet *obj = new SWGDeviceSet(); + obj->init(); + return obj; } if(QString("SWGDeviceSetList").compare(type) == 0) { - return new SWGDeviceSetList(); + SWGDeviceSetList *obj = new SWGDeviceSetList(); + obj->init(); + return obj; } if(QString("SWGDeviceSettings").compare(type) == 0) { - return new SWGDeviceSettings(); + SWGDeviceSettings *obj = new SWGDeviceSettings(); + obj->init(); + return obj; } if(QString("SWGDeviceState").compare(type) == 0) { - return new SWGDeviceState(); + SWGDeviceState *obj = new SWGDeviceState(); + obj->init(); + return obj; } if(QString("SWGErrorResponse").compare(type) == 0) { - return new SWGErrorResponse(); + SWGErrorResponse *obj = new SWGErrorResponse(); + obj->init(); + return obj; } if(QString("SWGFCDProPlusSettings").compare(type) == 0) { - return new SWGFCDProPlusSettings(); + SWGFCDProPlusSettings *obj = new SWGFCDProPlusSettings(); + obj->init(); + return obj; } if(QString("SWGFCDProSettings").compare(type) == 0) { - return new SWGFCDProSettings(); + SWGFCDProSettings *obj = new SWGFCDProSettings(); + obj->init(); + return obj; } if(QString("SWGFeature").compare(type) == 0) { - return new SWGFeature(); + SWGFeature *obj = new SWGFeature(); + obj->init(); + return obj; } if(QString("SWGFeatureActions").compare(type) == 0) { - return new SWGFeatureActions(); + SWGFeatureActions *obj = new SWGFeatureActions(); + obj->init(); + return obj; } if(QString("SWGFeatureConfig").compare(type) == 0) { - return new SWGFeatureConfig(); + SWGFeatureConfig *obj = new SWGFeatureConfig(); + obj->init(); + return obj; } if(QString("SWGFeatureReport").compare(type) == 0) { - return new SWGFeatureReport(); + SWGFeatureReport *obj = new SWGFeatureReport(); + obj->init(); + return obj; } if(QString("SWGFeatureSet").compare(type) == 0) { - return new SWGFeatureSet(); + SWGFeatureSet *obj = new SWGFeatureSet(); + obj->init(); + return obj; } if(QString("SWGFeatureSetList").compare(type) == 0) { - return new SWGFeatureSetList(); + SWGFeatureSetList *obj = new SWGFeatureSetList(); + obj->init(); + return obj; } if(QString("SWGFeatureSetPreset").compare(type) == 0) { - return new SWGFeatureSetPreset(); + SWGFeatureSetPreset *obj = new SWGFeatureSetPreset(); + obj->init(); + return obj; } if(QString("SWGFeatureSettings").compare(type) == 0) { - return new SWGFeatureSettings(); + SWGFeatureSettings *obj = new SWGFeatureSettings(); + obj->init(); + return obj; } if(QString("SWGFileInputReport").compare(type) == 0) { - return new SWGFileInputReport(); + SWGFileInputReport *obj = new SWGFileInputReport(); + obj->init(); + return obj; } if(QString("SWGFileInputSettings").compare(type) == 0) { - return new SWGFileInputSettings(); + SWGFileInputSettings *obj = new SWGFileInputSettings(); + obj->init(); + return obj; } if(QString("SWGFileOutputSettings").compare(type) == 0) { - return new SWGFileOutputSettings(); + SWGFileOutputSettings *obj = new SWGFileOutputSettings(); + obj->init(); + return obj; } if(QString("SWGFileSinkActions").compare(type) == 0) { - return new SWGFileSinkActions(); + SWGFileSinkActions *obj = new SWGFileSinkActions(); + obj->init(); + return obj; } if(QString("SWGFileSinkReport").compare(type) == 0) { - return new SWGFileSinkReport(); + SWGFileSinkReport *obj = new SWGFileSinkReport(); + obj->init(); + return obj; } if(QString("SWGFileSinkSettings").compare(type) == 0) { - return new SWGFileSinkSettings(); + SWGFileSinkSettings *obj = new SWGFileSinkSettings(); + obj->init(); + return obj; } if(QString("SWGFileSourceActions").compare(type) == 0) { - return new SWGFileSourceActions(); + SWGFileSourceActions *obj = new SWGFileSourceActions(); + obj->init(); + return obj; } if(QString("SWGFileSourceReport").compare(type) == 0) { - return new SWGFileSourceReport(); + SWGFileSourceReport *obj = new SWGFileSourceReport(); + obj->init(); + return obj; } if(QString("SWGFileSourceSettings").compare(type) == 0) { - return new SWGFileSourceSettings(); + SWGFileSourceSettings *obj = new SWGFileSourceSettings(); + obj->init(); + return obj; } if(QString("SWGFreeDVDemodReport").compare(type) == 0) { - return new SWGFreeDVDemodReport(); + SWGFreeDVDemodReport *obj = new SWGFreeDVDemodReport(); + obj->init(); + return obj; } if(QString("SWGFreeDVDemodSettings").compare(type) == 0) { - return new SWGFreeDVDemodSettings(); + SWGFreeDVDemodSettings *obj = new SWGFreeDVDemodSettings(); + obj->init(); + return obj; } if(QString("SWGFreeDVModReport").compare(type) == 0) { - return new SWGFreeDVModReport(); + SWGFreeDVModReport *obj = new SWGFreeDVModReport(); + obj->init(); + return obj; } if(QString("SWGFreeDVModSettings").compare(type) == 0) { - return new SWGFreeDVModSettings(); + SWGFreeDVModSettings *obj = new SWGFreeDVModSettings(); + obj->init(); + return obj; } if(QString("SWGFreqTrackerReport").compare(type) == 0) { - return new SWGFreqTrackerReport(); + SWGFreqTrackerReport *obj = new SWGFreqTrackerReport(); + obj->init(); + return obj; } if(QString("SWGFreqTrackerSettings").compare(type) == 0) { - return new SWGFreqTrackerSettings(); + SWGFreqTrackerSettings *obj = new SWGFreqTrackerSettings(); + obj->init(); + return obj; } if(QString("SWGFrequency").compare(type) == 0) { - return new SWGFrequency(); + SWGFrequency *obj = new SWGFrequency(); + obj->init(); + return obj; } if(QString("SWGFrequencyBand").compare(type) == 0) { - return new SWGFrequencyBand(); + SWGFrequencyBand *obj = new SWGFrequencyBand(); + obj->init(); + return obj; } if(QString("SWGFrequencyRange").compare(type) == 0) { - return new SWGFrequencyRange(); + SWGFrequencyRange *obj = new SWGFrequencyRange(); + obj->init(); + return obj; } if(QString("SWGGLScope").compare(type) == 0) { - return new SWGGLScope(); + SWGGLScope *obj = new SWGGLScope(); + obj->init(); + return obj; } if(QString("SWGGLSpectrum").compare(type) == 0) { - return new SWGGLSpectrum(); + SWGGLSpectrum *obj = new SWGGLSpectrum(); + obj->init(); + return obj; } if(QString("SWGGS232ControllerSettings").compare(type) == 0) { - return new SWGGS232ControllerSettings(); + SWGGS232ControllerSettings *obj = new SWGGS232ControllerSettings(); + obj->init(); + return obj; } if(QString("SWGGain").compare(type) == 0) { - return new SWGGain(); + SWGGain *obj = new SWGGain(); + obj->init(); + return obj; } if(QString("SWGHackRFInputSettings").compare(type) == 0) { - return new SWGHackRFInputSettings(); + SWGHackRFInputSettings *obj = new SWGHackRFInputSettings(); + obj->init(); + return obj; } if(QString("SWGHackRFOutputSettings").compare(type) == 0) { - return new SWGHackRFOutputSettings(); + SWGHackRFOutputSettings *obj = new SWGHackRFOutputSettings(); + obj->init(); + return obj; } if(QString("SWGIEEE_802_15_4_ModActions").compare(type) == 0) { - return new SWGIEEE_802_15_4_ModActions(); + SWGIEEE_802_15_4_ModActions *obj = new SWGIEEE_802_15_4_ModActions(); + obj->init(); + return obj; } if(QString("SWGIEEE_802_15_4_ModActions_tx").compare(type) == 0) { - return new SWGIEEE_802_15_4_ModActions_tx(); + SWGIEEE_802_15_4_ModActions_tx *obj = new SWGIEEE_802_15_4_ModActions_tx(); + obj->init(); + return obj; } if(QString("SWGIEEE_802_15_4_ModReport").compare(type) == 0) { - return new SWGIEEE_802_15_4_ModReport(); + SWGIEEE_802_15_4_ModReport *obj = new SWGIEEE_802_15_4_ModReport(); + obj->init(); + return obj; } if(QString("SWGIEEE_802_15_4_ModSettings").compare(type) == 0) { - return new SWGIEEE_802_15_4_ModSettings(); + SWGIEEE_802_15_4_ModSettings *obj = new SWGIEEE_802_15_4_ModSettings(); + obj->init(); + return obj; } if(QString("SWGInstanceChannelsResponse").compare(type) == 0) { - return new SWGInstanceChannelsResponse(); + SWGInstanceChannelsResponse *obj = new SWGInstanceChannelsResponse(); + obj->init(); + return obj; } if(QString("SWGInstanceConfigResponse").compare(type) == 0) { - return new SWGInstanceConfigResponse(); + SWGInstanceConfigResponse *obj = new SWGInstanceConfigResponse(); + obj->init(); + return obj; } if(QString("SWGInstanceDevicesResponse").compare(type) == 0) { - return new SWGInstanceDevicesResponse(); + SWGInstanceDevicesResponse *obj = new SWGInstanceDevicesResponse(); + obj->init(); + return obj; } if(QString("SWGInstanceSummaryResponse").compare(type) == 0) { - return new SWGInstanceSummaryResponse(); + SWGInstanceSummaryResponse *obj = new SWGInstanceSummaryResponse(); + obj->init(); + return obj; } if(QString("SWGInterferometerSettings").compare(type) == 0) { - return new SWGInterferometerSettings(); + SWGInterferometerSettings *obj = new SWGInterferometerSettings(); + obj->init(); + return obj; } if(QString("SWGKiwiSDRReport").compare(type) == 0) { - return new SWGKiwiSDRReport(); + SWGKiwiSDRReport *obj = new SWGKiwiSDRReport(); + obj->init(); + return obj; } if(QString("SWGKiwiSDRSettings").compare(type) == 0) { - return new SWGKiwiSDRSettings(); + SWGKiwiSDRSettings *obj = new SWGKiwiSDRSettings(); + obj->init(); + return obj; } if(QString("SWGLimeRFEDevice").compare(type) == 0) { - return new SWGLimeRFEDevice(); + SWGLimeRFEDevice *obj = new SWGLimeRFEDevice(); + obj->init(); + return obj; } if(QString("SWGLimeRFEDevices").compare(type) == 0) { - return new SWGLimeRFEDevices(); + SWGLimeRFEDevices *obj = new SWGLimeRFEDevices(); + obj->init(); + return obj; } if(QString("SWGLimeRFEPower").compare(type) == 0) { - return new SWGLimeRFEPower(); + SWGLimeRFEPower *obj = new SWGLimeRFEPower(); + obj->init(); + return obj; } if(QString("SWGLimeRFESettings").compare(type) == 0) { - return new SWGLimeRFESettings(); + SWGLimeRFESettings *obj = new SWGLimeRFESettings(); + obj->init(); + return obj; } if(QString("SWGLimeSdrInputReport").compare(type) == 0) { - return new SWGLimeSdrInputReport(); + SWGLimeSdrInputReport *obj = new SWGLimeSdrInputReport(); + obj->init(); + return obj; } if(QString("SWGLimeSdrInputSettings").compare(type) == 0) { - return new SWGLimeSdrInputSettings(); + SWGLimeSdrInputSettings *obj = new SWGLimeSdrInputSettings(); + obj->init(); + return obj; } if(QString("SWGLimeSdrMIMOReport").compare(type) == 0) { - return new SWGLimeSdrMIMOReport(); + SWGLimeSdrMIMOReport *obj = new SWGLimeSdrMIMOReport(); + obj->init(); + return obj; } if(QString("SWGLimeSdrMIMOSettings").compare(type) == 0) { - return new SWGLimeSdrMIMOSettings(); + SWGLimeSdrMIMOSettings *obj = new SWGLimeSdrMIMOSettings(); + obj->init(); + return obj; } if(QString("SWGLimeSdrOutputReport").compare(type) == 0) { - return new SWGLimeSdrOutputReport(); + SWGLimeSdrOutputReport *obj = new SWGLimeSdrOutputReport(); + obj->init(); + return obj; } if(QString("SWGLimeSdrOutputSettings").compare(type) == 0) { - return new SWGLimeSdrOutputSettings(); + SWGLimeSdrOutputSettings *obj = new SWGLimeSdrOutputSettings(); + obj->init(); + return obj; } if(QString("SWGLocalInputReport").compare(type) == 0) { - return new SWGLocalInputReport(); + SWGLocalInputReport *obj = new SWGLocalInputReport(); + obj->init(); + return obj; } if(QString("SWGLocalInputSettings").compare(type) == 0) { - return new SWGLocalInputSettings(); + SWGLocalInputSettings *obj = new SWGLocalInputSettings(); + obj->init(); + return obj; } if(QString("SWGLocalOutputReport").compare(type) == 0) { - return new SWGLocalOutputReport(); + SWGLocalOutputReport *obj = new SWGLocalOutputReport(); + obj->init(); + return obj; } if(QString("SWGLocalOutputSettings").compare(type) == 0) { - return new SWGLocalOutputSettings(); + SWGLocalOutputSettings *obj = new SWGLocalOutputSettings(); + obj->init(); + return obj; } if(QString("SWGLocalSinkSettings").compare(type) == 0) { - return new SWGLocalSinkSettings(); + SWGLocalSinkSettings *obj = new SWGLocalSinkSettings(); + obj->init(); + return obj; } if(QString("SWGLocalSourceSettings").compare(type) == 0) { - return new SWGLocalSourceSettings(); + SWGLocalSourceSettings *obj = new SWGLocalSourceSettings(); + obj->init(); + return obj; } if(QString("SWGLocationInformation").compare(type) == 0) { - return new SWGLocationInformation(); + SWGLocationInformation *obj = new SWGLocationInformation(); + obj->init(); + return obj; } if(QString("SWGLoggingInfo").compare(type) == 0) { - return new SWGLoggingInfo(); + SWGLoggingInfo *obj = new SWGLoggingInfo(); + obj->init(); + return obj; } if(QString("SWGMapActions").compare(type) == 0) { - return new SWGMapActions(); + SWGMapActions *obj = new SWGMapActions(); + obj->init(); + return obj; } if(QString("SWGMapCoordinate").compare(type) == 0) { - return new SWGMapCoordinate(); + SWGMapCoordinate *obj = new SWGMapCoordinate(); + obj->init(); + return obj; } if(QString("SWGMapItem").compare(type) == 0) { - return new SWGMapItem(); + SWGMapItem *obj = new SWGMapItem(); + obj->init(); + return obj; } if(QString("SWGMapItem_2").compare(type) == 0) { - return new SWGMapItem_2(); + SWGMapItem_2 *obj = new SWGMapItem_2(); + obj->init(); + return obj; } if(QString("SWGMapSettings").compare(type) == 0) { - return new SWGMapSettings(); + SWGMapSettings *obj = new SWGMapSettings(); + obj->init(); + return obj; } if(QString("SWGMetisMISOSettings").compare(type) == 0) { - return new SWGMetisMISOSettings(); + SWGMetisMISOSettings *obj = new SWGMetisMISOSettings(); + obj->init(); + return obj; } if(QString("SWGNFMDemodReport").compare(type) == 0) { - return new SWGNFMDemodReport(); + SWGNFMDemodReport *obj = new SWGNFMDemodReport(); + obj->init(); + return obj; } if(QString("SWGNFMDemodSettings").compare(type) == 0) { - return new SWGNFMDemodSettings(); + SWGNFMDemodSettings *obj = new SWGNFMDemodSettings(); + obj->init(); + return obj; } if(QString("SWGNFMModReport").compare(type) == 0) { - return new SWGNFMModReport(); + SWGNFMModReport *obj = new SWGNFMModReport(); + obj->init(); + return obj; } if(QString("SWGNFMModSettings").compare(type) == 0) { - return new SWGNFMModSettings(); + SWGNFMModSettings *obj = new SWGNFMModSettings(); + obj->init(); + return obj; } if(QString("SWGNamedEnum").compare(type) == 0) { - return new SWGNamedEnum(); + SWGNamedEnum *obj = new SWGNamedEnum(); + obj->init(); + return obj; } if(QString("SWGNoiseFigureReport").compare(type) == 0) { - return new SWGNoiseFigureReport(); + SWGNoiseFigureReport *obj = new SWGNoiseFigureReport(); + obj->init(); + return obj; } if(QString("SWGNoiseFigureSettings").compare(type) == 0) { - return new SWGNoiseFigureSettings(); + SWGNoiseFigureSettings *obj = new SWGNoiseFigureSettings(); + obj->init(); + return obj; } if(QString("SWGPERTesterActions").compare(type) == 0) { - return new SWGPERTesterActions(); + SWGPERTesterActions *obj = new SWGPERTesterActions(); + obj->init(); + return obj; } if(QString("SWGPERTesterActions_aos").compare(type) == 0) { - return new SWGPERTesterActions_aos(); + SWGPERTesterActions_aos *obj = new SWGPERTesterActions_aos(); + obj->init(); + return obj; } if(QString("SWGPERTesterSettings").compare(type) == 0) { - return new SWGPERTesterSettings(); + SWGPERTesterSettings *obj = new SWGPERTesterSettings(); + obj->init(); + return obj; } if(QString("SWGPacketDemodSettings").compare(type) == 0) { - return new SWGPacketDemodSettings(); + SWGPacketDemodSettings *obj = new SWGPacketDemodSettings(); + obj->init(); + return obj; } if(QString("SWGPacketModActions").compare(type) == 0) { - return new SWGPacketModActions(); + SWGPacketModActions *obj = new SWGPacketModActions(); + obj->init(); + return obj; } if(QString("SWGPacketModActions_tx").compare(type) == 0) { - return new SWGPacketModActions_tx(); + SWGPacketModActions_tx *obj = new SWGPacketModActions_tx(); + obj->init(); + return obj; } if(QString("SWGPacketModReport").compare(type) == 0) { - return new SWGPacketModReport(); + SWGPacketModReport *obj = new SWGPacketModReport(); + obj->init(); + return obj; } if(QString("SWGPacketModSettings").compare(type) == 0) { - return new SWGPacketModSettings(); + SWGPacketModSettings *obj = new SWGPacketModSettings(); + obj->init(); + return obj; } if(QString("SWGPerseusReport").compare(type) == 0) { - return new SWGPerseusReport(); + SWGPerseusReport *obj = new SWGPerseusReport(); + obj->init(); + return obj; } if(QString("SWGPerseusSettings").compare(type) == 0) { - return new SWGPerseusSettings(); + SWGPerseusSettings *obj = new SWGPerseusSettings(); + obj->init(); + return obj; } if(QString("SWGPlutoSdrInputReport").compare(type) == 0) { - return new SWGPlutoSdrInputReport(); + SWGPlutoSdrInputReport *obj = new SWGPlutoSdrInputReport(); + obj->init(); + return obj; } if(QString("SWGPlutoSdrInputSettings").compare(type) == 0) { - return new SWGPlutoSdrInputSettings(); + SWGPlutoSdrInputSettings *obj = new SWGPlutoSdrInputSettings(); + obj->init(); + return obj; } if(QString("SWGPlutoSdrMIMOReport").compare(type) == 0) { - return new SWGPlutoSdrMIMOReport(); + SWGPlutoSdrMIMOReport *obj = new SWGPlutoSdrMIMOReport(); + obj->init(); + return obj; } if(QString("SWGPlutoSdrMIMOSettings").compare(type) == 0) { - return new SWGPlutoSdrMIMOSettings(); + SWGPlutoSdrMIMOSettings *obj = new SWGPlutoSdrMIMOSettings(); + obj->init(); + return obj; } if(QString("SWGPlutoSdrOutputReport").compare(type) == 0) { - return new SWGPlutoSdrOutputReport(); + SWGPlutoSdrOutputReport *obj = new SWGPlutoSdrOutputReport(); + obj->init(); + return obj; } if(QString("SWGPlutoSdrOutputSettings").compare(type) == 0) { - return new SWGPlutoSdrOutputSettings(); + SWGPlutoSdrOutputSettings *obj = new SWGPlutoSdrOutputSettings(); + obj->init(); + return obj; } if(QString("SWGPreferences").compare(type) == 0) { - return new SWGPreferences(); + SWGPreferences *obj = new SWGPreferences(); + obj->init(); + return obj; } if(QString("SWGPreset").compare(type) == 0) { - return new SWGPreset(); + SWGPreset *obj = new SWGPreset(); + obj->init(); + return obj; } if(QString("SWGPresetExport").compare(type) == 0) { - return new SWGPresetExport(); + SWGPresetExport *obj = new SWGPresetExport(); + obj->init(); + return obj; } if(QString("SWGPresetGroup").compare(type) == 0) { - return new SWGPresetGroup(); + SWGPresetGroup *obj = new SWGPresetGroup(); + obj->init(); + return obj; } if(QString("SWGPresetIdentifier").compare(type) == 0) { - return new SWGPresetIdentifier(); + SWGPresetIdentifier *obj = new SWGPresetIdentifier(); + obj->init(); + return obj; } if(QString("SWGPresetImport").compare(type) == 0) { - return new SWGPresetImport(); + SWGPresetImport *obj = new SWGPresetImport(); + obj->init(); + return obj; } if(QString("SWGPresetItem").compare(type) == 0) { - return new SWGPresetItem(); + SWGPresetItem *obj = new SWGPresetItem(); + obj->init(); + return obj; } if(QString("SWGPresetTransfer").compare(type) == 0) { - return new SWGPresetTransfer(); + SWGPresetTransfer *obj = new SWGPresetTransfer(); + obj->init(); + return obj; } if(QString("SWGPresets").compare(type) == 0) { - return new SWGPresets(); + SWGPresets *obj = new SWGPresets(); + obj->init(); + return obj; } if(QString("SWGRDSReport").compare(type) == 0) { - return new SWGRDSReport(); + SWGRDSReport *obj = new SWGRDSReport(); + obj->init(); + return obj; } if(QString("SWGRDSReport_altFrequencies").compare(type) == 0) { - return new SWGRDSReport_altFrequencies(); + SWGRDSReport_altFrequencies *obj = new SWGRDSReport_altFrequencies(); + obj->init(); + return obj; } if(QString("SWGRadioClockReport").compare(type) == 0) { - return new SWGRadioClockReport(); + SWGRadioClockReport *obj = new SWGRadioClockReport(); + obj->init(); + return obj; } if(QString("SWGRadioClockSettings").compare(type) == 0) { - return new SWGRadioClockSettings(); + SWGRadioClockSettings *obj = new SWGRadioClockSettings(); + obj->init(); + return obj; } if(QString("SWGRange").compare(type) == 0) { - return new SWGRange(); + SWGRange *obj = new SWGRange(); + obj->init(); + return obj; } if(QString("SWGRangeFloat").compare(type) == 0) { - return new SWGRangeFloat(); + SWGRangeFloat *obj = new SWGRangeFloat(); + obj->init(); + return obj; } if(QString("SWGRemoteInputReport").compare(type) == 0) { - return new SWGRemoteInputReport(); + SWGRemoteInputReport *obj = new SWGRemoteInputReport(); + obj->init(); + return obj; } if(QString("SWGRemoteInputSettings").compare(type) == 0) { - return new SWGRemoteInputSettings(); + SWGRemoteInputSettings *obj = new SWGRemoteInputSettings(); + obj->init(); + return obj; } if(QString("SWGRemoteOutputReport").compare(type) == 0) { - return new SWGRemoteOutputReport(); + SWGRemoteOutputReport *obj = new SWGRemoteOutputReport(); + obj->init(); + return obj; } if(QString("SWGRemoteOutputSettings").compare(type) == 0) { - return new SWGRemoteOutputSettings(); + SWGRemoteOutputSettings *obj = new SWGRemoteOutputSettings(); + obj->init(); + return obj; } if(QString("SWGRemoteSinkSettings").compare(type) == 0) { - return new SWGRemoteSinkSettings(); + SWGRemoteSinkSettings *obj = new SWGRemoteSinkSettings(); + obj->init(); + return obj; } if(QString("SWGRemoteSourceReport").compare(type) == 0) { - return new SWGRemoteSourceReport(); + SWGRemoteSourceReport *obj = new SWGRemoteSourceReport(); + obj->init(); + return obj; } if(QString("SWGRemoteSourceSettings").compare(type) == 0) { - return new SWGRemoteSourceSettings(); + SWGRemoteSourceSettings *obj = new SWGRemoteSourceSettings(); + obj->init(); + return obj; } if(QString("SWGRigCtlServerSettings").compare(type) == 0) { - return new SWGRigCtlServerSettings(); + SWGRigCtlServerSettings *obj = new SWGRigCtlServerSettings(); + obj->init(); + return obj; } if(QString("SWGRtlSdrReport").compare(type) == 0) { - return new SWGRtlSdrReport(); + SWGRtlSdrReport *obj = new SWGRtlSdrReport(); + obj->init(); + return obj; } if(QString("SWGRtlSdrSettings").compare(type) == 0) { - return new SWGRtlSdrSettings(); + SWGRtlSdrSettings *obj = new SWGRtlSdrSettings(); + obj->init(); + return obj; } if(QString("SWGSDRPlayReport").compare(type) == 0) { - return new SWGSDRPlayReport(); + SWGSDRPlayReport *obj = new SWGSDRPlayReport(); + obj->init(); + return obj; } if(QString("SWGSDRPlaySettings").compare(type) == 0) { - return new SWGSDRPlaySettings(); + SWGSDRPlaySettings *obj = new SWGSDRPlaySettings(); + obj->init(); + return obj; } if(QString("SWGSDRPlayV3Report").compare(type) == 0) { - return new SWGSDRPlayV3Report(); + SWGSDRPlayV3Report *obj = new SWGSDRPlayV3Report(); + obj->init(); + return obj; } if(QString("SWGSDRPlayV3Settings").compare(type) == 0) { - return new SWGSDRPlayV3Settings(); + SWGSDRPlayV3Settings *obj = new SWGSDRPlayV3Settings(); + obj->init(); + return obj; } if(QString("SWGSSBDemodReport").compare(type) == 0) { - return new SWGSSBDemodReport(); + SWGSSBDemodReport *obj = new SWGSSBDemodReport(); + obj->init(); + return obj; } if(QString("SWGSSBDemodSettings").compare(type) == 0) { - return new SWGSSBDemodSettings(); + SWGSSBDemodSettings *obj = new SWGSSBDemodSettings(); + obj->init(); + return obj; } if(QString("SWGSSBModReport").compare(type) == 0) { - return new SWGSSBModReport(); + SWGSSBModReport *obj = new SWGSSBModReport(); + obj->init(); + return obj; } if(QString("SWGSSBModSettings").compare(type) == 0) { - return new SWGSSBModSettings(); + SWGSSBModSettings *obj = new SWGSSBModSettings(); + obj->init(); + return obj; } if(QString("SWGSampleRate").compare(type) == 0) { - return new SWGSampleRate(); + SWGSampleRate *obj = new SWGSampleRate(); + obj->init(); + return obj; } if(QString("SWGSamplingDevice").compare(type) == 0) { - return new SWGSamplingDevice(); + SWGSamplingDevice *obj = new SWGSamplingDevice(); + obj->init(); + return obj; } if(QString("SWGSatelliteTrackerSettings").compare(type) == 0) { - return new SWGSatelliteTrackerSettings(); + SWGSatelliteTrackerSettings *obj = new SWGSatelliteTrackerSettings(); + obj->init(); + return obj; } if(QString("SWGSigMFFileInputActions").compare(type) == 0) { - return new SWGSigMFFileInputActions(); + SWGSigMFFileInputActions *obj = new SWGSigMFFileInputActions(); + obj->init(); + return obj; } if(QString("SWGSigMFFileInputReport").compare(type) == 0) { - return new SWGSigMFFileInputReport(); + SWGSigMFFileInputReport *obj = new SWGSigMFFileInputReport(); + obj->init(); + return obj; } if(QString("SWGSigMFFileInputSettings").compare(type) == 0) { - return new SWGSigMFFileInputSettings(); + SWGSigMFFileInputSettings *obj = new SWGSigMFFileInputSettings(); + obj->init(); + return obj; } if(QString("SWGSigMFFileSinkActions").compare(type) == 0) { - return new SWGSigMFFileSinkActions(); + SWGSigMFFileSinkActions *obj = new SWGSigMFFileSinkActions(); + obj->init(); + return obj; } if(QString("SWGSigMFFileSinkReport").compare(type) == 0) { - return new SWGSigMFFileSinkReport(); + SWGSigMFFileSinkReport *obj = new SWGSigMFFileSinkReport(); + obj->init(); + return obj; } if(QString("SWGSigMFFileSinkSettings").compare(type) == 0) { - return new SWGSigMFFileSinkSettings(); + SWGSigMFFileSinkSettings *obj = new SWGSigMFFileSinkSettings(); + obj->init(); + return obj; } if(QString("SWGSimplePTTActions").compare(type) == 0) { - return new SWGSimplePTTActions(); + SWGSimplePTTActions *obj = new SWGSimplePTTActions(); + obj->init(); + return obj; } if(QString("SWGSimplePTTReport").compare(type) == 0) { - return new SWGSimplePTTReport(); + SWGSimplePTTReport *obj = new SWGSimplePTTReport(); + obj->init(); + return obj; } if(QString("SWGSimplePTTSettings").compare(type) == 0) { - return new SWGSimplePTTSettings(); + SWGSimplePTTSettings *obj = new SWGSimplePTTSettings(); + obj->init(); + return obj; } if(QString("SWGSoapySDRFrequencySetting").compare(type) == 0) { - return new SWGSoapySDRFrequencySetting(); + SWGSoapySDRFrequencySetting *obj = new SWGSoapySDRFrequencySetting(); + obj->init(); + return obj; } if(QString("SWGSoapySDRGainSetting").compare(type) == 0) { - return new SWGSoapySDRGainSetting(); + SWGSoapySDRGainSetting *obj = new SWGSoapySDRGainSetting(); + obj->init(); + return obj; } if(QString("SWGSoapySDRInputSettings").compare(type) == 0) { - return new SWGSoapySDRInputSettings(); + SWGSoapySDRInputSettings *obj = new SWGSoapySDRInputSettings(); + obj->init(); + return obj; } if(QString("SWGSoapySDROutputSettings").compare(type) == 0) { - return new SWGSoapySDROutputSettings(); + SWGSoapySDROutputSettings *obj = new SWGSoapySDROutputSettings(); + obj->init(); + return obj; } if(QString("SWGSoapySDRReport").compare(type) == 0) { - return new SWGSoapySDRReport(); + SWGSoapySDRReport *obj = new SWGSoapySDRReport(); + obj->init(); + return obj; } if(QString("SWGSpectrumServer").compare(type) == 0) { - return new SWGSpectrumServer(); + SWGSpectrumServer *obj = new SWGSpectrumServer(); + obj->init(); + return obj; } if(QString("SWGSpectrumServer_clients").compare(type) == 0) { - return new SWGSpectrumServer_clients(); + SWGSpectrumServer_clients *obj = new SWGSpectrumServer_clients(); + obj->init(); + return obj; } if(QString("SWGStarTrackerSettings").compare(type) == 0) { - return new SWGStarTrackerSettings(); + SWGStarTrackerSettings *obj = new SWGStarTrackerSettings(); + obj->init(); + return obj; } if(QString("SWGSuccessResponse").compare(type) == 0) { - return new SWGSuccessResponse(); + SWGSuccessResponse *obj = new SWGSuccessResponse(); + obj->init(); + return obj; } if(QString("SWGTargetAzimuthElevation").compare(type) == 0) { - return new SWGTargetAzimuthElevation(); + SWGTargetAzimuthElevation *obj = new SWGTargetAzimuthElevation(); + obj->init(); + return obj; } if(QString("SWGTestMISettings").compare(type) == 0) { - return new SWGTestMISettings(); + SWGTestMISettings *obj = new SWGTestMISettings(); + obj->init(); + return obj; } if(QString("SWGTestMOSyncSettings").compare(type) == 0) { - return new SWGTestMOSyncSettings(); + SWGTestMOSyncSettings *obj = new SWGTestMOSyncSettings(); + obj->init(); + return obj; } if(QString("SWGTestMiStreamSettings").compare(type) == 0) { - return new SWGTestMiStreamSettings(); + SWGTestMiStreamSettings *obj = new SWGTestMiStreamSettings(); + obj->init(); + return obj; } if(QString("SWGTestSourceSettings").compare(type) == 0) { - return new SWGTestSourceSettings(); + SWGTestSourceSettings *obj = new SWGTestSourceSettings(); + obj->init(); + return obj; } if(QString("SWGTraceData").compare(type) == 0) { - return new SWGTraceData(); + SWGTraceData *obj = new SWGTraceData(); + obj->init(); + return obj; } if(QString("SWGTriggerData").compare(type) == 0) { - return new SWGTriggerData(); + SWGTriggerData *obj = new SWGTriggerData(); + obj->init(); + return obj; } if(QString("SWGUDPSinkReport").compare(type) == 0) { - return new SWGUDPSinkReport(); + SWGUDPSinkReport *obj = new SWGUDPSinkReport(); + obj->init(); + return obj; } if(QString("SWGUDPSinkSettings").compare(type) == 0) { - return new SWGUDPSinkSettings(); + SWGUDPSinkSettings *obj = new SWGUDPSinkSettings(); + obj->init(); + return obj; } if(QString("SWGUDPSourceReport").compare(type) == 0) { - return new SWGUDPSourceReport(); + SWGUDPSourceReport *obj = new SWGUDPSourceReport(); + obj->init(); + return obj; } if(QString("SWGUDPSourceSettings").compare(type) == 0) { - return new SWGUDPSourceSettings(); + SWGUDPSourceSettings *obj = new SWGUDPSourceSettings(); + obj->init(); + return obj; } if(QString("SWGUSRPInputReport").compare(type) == 0) { - return new SWGUSRPInputReport(); + SWGUSRPInputReport *obj = new SWGUSRPInputReport(); + obj->init(); + return obj; } if(QString("SWGUSRPInputSettings").compare(type) == 0) { - return new SWGUSRPInputSettings(); + SWGUSRPInputSettings *obj = new SWGUSRPInputSettings(); + obj->init(); + return obj; } if(QString("SWGUSRPOutputReport").compare(type) == 0) { - return new SWGUSRPOutputReport(); + SWGUSRPOutputReport *obj = new SWGUSRPOutputReport(); + obj->init(); + return obj; } if(QString("SWGUSRPOutputSettings").compare(type) == 0) { - return new SWGUSRPOutputSettings(); + SWGUSRPOutputSettings *obj = new SWGUSRPOutputSettings(); + obj->init(); + return obj; } if(QString("SWGVORDemodReport").compare(type) == 0) { - return new SWGVORDemodReport(); + SWGVORDemodReport *obj = new SWGVORDemodReport(); + obj->init(); + return obj; } if(QString("SWGVORDemodSCReport").compare(type) == 0) { - return new SWGVORDemodSCReport(); + SWGVORDemodSCReport *obj = new SWGVORDemodSCReport(); + obj->init(); + return obj; } if(QString("SWGVORDemodSCSettings").compare(type) == 0) { - return new SWGVORDemodSCSettings(); + SWGVORDemodSCSettings *obj = new SWGVORDemodSCSettings(); + obj->init(); + return obj; } if(QString("SWGVORDemodSettings").compare(type) == 0) { - return new SWGVORDemodSettings(); + SWGVORDemodSettings *obj = new SWGVORDemodSettings(); + obj->init(); + return obj; } if(QString("SWGVORLocalizerSettings").compare(type) == 0) { - return new SWGVORLocalizerSettings(); + SWGVORLocalizerSettings *obj = new SWGVORLocalizerSettings(); + obj->init(); + return obj; } if(QString("SWGWFMDemodReport").compare(type) == 0) { - return new SWGWFMDemodReport(); + SWGWFMDemodReport *obj = new SWGWFMDemodReport(); + obj->init(); + return obj; } if(QString("SWGWFMDemodSettings").compare(type) == 0) { - return new SWGWFMDemodSettings(); + SWGWFMDemodSettings *obj = new SWGWFMDemodSettings(); + obj->init(); + return obj; } if(QString("SWGWFMModReport").compare(type) == 0) { - return new SWGWFMModReport(); + SWGWFMModReport *obj = new SWGWFMModReport(); + obj->init(); + return obj; } if(QString("SWGWFMModSettings").compare(type) == 0) { - return new SWGWFMModSettings(); + SWGWFMModSettings *obj = new SWGWFMModSettings(); + obj->init(); + return obj; } if(QString("SWGXtrxInputReport").compare(type) == 0) { - return new SWGXtrxInputReport(); + SWGXtrxInputReport *obj = new SWGXtrxInputReport(); + obj->init(); + return obj; } if(QString("SWGXtrxInputSettings").compare(type) == 0) { - return new SWGXtrxInputSettings(); + SWGXtrxInputSettings *obj = new SWGXtrxInputSettings(); + obj->init(); + return obj; } if(QString("SWGXtrxMIMOReport").compare(type) == 0) { - return new SWGXtrxMIMOReport(); + SWGXtrxMIMOReport *obj = new SWGXtrxMIMOReport(); + obj->init(); + return obj; } if(QString("SWGXtrxMIMOSettings").compare(type) == 0) { - return new SWGXtrxMIMOSettings(); + SWGXtrxMIMOSettings *obj = new SWGXtrxMIMOSettings(); + obj->init(); + return obj; } if(QString("SWGXtrxOutputReport").compare(type) == 0) { - return new SWGXtrxOutputReport(); + SWGXtrxOutputReport *obj = new SWGXtrxOutputReport(); + obj->init(); + return obj; } if(QString("SWGXtrxOutputSettings").compare(type) == 0) { - return new SWGXtrxOutputSettings(); + SWGXtrxOutputSettings *obj = new SWGXtrxOutputSettings(); + obj->init(); + return obj; } return nullptr; diff --git a/swagger/sdrangel/code/qt5/client/SWGTraceData.cpp b/swagger/sdrangel/code/qt5/client/SWGTraceData.cpp index dba453d50..41c1390f7 100644 --- a/swagger/sdrangel/code/qt5/client/SWGTraceData.cpp +++ b/swagger/sdrangel/code/qt5/client/SWGTraceData.cpp @@ -36,8 +36,6 @@ SWGTraceData::SWGTraceData() { m_input_index_isSet = false; amp = 0.0f; m_amp_isSet = false; - amp_index = 0; - m_amp_index_isSet = false; ofs = 0.0f; m_ofs_isSet = false; ofs_coarse = 0; @@ -82,8 +80,6 @@ SWGTraceData::init() { m_input_index_isSet = false; amp = 0.0f; m_amp_isSet = false; - amp_index = 0; - m_amp_index_isSet = false; ofs = 0.0f; m_ofs_isSet = false; ofs_coarse = 0; @@ -132,7 +128,6 @@ SWGTraceData::cleanup() { - if(text_overlay != nullptr) { delete text_overlay; } @@ -158,8 +153,6 @@ SWGTraceData::fromJsonObject(QJsonObject &pJson) { ::SWGSDRangel::setValue(&, pJson["amp"], "float", ""); - ::SWGSDRangel::setValue(&_index, pJson["ampIndex"], "qint32", ""); - ::SWGSDRangel::setValue(&ofs, pJson["ofs"], "float", ""); ::SWGSDRangel::setValue(&ofs_coarse, pJson["ofsCoarse"], "qint32", ""); @@ -216,9 +209,6 @@ SWGTraceData::asJsonObject() { if(m_amp_isSet){ obj->insert("amp", QJsonValue(amp)); } - if(m_amp_index_isSet){ - obj->insert("ampIndex", QJsonValue(amp_index)); - } if(m_ofs_isSet){ obj->insert("ofs", QJsonValue(ofs)); } @@ -305,16 +295,6 @@ SWGTraceData::setAmp(float amp) { this->m_amp_isSet = true; } -qint32 -SWGTraceData::getAmpIndex() { - return amp_index; -} -void -SWGTraceData::setAmpIndex(qint32 amp_index) { - this->amp_index = amp_index; - this->m_amp_index_isSet = true; -} - float SWGTraceData::getOfs() { return ofs; @@ -472,9 +452,6 @@ SWGTraceData::isSet(){ if(m_amp_isSet){ isObjectUpdated = true; break; } - if(m_amp_index_isSet){ - isObjectUpdated = true; break; - } if(m_ofs_isSet){ isObjectUpdated = true; break; } diff --git a/swagger/sdrangel/code/qt5/client/SWGTraceData.h b/swagger/sdrangel/code/qt5/client/SWGTraceData.h index b2117610c..7d430b69d 100644 --- a/swagger/sdrangel/code/qt5/client/SWGTraceData.h +++ b/swagger/sdrangel/code/qt5/client/SWGTraceData.h @@ -54,9 +54,6 @@ public: float getAmp(); void setAmp(float amp); - qint32 getAmpIndex(); - void setAmpIndex(qint32 amp_index); - float getOfs(); void setOfs(float ofs); @@ -115,9 +112,6 @@ private: float amp; bool m_amp_isSet; - qint32 amp_index; - bool m_amp_index_isSet; - float ofs; bool m_ofs_isSet;