VE7UWU
/
sdrangel
mirror of https://github.com/f4exb/sdrangel.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fixed SWGModelFactory so that init() is invoked on complex objects. Fixes #899

This commit is contained in:
f4exb 2021-06-14 21:26:36 +02:00
parent 82f1004f28
commit a59a58f6f9
6 changed files with 1016 additions and 268 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

116
sdrbase/resources/webapi/doc/html2/index.html
View File

@ -3066,6 +3066,9 @@ margin-bottom: 20px;
"NFMModReport" : {
"$ref" : "#/definitions/NFMModReport"
},
"NoiseFigureReport" : {
"$ref" : "#/definitions/NoiseFigureReport"
},
"SSBDemodReport" : {
"$ref" : "#/definitions/SSBDemodReport"
},
@ -3200,6 +3203,9 @@ margin-bottom: 20px;
"NFMModSettings" : {
"$ref" : "#/definitions/NFMModSettings"
},
"NoiseFigureSettings" : {
"$ref" : "#/definitions/NoiseFigureSettings"
},
"LocalSinkSettings" : {
"$ref" : "#/definitions/LocalSinkSettings"
},
@ -5664,11 +5670,13 @@ margin-bottom: 20px;
defs.GS232ControllerSettings = {
"properties" : {
"azimuth" : {
"type" : "integer",
"type" : "number",
"format" : "float",
"description" : "Target azimuth in degrees (0-450)"
},
"elevation" : {
"type" : "integer",
"type" : "number",
"format" : "float",
"description" : "Target elevation in degrees (0-180)"
},
"serialPort" : {
@ -5711,6 +5719,14 @@ margin-bottom: 20px;
"type" : "integer",
"description" : "Maximum elevation the controller will output"
},
"tolerance" : {
"type" : "integer",
"description" : "Tolerance in degrees"
},
"protocol" : {
"type" : "integer",
"description" : "(0 GS-232, 1 SPID rot2prog)"
},
"title" : {
"type" : "string"
},
@ -7579,6 +7595,100 @@ margin-bottom: 20px;
}
},
"description" : "Enumeration with name for values"
};
defs.NoiseFigureReport = {
"properties" : {
"channelPowerDB" : {
"type" : "number",
"format" : "float",
"description" : "power received in channel (dB)"
},
"channelSampleRate" : {
"type" : "integer"
}
},
"description" : "NoiseFigure"
};
defs.NoiseFigureSettings = {
"properties" : {
"inputFrequencyOffset" : {
"type" : "integer",
"format" : "int64"
},
"fftSize" : {
"type" : "integer"
},
"fftCount" : {
"type" : "integer"
},
"frequencySpec" : {
"type" : "integer"
},
"startFrequency" : {
"type" : "number",
"format" : "float"
},
"stopFrequency" : {
"type" : "number",
"format" : "float"
},
"steps" : {
"type" : "integer"
},
"step" : {
"type" : "number",
"format" : "float"
},
"frequencies" : {
"type" : "string"
},
"visaDevice" : {
"type" : "string"
},
"powerOnSCPI" : {
"type" : "string"
},
"powerOffSCPI" : {
"type" : "string"
},
"powerOnCommand" : {
"type" : "string"
},
"powerOffCommand" : {
"type" : "string"
},
"powerDelay" : {
"type" : "number",
"format" : "float"
},
"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" : "NoiseFigure"
};
defs.PERTesterActions = {
"properties" : {
@ -46666,7 +46776,7 @@ except ApiException as e:
</div>
<div id="generator">
<div class="content">
Generated 2021-05-29T00:16:39.973+02:00
Generated 2021-06-14T15:03:45.792+02:00
</div>
</div>
</div>

2
sdrbase/resources/webapi/doc/swagger/include/ChannelReport.yaml
View File

@ -49,6 +49,8 @@ ChannelReport:
$ref: "/doc/swagger/include/NFMDemod.yaml#/NFMDemodReport"
NFMModReport:
$ref: "/doc/swagger/include/NFMMod.yaml#/NFMModReport"
NoiseFigureReport:
$ref: "/doc/swagger/include/NoiseFigure.yaml#/NoiseFigureReport"
SSBDemodReport:
$ref: "/doc/swagger/include/SSBDemod.yaml#/SSBDemodReport"
RemoteSourceReport:

2
sdrbase/resources/webapi/doc/swagger/include/ChannelSettings.yaml
View File

@ -69,6 +69,8 @@ ChannelSettings:
$ref: "/doc/swagger/include/NFMDemod.yaml#/NFMDemodSettings"
NFMModSettings:
$ref: "/doc/swagger/include/NFMMod.yaml#/NFMModSettings"
NoiseFigureSettings:
$ref: "/doc/swagger/include/NoiseFigure.yaml#/NoiseFigureSettings"
LocalSinkSettings:
$ref: "/doc/swagger/include/LocalSink.yaml#/LocalSinkSettings"
LocalSourceSettings:

12
sdrbase/resources/webapi/doc/swagger/include/GS232Controller.yaml
View File

@ -3,10 +3,12 @@ GS232ControllerSettings:
properties:
azimuth:
description: Target azimuth in degrees (0-450)
type: integer
type: number
format: float
elevation:
description: Target elevation in degrees (0-180)
type: integer
type: number
format: float
serialPort:
description: The serial port the GS-232 controller is connected to
type: string
@ -37,6 +39,12 @@ GS232ControllerSettings:
elevationMax:
description: Maximum elevation the controller will output
type: integer
tolerance:
description: Tolerance in degrees
type: integer
protocol:
description: (0 GS-232, 1 SPID rot2prog)
type: integer
title:
type: string
rgbColor:

116
swagger/sdrangel/code/html2/index.html
View File

@ -3066,6 +3066,9 @@ margin-bottom: 20px;
"NFMModReport" : {
"$ref" : "#/definitions/NFMModReport"
},
"NoiseFigureReport" : {
"$ref" : "#/definitions/NoiseFigureReport"
},
"SSBDemodReport" : {
"$ref" : "#/definitions/SSBDemodReport"
},
@ -3200,6 +3203,9 @@ margin-bottom: 20px;
"NFMModSettings" : {
"$ref" : "#/definitions/NFMModSettings"
},
"NoiseFigureSettings" : {
"$ref" : "#/definitions/NoiseFigureSettings"
},
"LocalSinkSettings" : {
"$ref" : "#/definitions/LocalSinkSettings"
},
@ -5664,11 +5670,13 @@ margin-bottom: 20px;
defs.GS232ControllerSettings = {
"properties" : {
"azimuth" : {
"type" : "integer",
"type" : "number",
"format" : "float",
"description" : "Target azimuth in degrees (0-450)"
},
"elevation" : {
"type" : "integer",
"type" : "number",
"format" : "float",
"description" : "Target elevation in degrees (0-180)"
},
"serialPort" : {
@ -5711,6 +5719,14 @@ margin-bottom: 20px;
"type" : "integer",
"description" : "Maximum elevation the controller will output"
},
"tolerance" : {
"type" : "integer",
"description" : "Tolerance in degrees"
},
"protocol" : {
"type" : "integer",
"description" : "(0 GS-232, 1 SPID rot2prog)"
},
"title" : {
"type" : "string"
},
@ -7579,6 +7595,100 @@ margin-bottom: 20px;
}
},
"description" : "Enumeration with name for values"
};
defs.NoiseFigureReport = {
"properties" : {
"channelPowerDB" : {
"type" : "number",
"format" : "float",
"description" : "power received in channel (dB)"
},
"channelSampleRate" : {
"type" : "integer"
}
},
"description" : "NoiseFigure"
};
defs.NoiseFigureSettings = {
"properties" : {
"inputFrequencyOffset" : {
"type" : "integer",
"format" : "int64"
},
"fftSize" : {
"type" : "integer"
},
"fftCount" : {
"type" : "integer"
},
"frequencySpec" : {
"type" : "integer"
},
"startFrequency" : {
"type" : "number",
"format" : "float"
},
"stopFrequency" : {
"type" : "number",
"format" : "float"
},
"steps" : {
"type" : "integer"
},
"step" : {
"type" : "number",
"format" : "float"
},
"frequencies" : {
"type" : "string"
},
"visaDevice" : {
"type" : "string"
},
"powerOnSCPI" : {
"type" : "string"
},
"powerOffSCPI" : {
"type" : "string"
},
"powerOnCommand" : {
"type" : "string"
},
"powerOffCommand" : {
"type" : "string"
},
"powerDelay" : {
"type" : "number",
"format" : "float"
},
"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" : "NoiseFigure"
};
defs.PERTesterActions = {
"properties" : {
@ -46666,7 +46776,7 @@ except ApiException as e:
</div>
<div id="generator">
<div class="content">
Generated 2021-05-29T00:16:39.973+02:00
Generated 2021-06-14T15:03:45.792+02:00
</div>
</div>
</div>

1036
swagger/sdrangel/code/qt5/client/SWGModelFactory.h
View File

File diff suppressed because it is too large Load Diff