Qt6 Migration: Merge latest Qt5 devel content and apply migration fixes
- Merged 292 changed files from dlbo snapshot - Fixed IDL enum collisions (PortType, PdmEventType) - Fixed Grantlee template for C++11 scoped enums - Fixed CMake VERSION_GREATER syntax - Added missing directories (THP, LtsRestClient, etc.) Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
This commit is contained in:
310 files changed
+2823
-740
No files matched your search
@@ -383,15 +383,15 @@ template <> QJsonObject EXStatus::toJsonInternal<EXStatus>();
|
||||
// EX-L13
|
||||
struct SAATELEGRAMS_EXPORT Koordinate
|
||||
{
|
||||
double latitude; // -90.0…90.0
|
||||
double longitude; // -180.0…180.0
|
||||
double latitude {0.0}; // -90.0…90.0
|
||||
double longitude {0.0}; // -180.0…180.0
|
||||
};
|
||||
|
||||
// EX-L14
|
||||
struct SAATELEGRAMS_EXPORT KoordinateMitHoehe
|
||||
{
|
||||
Koordinate koordinate; // EX-L13
|
||||
int hoehe; // EX-L5 -399…9999 Meter
|
||||
int hoehe {0}; // EX-L5 -399…9999 Meter
|
||||
};
|
||||
|
||||
// EX-L6 Abfeuerungsart
|
||||
@@ -683,10 +683,10 @@ struct SAATELEGRAMS_EXPORT FeuerkommandoGeschosse
|
||||
QString ladung; // EX-L10 (table pdm_load_type)
|
||||
QString zuender; // EX-L11 (table pdm_igniter_type)
|
||||
QString zuenderFunktion; // EX-L41 (table pdm_igniter_function)
|
||||
double zuenderZeit; // [ms]
|
||||
int anzahl;
|
||||
int ladungsNummer;
|
||||
double intervall; // [s]
|
||||
double zuenderZeit {0.0};// [ms]
|
||||
int anzahl {-1};
|
||||
int ladungsNummer {-1};
|
||||
double intervall {0.0}; // [s]
|
||||
};
|
||||
|
||||
// EX-L35 Flugbahnpunkt
|
||||
@@ -744,22 +744,22 @@ struct SAATELEGRAMS_EXPORT WirkmittelFeuerkommando
|
||||
struct SAATELEGRAMS_EXPORT Treffpunkt
|
||||
{
|
||||
KoordinateMitHoehe koordinate; // EX-L14
|
||||
int anzahl;
|
||||
int anzahl {-1};
|
||||
};
|
||||
|
||||
// EX-L49 Wirkmittel Feuerkommando Rakete
|
||||
struct SAATELEGRAMS_EXPORT WirkmittelFeuerkommandoRakete
|
||||
{
|
||||
ProjectDataManagement::L27_EffectorId kenner; // EX-L27
|
||||
ProjectDataManagement::L27_EffectorId kenner {ProjectDataManagement::L27_EffectorId_def::get_default()}; // EX-L27
|
||||
QVector<Treffpunkt> treffpunkte;
|
||||
double flugzeit;
|
||||
int gipfelhoehe;
|
||||
double schussrichtung;
|
||||
int fallwinkel;
|
||||
ProjectDataManagement::L48_TrajectoryRocket anflug;
|
||||
double flugzeit {0.0};
|
||||
int gipfelhoehe {0};
|
||||
double schussrichtung {0.0};
|
||||
int fallwinkel {0};
|
||||
ProjectDataManagement::L48_TrajectoryRocket anflug {ProjectDataManagement::L48_TrajectoryRocket_def::get_default()};
|
||||
FeuerkommandoGeschosse geschoss;
|
||||
ProjectDataManagement::L46_GpsFrequency gps;
|
||||
int wirkzeit;
|
||||
ProjectDataManagement::L46_GpsFrequency gps {ProjectDataManagement::L46_GpsFrequency_def::get_default()};
|
||||
int wirkzeit {-1};
|
||||
};
|
||||
|
||||
// EX-L33 Feuerkommando
|
||||
|
||||
Reference in new issue
Block a user