lifemaps/qt-migration-legatus
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Complete Qt6 migration: full clean build green across groups G1-G12 incl. runtime plugin set

Browse Source 
new_docker_build.sh gains Group 12 (212 GUI/Data plugins); fixes LtsUtilsGuiDds visibility (LTO-stripped exports), LtsProjectionWorkstation unity name shadow, 6 unity-off dirs (dup file-scope statics, ddsftc INTERFACE sources) and reconfigures BUILD_FILTERMANAGEMENT/BUILD_PLUGINS_SERVICEMONITOR=ON
This commit is contained in:
berrux-dev committed 2026-10-20 09:36:57 +02:00
1 parent eb1d949edc
commit 815e16368e
1718 files changed
+126739 -18495
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/GeoPairing/GeoPairing/GeoPairing.cpp
+1 -1
View File
@@ -136,7 +136,7 @@ void GeoPairing::calculateAirFire(const QByteArray &transparentData,
while (i.hasNext())
{
i.next();
SInt32 vulnerabilityState = i.value().vulnerabilityState.underlying();
SInt32 vulnerabilityState = i.value().vulnerabilityState;
Float64 lat = i.value().pos().lat() * 180 / M_PI;
Float64 lon = i.value().pos().lon() * 180 / M_PI;
DEBUG_LOG(m_logger) << "GeoPairing::calculateAirFire"
qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/GeoPairing/handler_geopairing.cpp
+41 -41
View File
@@ -195,11 +195,11 @@ void HandlerGeoPairing::onMeteoDataChanged(const MeteoDataManagement::MeteoData
m_meteoData = data;
DEBUG_LOG(m_logger) << "Got onMeteoDataChanged "
<< " id=" << m_meteoData.id()
<< " windSpeed=" << m_meteoData.windSpeed()
<< " windDirection=" << m_meteoData.windDirection()
<< " pressure=" << m_meteoData.pressure()
<< " temperature=" << m_meteoData.temperature();
<< " id=" << m_meteoData.id
<< " windSpeed=" << m_meteoData.windSpeed
<< " windDirection=" << m_meteoData.windDirection
<< " pressure=" << m_meteoData.pressure
<< " temperature=" << m_meteoData.temperature;
}
// ///////////////////////////////////
@@ -370,18 +370,18 @@ void HandlerGeoPairing::onGeoPairingDataChanged(const TrainingAreaBase::Geopairi
}
unsigned char msgType = 0xE3;
if (static_cast<unsigned char>(data.payload().at(0)) != msgType)
if (static_cast<unsigned char>(data.payload.at(0)) != msgType)
{
DEBUG_LOG(m_logger) << "data.payload().at(0) != msgType";
return;
}
double y = static_cast<double>(data.position().lat() * 180.0 / M_PI);
double x = static_cast<double>(data.position().lon() * 180.0 / M_PI);
double y = static_cast<double>(data.position.lat * 180.0 / M_PI);
double x = static_cast<double>(data.position.lon * 180.0 / M_PI);
int zone = -1;
const QPointF posUtm = CentralEffectSimulation::geographic2Utm(data.position(), &zone);
const QPointF posUtm = CentralEffectSimulation::geographic2Utm(data.position, &zone);
double impactPositionLat = 0.0;
@@ -391,37 +391,37 @@ void HandlerGeoPairing::onGeoPairingDataChanged(const TrainingAreaBase::Geopairi
//QByteArray time = payloadAr.mid(2, 3); // Byte 2 ..3
int time = 0;
int startIndex = 2;
time += (static_cast<unsigned char>(data.payload().at(startIndex)));
time += (static_cast<unsigned char>(data.payload().at(startIndex + 1)) << 8);
time += (static_cast<unsigned char>(data.payload.at(startIndex)));
time += (static_cast<unsigned char>(data.payload.at(startIndex + 1)) << 8);
// QByteArray elevationBa = payloadAr.mid(5, 8); // Byte 5 .. 8
int elevation = 0;
startIndex = 5;
elevation += (static_cast<unsigned char>(data.payload().at(startIndex)));
elevation += (static_cast<unsigned char>(data.payload().at(startIndex + 1)) << 8);
elevation += (static_cast<unsigned char>(data.payload().at(startIndex + 2)) << 16);
elevation += (static_cast<unsigned char>(data.payload().at(startIndex + 3)) << 24);
elevation += (static_cast<unsigned char>(data.payload.at(startIndex)));
elevation += (static_cast<unsigned char>(data.payload.at(startIndex + 1)) << 8);
elevation += (static_cast<unsigned char>(data.payload.at(startIndex + 2)) << 16);
elevation += (static_cast<unsigned char>(data.payload.at(startIndex + 3)) << 24);
// QByteArray azimutBa = payloadAr.mid(9, 12); // Byte 9.. 12
int azimut = 0;
startIndex = 9;
azimut += (static_cast<unsigned char>(data.payload().at(startIndex)));
azimut += (static_cast<unsigned char>(data.payload().at(startIndex + 1)) << 8);
azimut += (static_cast<unsigned char>(data.payload().at(startIndex + 2)) << 16);
azimut += (static_cast<unsigned char>(data.payload().at(startIndex + 3)) << 24);
azimut += (static_cast<unsigned char>(data.payload.at(startIndex)));
azimut += (static_cast<unsigned char>(data.payload.at(startIndex + 1)) << 8);
azimut += (static_cast<unsigned char>(data.payload.at(startIndex + 2)) << 16);
azimut += (static_cast<unsigned char>(data.payload.at(startIndex + 3)) << 24);
int temperature = (static_cast<unsigned char>(data.payload().at(13)));
int temperature = (static_cast<unsigned char>(data.payload.at(13)));
// QByteArray timeToDetonationBa = payloadAr.mid(14, 15); // Byte 14-15;
int timeToDetonation = 0;
startIndex = 14;
timeToDetonation += (static_cast<unsigned char>(data.payload().at(startIndex)));
timeToDetonation += (static_cast<unsigned char>(data.payload().at(startIndex + 1)) << 8);
timeToDetonation += (static_cast<unsigned char>(data.payload.at(startIndex)));
timeToDetonation += (static_cast<unsigned char>(data.payload.at(startIndex + 1)) << 8);
N_Ballistic::ammunitionTypeIndirectFire ammunitionType = N_Ballistic::MOERSER;
int ammunition = (data.payload().at(4) >> 1) & 0x03;
int ammunition = (data.payload.at(4) >> 1) & 0x03;
QString ammunitionStr;
switch (ammunition)
{
@@ -442,11 +442,11 @@ void HandlerGeoPairing::onGeoPairingDataChanged(const TrainingAreaBase::Geopairi
}
int treibmittel = (data.payload().at(4) >> 3) & 0x07;
int treibmittel = (data.payload.at(4) >> 3) & 0x07;
//int participantId = m_handlerParticipant->getParticipantId(data.equipmentNumber());
int participantId = m_ddsHandlerAes->dtcPpm()->participantIdByEquipmentNumber(data.equipmentNumber());
int partyId = m_ddsHandlerAes->dtcPpm()->participant(participantId).partyId();
int participantId = m_ddsHandlerAes->dtcPpm()->participantIdByEquipmentNumber(data.equipmentNumber);
int partyId = m_ddsHandlerAes->dtcPpm()->participant(participantId).partyId;
float v0 = 200.0;
if ( treibmittel == 0)
@@ -466,12 +466,12 @@ void HandlerGeoPairing::onGeoPairingDataChanged(const TrainingAreaBase::Geopairi
DEBUG_LOG(m_logger) << "Got onGeoPairingDataChanged "
<< "\nequipmentNumber=" << data.equipmentNumber()
<< "\nposition lat=" << data.position().lat()
<< "/" << data.position().lon()
<< "\nequipmentNumber=" << data.equipmentNumber
<< "\nposition lat=" << data.position.lat
<< "/" << data.position.lon
<< "\nposition xy=" << x << "/" << y
<< "\nposition UTM=" << posUtm.x() << "/" << posUtm.y() << " zone=" << zone
<< "\nsampleTime=" << data.sampleTime()
<< "\nsampleTime=" << data.sampleTime
<< "\nammunitionType=" << ammunitionType
<< "\ntemperature=" << temperature
<< "\nelevation=" << elevation
@@ -484,7 +484,7 @@ void HandlerGeoPairing::onGeoPairingDataChanged(const TrainingAreaBase::Geopairi
float rw = calculateDistance(v0, elevation / 10.0);
float t1 = calculateFlightTime(rw, v0, elevation / 10.0);
impactTime = data.sampleTime() + static_cast<int64_t> (t1) * 1000;
impactTime = data.sampleTime + static_cast<int64_t> (t1) * 1000;
//QPointF distVector = calculateDistVector ( rw, azimut/10.0);
QPointF explosionPosUtm = calculateExplosionPosUtm(rw, azimut / 10.0, posUtm);
@@ -499,20 +499,20 @@ void HandlerGeoPairing::onGeoPairingDataChanged(const TrainingAreaBase::Geopairi
impactPositionLat = explosionPosGeoCoordinate.y();
AreaEffectSimulation::ExplosionSingleModifyRequest explosionSingleModifyRequest;
explosionSingleModifyRequest.id(0);
explosionSingleModifyRequest.impactPosition().lat(impactPositionLat);
explosionSingleModifyRequest.impactPosition().lon(impactPositionLon);
explosionSingleModifyRequest.id = 0;
explosionSingleModifyRequest.impactPosition.lat = impactPositionLat;
explosionSingleModifyRequest.impactPosition.lon = impactPositionLon;
// Statement by the 5000: impactTime must be in the future
explosionSingleModifyRequest.effectStart(impactTime);
explosionSingleModifyRequest.chargeTypeId(ammunitionType);
explosionSingleModifyRequest.participantId(participantId);
QString name = QStringLiteral("Geopairing:") + QString::number(data.equipmentNumber());
explosionSingleModifyRequest.name(name.toStdString());
explosionSingleModifyRequest.effectStart = impactTime;
explosionSingleModifyRequest.chargeTypeId = ammunitionType;
explosionSingleModifyRequest.participantId = participantId;
QString name = QStringLiteral("Geopairing:") + QString::number(data.equipmentNumber);
explosionSingleModifyRequest.name = name.toStdString();
//const CentralEffectSimulation::HandlerParticipant::CesParticipantData pos = m_handlerParticipant->position(participantId);
explosionSingleModifyRequest.partyId(partyId);
explosionSingleModifyRequest.partyId = partyId;
DEBUG_LOG(m_logger) << "impactTime=" << data.sampleTime()
DEBUG_LOG(m_logger) << "impactTime=" << data.sampleTime
<< " name=" << name
<< " m_ddsHandler->currentPartitionTime=" << m_ddsHandlerAes->currentPartitionTime()
<< " participantId=" << participantId << " " << participantId