mirror of
https://github.com/f4exb/sdrangel.git
synced 2024-09-27 15:26:33 -04:00
Fixed SWGModelFactory so that init() is invoked on complex objects. Fixes #899
This commit is contained in:
parent
82f1004f28
commit
a59a58f6f9
@ -3066,6 +3066,9 @@ margin-bottom: 20px;
|
|||||||
"NFMModReport" : {
|
"NFMModReport" : {
|
||||||
"$ref" : "#/definitions/NFMModReport"
|
"$ref" : "#/definitions/NFMModReport"
|
||||||
},
|
},
|
||||||
|
"NoiseFigureReport" : {
|
||||||
|
"$ref" : "#/definitions/NoiseFigureReport"
|
||||||
|
},
|
||||||
"SSBDemodReport" : {
|
"SSBDemodReport" : {
|
||||||
"$ref" : "#/definitions/SSBDemodReport"
|
"$ref" : "#/definitions/SSBDemodReport"
|
||||||
},
|
},
|
||||||
@ -3200,6 +3203,9 @@ margin-bottom: 20px;
|
|||||||
"NFMModSettings" : {
|
"NFMModSettings" : {
|
||||||
"$ref" : "#/definitions/NFMModSettings"
|
"$ref" : "#/definitions/NFMModSettings"
|
||||||
},
|
},
|
||||||
|
"NoiseFigureSettings" : {
|
||||||
|
"$ref" : "#/definitions/NoiseFigureSettings"
|
||||||
|
},
|
||||||
"LocalSinkSettings" : {
|
"LocalSinkSettings" : {
|
||||||
"$ref" : "#/definitions/LocalSinkSettings"
|
"$ref" : "#/definitions/LocalSinkSettings"
|
||||||
},
|
},
|
||||||
@ -5664,11 +5670,13 @@ margin-bottom: 20px;
|
|||||||
defs.GS232ControllerSettings = {
|
defs.GS232ControllerSettings = {
|
||||||
"properties" : {
|
"properties" : {
|
||||||
"azimuth" : {
|
"azimuth" : {
|
||||||
"type" : "integer",
|
"type" : "number",
|
||||||
|
"format" : "float",
|
||||||
"description" : "Target azimuth in degrees (0-450)"
|
"description" : "Target azimuth in degrees (0-450)"
|
||||||
},
|
},
|
||||||
"elevation" : {
|
"elevation" : {
|
||||||
"type" : "integer",
|
"type" : "number",
|
||||||
|
"format" : "float",
|
||||||
"description" : "Target elevation in degrees (0-180)"
|
"description" : "Target elevation in degrees (0-180)"
|
||||||
},
|
},
|
||||||
"serialPort" : {
|
"serialPort" : {
|
||||||
@ -5711,6 +5719,14 @@ margin-bottom: 20px;
|
|||||||
"type" : "integer",
|
"type" : "integer",
|
||||||
"description" : "Maximum elevation the controller will output"
|
"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" : {
|
"title" : {
|
||||||
"type" : "string"
|
"type" : "string"
|
||||||
},
|
},
|
||||||
@ -7579,6 +7595,100 @@ margin-bottom: 20px;
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
"description" : "Enumeration with name for values"
|
"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 = {
|
defs.PERTesterActions = {
|
||||||
"properties" : {
|
"properties" : {
|
||||||
@ -46666,7 +46776,7 @@ except ApiException as e:
|
|||||||
</div>
|
</div>
|
||||||
<div id="generator">
|
<div id="generator">
|
||||||
<div class="content">
|
<div class="content">
|
||||||
Generated 2021-05-29T00:16:39.973+02:00
|
Generated 2021-06-14T15:03:45.792+02:00
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
@ -49,6 +49,8 @@ ChannelReport:
|
|||||||
$ref: "/doc/swagger/include/NFMDemod.yaml#/NFMDemodReport"
|
$ref: "/doc/swagger/include/NFMDemod.yaml#/NFMDemodReport"
|
||||||
NFMModReport:
|
NFMModReport:
|
||||||
$ref: "/doc/swagger/include/NFMMod.yaml#/NFMModReport"
|
$ref: "/doc/swagger/include/NFMMod.yaml#/NFMModReport"
|
||||||
|
NoiseFigureReport:
|
||||||
|
$ref: "/doc/swagger/include/NoiseFigure.yaml#/NoiseFigureReport"
|
||||||
SSBDemodReport:
|
SSBDemodReport:
|
||||||
$ref: "/doc/swagger/include/SSBDemod.yaml#/SSBDemodReport"
|
$ref: "/doc/swagger/include/SSBDemod.yaml#/SSBDemodReport"
|
||||||
RemoteSourceReport:
|
RemoteSourceReport:
|
||||||
|
@ -69,6 +69,8 @@ ChannelSettings:
|
|||||||
$ref: "/doc/swagger/include/NFMDemod.yaml#/NFMDemodSettings"
|
$ref: "/doc/swagger/include/NFMDemod.yaml#/NFMDemodSettings"
|
||||||
NFMModSettings:
|
NFMModSettings:
|
||||||
$ref: "/doc/swagger/include/NFMMod.yaml#/NFMModSettings"
|
$ref: "/doc/swagger/include/NFMMod.yaml#/NFMModSettings"
|
||||||
|
NoiseFigureSettings:
|
||||||
|
$ref: "/doc/swagger/include/NoiseFigure.yaml#/NoiseFigureSettings"
|
||||||
LocalSinkSettings:
|
LocalSinkSettings:
|
||||||
$ref: "/doc/swagger/include/LocalSink.yaml#/LocalSinkSettings"
|
$ref: "/doc/swagger/include/LocalSink.yaml#/LocalSinkSettings"
|
||||||
LocalSourceSettings:
|
LocalSourceSettings:
|
||||||
|
@ -3,10 +3,12 @@ GS232ControllerSettings:
|
|||||||
properties:
|
properties:
|
||||||
azimuth:
|
azimuth:
|
||||||
description: Target azimuth in degrees (0-450)
|
description: Target azimuth in degrees (0-450)
|
||||||
type: integer
|
type: number
|
||||||
|
format: float
|
||||||
elevation:
|
elevation:
|
||||||
description: Target elevation in degrees (0-180)
|
description: Target elevation in degrees (0-180)
|
||||||
type: integer
|
type: number
|
||||||
|
format: float
|
||||||
serialPort:
|
serialPort:
|
||||||
description: The serial port the GS-232 controller is connected to
|
description: The serial port the GS-232 controller is connected to
|
||||||
type: string
|
type: string
|
||||||
@ -37,6 +39,12 @@ GS232ControllerSettings:
|
|||||||
elevationMax:
|
elevationMax:
|
||||||
description: Maximum elevation the controller will output
|
description: Maximum elevation the controller will output
|
||||||
type: integer
|
type: integer
|
||||||
|
tolerance:
|
||||||
|
description: Tolerance in degrees
|
||||||
|
type: integer
|
||||||
|
protocol:
|
||||||
|
description: (0 GS-232, 1 SPID rot2prog)
|
||||||
|
type: integer
|
||||||
title:
|
title:
|
||||||
type: string
|
type: string
|
||||||
rgbColor:
|
rgbColor:
|
||||||
|
@ -3066,6 +3066,9 @@ margin-bottom: 20px;
|
|||||||
"NFMModReport" : {
|
"NFMModReport" : {
|
||||||
"$ref" : "#/definitions/NFMModReport"
|
"$ref" : "#/definitions/NFMModReport"
|
||||||
},
|
},
|
||||||
|
"NoiseFigureReport" : {
|
||||||
|
"$ref" : "#/definitions/NoiseFigureReport"
|
||||||
|
},
|
||||||
"SSBDemodReport" : {
|
"SSBDemodReport" : {
|
||||||
"$ref" : "#/definitions/SSBDemodReport"
|
"$ref" : "#/definitions/SSBDemodReport"
|
||||||
},
|
},
|
||||||
@ -3200,6 +3203,9 @@ margin-bottom: 20px;
|
|||||||
"NFMModSettings" : {
|
"NFMModSettings" : {
|
||||||
"$ref" : "#/definitions/NFMModSettings"
|
"$ref" : "#/definitions/NFMModSettings"
|
||||||
},
|
},
|
||||||
|
"NoiseFigureSettings" : {
|
||||||
|
"$ref" : "#/definitions/NoiseFigureSettings"
|
||||||
|
},
|
||||||
"LocalSinkSettings" : {
|
"LocalSinkSettings" : {
|
||||||
"$ref" : "#/definitions/LocalSinkSettings"
|
"$ref" : "#/definitions/LocalSinkSettings"
|
||||||
},
|
},
|
||||||
@ -5664,11 +5670,13 @@ margin-bottom: 20px;
|
|||||||
defs.GS232ControllerSettings = {
|
defs.GS232ControllerSettings = {
|
||||||
"properties" : {
|
"properties" : {
|
||||||
"azimuth" : {
|
"azimuth" : {
|
||||||
"type" : "integer",
|
"type" : "number",
|
||||||
|
"format" : "float",
|
||||||
"description" : "Target azimuth in degrees (0-450)"
|
"description" : "Target azimuth in degrees (0-450)"
|
||||||
},
|
},
|
||||||
"elevation" : {
|
"elevation" : {
|
||||||
"type" : "integer",
|
"type" : "number",
|
||||||
|
"format" : "float",
|
||||||
"description" : "Target elevation in degrees (0-180)"
|
"description" : "Target elevation in degrees (0-180)"
|
||||||
},
|
},
|
||||||
"serialPort" : {
|
"serialPort" : {
|
||||||
@ -5711,6 +5719,14 @@ margin-bottom: 20px;
|
|||||||
"type" : "integer",
|
"type" : "integer",
|
||||||
"description" : "Maximum elevation the controller will output"
|
"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" : {
|
"title" : {
|
||||||
"type" : "string"
|
"type" : "string"
|
||||||
},
|
},
|
||||||
@ -7579,6 +7595,100 @@ margin-bottom: 20px;
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
"description" : "Enumeration with name for values"
|
"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 = {
|
defs.PERTesterActions = {
|
||||||
"properties" : {
|
"properties" : {
|
||||||
@ -46666,7 +46776,7 @@ except ApiException as e:
|
|||||||
</div>
|
</div>
|
||||||
<div id="generator">
|
<div id="generator">
|
||||||
<div class="content">
|
<div class="content">
|
||||||
Generated 2021-05-29T00:16:39.973+02:00
|
Generated 2021-06-14T15:03:45.792+02:00
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
File diff suppressed because it is too large
Load Diff
Loading…
Reference in New Issue
Block a user