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 2b957d1edb
commit 598fc2560e
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/Proxies/TrainingAreaBase/Plugins/AdlerJson/saa_interface.cpp
+31 -31
View File
@@ -130,12 +130,12 @@ void SAAInterface::parseFlugbahndaten(const Flugbahndaten &flugbahndaten, int ae
geometryRef.reserve(flugbahndaten.flugbahnpunkt.size());
AreaEffectSimulation::TrajectoryAdlerModifyRequest *newRequest = new AreaEffectSimulation::TrajectoryAdlerModifyRequest();
newRequest->aesItemId(aesItemId);
newRequest->explosionIndex(exposionId);
newRequest->aesItemId = aesItemId;
newRequest->explosionIndex = exposionId;
int zone = -1;
const auto &utmLaunch = LtsCoordTrans::UtmCoordinate::fromGeographic(positionLaunch.lon(), positionLaunch.lat(), zone);
const auto &utmLaunch = LtsCoordTrans::UtmCoordinate::fromGeographic(positionLaunch.lon, positionLaunch.lat, zone);
DEBUG_LOG(m_logger) << " mmilirad: " << flugbahndaten.schussrichtung;
@@ -178,9 +178,9 @@ void SAAInterface::parseFlugbahndaten(const Flugbahndaten &flugbahndaten, int ae
<< ", yRelativ :" << pos.yRelativ
<< ", zRelativ :" << pos.zRelativ
<< ", zeit :" << pos.zeit
<< ", positionLaunch :" << positionLaunch.lon()
<< " / " << positionLaunch.lat()
<< " / " << positionLaunch.z()
<< ", positionLaunch :" << positionLaunch.lon
<< " / " << positionLaunch.lat
<< " / " << positionLaunch.z
<< "<< utmLaunch :" << utmLaunch.x
<< " / " << utmLaunch.y
<< " / " << utmLaunch.zone;
@@ -189,7 +189,7 @@ void SAAInterface::parseFlugbahndaten(const Flugbahndaten &flugbahndaten, int ae
QPointF utmLaunchPt(utmLaunch.x, utmLaunch.y);
utm += utmLaunchPt;
double z = positionLaunch.z() + pos.yRelativ;
double z = positionLaunch.z + pos.yRelativ;
LtsCoordTrans::UtmCoordinate utmCoord;
@@ -204,11 +204,11 @@ void SAAInterface::parseFlugbahndaten(const Flugbahndaten &flugbahndaten, int ae
matrix.rotate(useNewGrad);
Core::RelativePositionRelativeTime flightPoint;
flightPoint.offsetX() = 0;
flightPoint.offsetY() = pos.xRelativ;
flightPoint.offsetZ() = pos.yRelativ;
flightPoint.relativeTime() = pos.zeit;
QPointF point(flightPoint.offsetX(), flightPoint.offsetY());
flightPoint.offsetX = 0;
flightPoint.offsetY = pos.xRelativ;
flightPoint.offsetZ = pos.yRelativ;
flightPoint.relativeTime = pos.zeit;
QPointF point(flightPoint.offsetX, flightPoint.offsetY);
TRACE_LOG(m_logger) << " POS bevore rot: " << point;
@@ -224,30 +224,30 @@ void SAAInterface::parseFlugbahndaten(const Flugbahndaten &flugbahndaten, int ae
flightPoint.offsetX() = rotatePoint.x();
flightPoint.offsetY() = rotatePoint.y();
flightPoint.offsetZ() = pos.yRelativ;
flightPoint.relativeTime() = std::round(pos.zeit * 1000.0);
flightPoint.offsetX = rotatePoint.x();
flightPoint.offsetY = rotatePoint.y();
flightPoint.offsetZ = pos.yRelativ;
flightPoint.relativeTime = std::round(pos.zeit * 1000.0);
geometryRef.emplace_back(flightPoint);
}
Core::GeoPosition impactPosition;
impactPosition.lat(flugbahndaten.zielkoordinate.koordinate.latitude * M_PI / 180.0);
impactPosition.lon(flugbahndaten.zielkoordinate.koordinate.longitude * M_PI / 180.0);
impactPosition.z(flugbahndaten.zielkoordinate.hoehe);
newRequest->impactPosition(impactPosition);
newRequest->geometry(geometryRef);
newRequest->peakAltitude(flugbahndaten.gipfelhoehe);
newRequest->mhpScatterLenght(flugbahndaten.streuung.laengsstreuung);
newRequest->mhpScatterLengthDetonationHeight(flugbahndaten.streuung.laengsstreuungH);
newRequest->mhpScatterWidth(flugbahndaten.streuung.seitenstreuung);
newRequest->mhpScatterWidthDetonationHeight(flugbahndaten.streuung.seitenstreuungH);
newRequest->shootDirection((flugbahndaten.schussrichtung / 6400.) * 360);
newRequest->errorcode(static_cast<int>(flugbahndaten.fehlercode));
DEBUG_LOG(m_logger) << "!!!!!!!!!!!geometryRef.size=" << geometryRef.size() << ", newRequest->geometry().size() :" << newRequest->geometry().size()
<< ", newRequest->errorcode :" << newRequest->errorcode() << ", newRequest->Peak:" << newRequest->peakAltitude()
<< ", newRequest->direction:" << newRequest->shootDirection() << ", flugbahndaten.fehlercode :" << static_cast<int>(flugbahndaten.fehlercode);
impactPosition.lat = flugbahndaten.zielkoordinate.koordinate.latitude * M_PI / 180.0;
impactPosition.lon = flugbahndaten.zielkoordinate.koordinate.longitude * M_PI / 180.0;
impactPosition.z = flugbahndaten.zielkoordinate.hoehe;
newRequest->impactPosition = impactPosition;
newRequest->geometry = geometryRef;
newRequest->peakAltitude = flugbahndaten.gipfelhoehe;
newRequest->mhpScatterLenght = flugbahndaten.streuung.laengsstreuung;
newRequest->mhpScatterLengthDetonationHeight = flugbahndaten.streuung.laengsstreuungH;
newRequest->mhpScatterWidth = flugbahndaten.streuung.seitenstreuung;
newRequest->mhpScatterWidthDetonationHeight = flugbahndaten.streuung.seitenstreuungH;
newRequest->shootDirection = (flugbahndaten.schussrichtung / 6400.) * 360;
newRequest->errorcode = static_cast<int>(flugbahndaten.fehlercode);
DEBUG_LOG(m_logger) << "!!!!!!!!!!!geometryRef.size=" << geometryRef.size() << ", newRequest->geometry().size() :" << newRequest->geometry.size()
<< ", newRequest->errorcode :" << newRequest->errorcode << ", newRequest->Peak:" << newRequest->peakAltitude
<< ", newRequest->direction:" << newRequest->shootDirection << ", flugbahndaten.fehlercode :" << static_cast<int>(flugbahndaten.fehlercode);
m_ftcAes->trajectoryAdlerModifyRequest(*newRequest, this);
}