1
0
mirror of https://github.com/f4exb/sdrangel.git synced 2026-05-01 03:44:00 -04:00

Merge pull request #2594 from f4exb/fix-1859

Regenerated swagger generated code from lastest commit in f4exb swager-codegen. Fixes #1859
This commit is contained in:
Edouard Griffiths 2026-01-04 18:09:44 +01:00 committed by GitHub
commit 727189e4ff
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
9 changed files with 31 additions and 24 deletions

View File

@ -59654,7 +59654,7 @@ except ApiException as e:
</div>
<div id="generator">
<div class="content">
Generated 2026-01-04T00:29:36.688+01:00
Generated 2026-01-04T12:41:15.650+01:00
</div>
</div>
</div>

View File

@ -31,8 +31,10 @@ RUN sudo mkdir /opt/build /opt/install \
# swagger-codegen
FROM base as codegen_clone
ARG clone_label
ARG branch
ARG repository
WORKDIR /opt/build
RUN git clone --depth 1 https://github.com/f4exb/swagger-codegen.git -b sdrangel \
RUN git clone --depth 1 ${repository} -b ${branch} \
&& cd swagger-codegen \
&& mkdir build \
&& echo "${clone_label}" > build/clone_label.txt

View File

@ -11,6 +11,7 @@ show_help() {
-c label Arbitrary clone label. Clone again if different from the last label (default current timestamp)
-t tag Docker image tag. Use git tag or commit hash (default latest)
-f file Specify a Dockerfile (default is Dockerfile in current directory i.e. '.')
-r repo Git repository URL (default https://github.com/f4exb/swagger-codegen.git)
-h Print this help.
EOF
}
@ -20,8 +21,9 @@ clone_label=$(date)
image_tag="latest"
uid=1000
docker_file="."
repository="https://github.com/f4exb/swagger-codegen.git"
while getopts "h?b:c:t:j:f:" opt; do
while getopts "h?b:c:t:j:f:r:" opt; do
case "$opt" in
h|\?)
show_help
@ -35,6 +37,8 @@ while getopts "h?b:c:t:j:f:" opt; do
;;
f) docker_file="-f ${OPTARG} ."
;;
r) repository=${OPTARG}
;;
esac
done
@ -48,5 +52,6 @@ DOCKER_BUILDKIT=1 docker build \
--build-arg branch=${branch_name} \
--build-arg clone_label="${clone_label}" \
--build-arg uid=${uid} \
--build-arg repository=${repository} \
--target codegen \
-t ${IMAGE_NAME} ${docker_file}

View File

@ -59654,7 +59654,7 @@ except ApiException as e:
</div>
<div id="generator">
<div class="content">
Generated 2026-01-04T00:29:36.688+01:00
Generated 2026-01-04T12:41:15.650+01:00
</div>
</div>
</div>

View File

@ -170,10 +170,10 @@ SWGAISSettings::asJsonObject() {
toJsonValue(QString("rollupState"), rollup_state, obj, QString("SWGRollupState"));
}
if(vessel_column_indexes && vessel_column_indexes->size() > 0){
toJsonArray((QList<void*>*)vessel_column_indexes, obj, "vesselColumnIndexes", "");
toJsonArray((QList<void*>*)vessel_column_indexes, obj, "vesselColumnIndexes", "qint32");
}
if(vessel_column_sizes && vessel_column_sizes->size() > 0){
toJsonArray((QList<void*>*)vessel_column_sizes, obj, "vesselColumnSizes", "");
toJsonArray((QList<void*>*)vessel_column_sizes, obj, "vesselColumnSizes", "qint32");
}
return obj;

View File

@ -308,40 +308,40 @@ SWGAPRSSettings::asJsonObject() {
toJsonValue(QString("rollupState"), rollup_state, obj, QString("SWGRollupState"));
}
if(packets_table_column_indexes && packets_table_column_indexes->size() > 0){
toJsonArray((QList<void*>*)packets_table_column_indexes, obj, "packetsTableColumnIndexes", "");
toJsonArray((QList<void*>*)packets_table_column_indexes, obj, "packetsTableColumnIndexes", "qint32");
}
if(packets_table_column_sizes && packets_table_column_sizes->size() > 0){
toJsonArray((QList<void*>*)packets_table_column_sizes, obj, "packetsTableColumnSizes", "");
toJsonArray((QList<void*>*)packets_table_column_sizes, obj, "packetsTableColumnSizes", "qint32");
}
if(weather_table_column_indexes && weather_table_column_indexes->size() > 0){
toJsonArray((QList<void*>*)weather_table_column_indexes, obj, "weatherTableColumnIndexes", "");
toJsonArray((QList<void*>*)weather_table_column_indexes, obj, "weatherTableColumnIndexes", "qint32");
}
if(weather_table_column_sizes && weather_table_column_sizes->size() > 0){
toJsonArray((QList<void*>*)weather_table_column_sizes, obj, "weatherTableColumnSizes", "");
toJsonArray((QList<void*>*)weather_table_column_sizes, obj, "weatherTableColumnSizes", "qint32");
}
if(status_table_column_indexes && status_table_column_indexes->size() > 0){
toJsonArray((QList<void*>*)status_table_column_indexes, obj, "statusTableColumnIndexes", "");
toJsonArray((QList<void*>*)status_table_column_indexes, obj, "statusTableColumnIndexes", "qint32");
}
if(status_table_column_sizes && status_table_column_sizes->size() > 0){
toJsonArray((QList<void*>*)status_table_column_sizes, obj, "statusTableColumnSizes", "");
toJsonArray((QList<void*>*)status_table_column_sizes, obj, "statusTableColumnSizes", "qint32");
}
if(messages_table_column_indexes && messages_table_column_indexes->size() > 0){
toJsonArray((QList<void*>*)messages_table_column_indexes, obj, "messagesTableColumnIndexes", "");
toJsonArray((QList<void*>*)messages_table_column_indexes, obj, "messagesTableColumnIndexes", "qint32");
}
if(messages_table_column_sizes && messages_table_column_sizes->size() > 0){
toJsonArray((QList<void*>*)messages_table_column_sizes, obj, "messagesTableColumnSizes", "");
toJsonArray((QList<void*>*)messages_table_column_sizes, obj, "messagesTableColumnSizes", "qint32");
}
if(telemetry_table_column_indexes && telemetry_table_column_indexes->size() > 0){
toJsonArray((QList<void*>*)telemetry_table_column_indexes, obj, "telemetryTableColumnIndexes", "");
toJsonArray((QList<void*>*)telemetry_table_column_indexes, obj, "telemetryTableColumnIndexes", "qint32");
}
if(telemetry_table_column_sizes && telemetry_table_column_sizes->size() > 0){
toJsonArray((QList<void*>*)telemetry_table_column_sizes, obj, "telemetryTableColumnSizes", "");
toJsonArray((QList<void*>*)telemetry_table_column_sizes, obj, "telemetryTableColumnSizes", "qint32");
}
if(motion_table_column_indexes && motion_table_column_indexes->size() > 0){
toJsonArray((QList<void*>*)motion_table_column_indexes, obj, "motionTableColumnIndexes", "");
toJsonArray((QList<void*>*)motion_table_column_indexes, obj, "motionTableColumnIndexes", "qint32");
}
if(motion_table_column_sizes && motion_table_column_sizes->size() > 0){
toJsonArray((QList<void*>*)motion_table_column_sizes, obj, "motionTableColumnSizes", "");
toJsonArray((QList<void*>*)motion_table_column_sizes, obj, "motionTableColumnSizes", "qint32");
}
return obj;

View File

@ -170,10 +170,10 @@ SWGRadiosondeSettings::asJsonObject() {
toJsonValue(QString("rollupState"), rollup_state, obj, QString("SWGRollupState"));
}
if(radiosondes_column_indexes && radiosondes_column_indexes->size() > 0){
toJsonArray((QList<void*>*)radiosondes_column_indexes, obj, "radiosondesColumnIndexes", "");
toJsonArray((QList<void*>*)radiosondes_column_indexes, obj, "radiosondesColumnIndexes", "qint32");
}
if(radiosondes_column_sizes && radiosondes_column_sizes->size() > 0){
toJsonArray((QList<void*>*)radiosondes_column_sizes, obj, "radiosondesColumnSizes", "");
toJsonArray((QList<void*>*)radiosondes_column_sizes, obj, "radiosondesColumnSizes", "qint32");
}
return obj;

View File

@ -210,10 +210,10 @@ SWGVORLocalizerSettings::asJsonObject() {
toJsonValue(QString("rollupState"), rollup_state, obj, QString("SWGRollupState"));
}
if(column_indexes && column_indexes->size() > 0){
toJsonArray((QList<void*>*)column_indexes, obj, "columnIndexes", "");
toJsonArray((QList<void*>*)column_indexes, obj, "columnIndexes", "qint32");
}
if(column_sizes && column_sizes->size() > 0){
toJsonArray((QList<void*>*)column_sizes, obj, "columnSizes", "");
toJsonArray((QList<void*>*)column_sizes, obj, "columnSizes", "qint32");
}
return obj;

View File

@ -692,10 +692,10 @@ SWGWDSPRxSettings::asJsonObject() {
obj->insert("equalizer", QJsonValue(equalizer));
}
if(eq_f && eq_f->size() > 0){
toJsonArray((QList<void*>*)eq_f, obj, "eqF", "");
toJsonArray((QList<void*>*)eq_f, obj, "eqF", "float");
}
if(eq_g && eq_g->size() > 0){
toJsonArray((QList<void*>*)eq_g, obj, "eqG", "");
toJsonArray((QList<void*>*)eq_g, obj, "eqG", "float");
}
if(m_rit_isSet){
obj->insert("rit", QJsonValue(rit));