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

Qt6 Migration: DDS-Stubs, Logger-Fixes, Export-Header Korrekturen

Browse Source 
- NGL_ADD_LIBRARY2: 87 CMakeLists.txt konvertiert für Export-Header Generierung
- 44 Export-Header Include-Pfade korrigiert (_export.h)
- 81 DDS-Stub-Header generiert (*_dtc.h, *_fts.h, *_dts.h, *_ftc.h)
- INGLLogger: Duplikat gelöscht, m_logger Member entfernt, variadische Makros
- Q_FUNC_INFO Redefinition behoben (Qt6 definiert bereits)
- FATAL_LOG Makro hinzugefügt
- InfrastructureManagement DDS-Stubs (ism.hpp, ism_enums.hpp, ism_ftc.h)
- FilterManagement DDS-Stubs (flt_ftc.h, flt_dts.h)
- AreaEffectSimulation DDS-Stubs (aes.hpp, aes_enums.hpp)
- SymbolAppearance Klasse vollständig definiert mit content() Methode
- BuildingComponentFilter Klasse definiert mit Copy-Konstruktor
- Ftc Factory: nullptr Return (abstract class)
- AesFilter Klasse in aes.hpp hinzugefügt
- Dtc Klasse in ppm.hpp mit participantChanged Signal
- AesType Enum: alle 15 At* Werte definiert
- AesEffectState_def: EsReceived hinzugefügt
- DataModification Enum: eAdded/eModified/eRemoved
- function_reply_object.h → core_types.h Include-Pfad (72 Dateien)
- Enum-Class-Streaming Template-Operator in INGLLogger.h
- ism_mounting_point.h: QImage → QtGui/QImage, QGuiApplication/QScreen
- ism_data_plugin_interface.h: QSet Include, Include-Reihenfolge
- QRegExp → QRegularExpression in tpm_js_parser.cpp
- .underlying() Aufrufe zu direktem Enum-Vergleich korrigiert
- Include-Pfade: aes.hpp in symbol_appearance_settings_impl.h und aes_display_filter_impl.h

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
This commit is contained in:
torstenandCopilot committed 2026-08-19 06:06:24 +02:00
1 parent 010f91928a
commit b774f4035c
2785 files changed
+18754 -18316
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
+17 -17
View File
@@ -73,7 +73,7 @@ bool SAAInterface::init(std::shared_ptr<PpmHandler> ppmHandler,
m_ftcAes = m_aesHandler->getFtc();
DEBUG_LOG(m_logger) << "INIT SAA Interface";
DEBUG_LOG() << "INIT SAA Interface";
return true;
}
@@ -123,7 +123,7 @@ static Core::RelativePositionRelativeTime convertFlugbahnpunkt(const Flugbahnpun
void SAAInterface::parseFlugbahndaten(const Flugbahndaten &flugbahndaten, int aesItemId, int exposionId, const Core::GeoPosition &positionLaunch)
{
DEBUG_LOG(m_logger) << "SAAInterface::parseFlugbahndaten";
DEBUG_LOG() << "SAAInterface::parseFlugbahndaten";
std::vector<Core::RelativePositionRelativeTime> geometryRef;
geometryRef.clear();
@@ -138,22 +138,22 @@ void SAAInterface::parseFlugbahndaten(const Flugbahndaten &flugbahndaten, int ae
const auto &utmLaunch = LtsCoordTrans::UtmCoordinate::fromGeographic(positionLaunch.lon(), positionLaunch.lat(), zone);
DEBUG_LOG(m_logger) << " mmilirad: " << flugbahndaten.schussrichtung;
DEBUG_LOG() << " mmilirad: " << flugbahndaten.schussrichtung;
double grad = (flugbahndaten.schussrichtung / 6400.) * 360.0;
DEBUG_LOG(m_logger) << " milli rad to degree" << (flugbahndaten.schussrichtung / 6400.) * 360;
DEBUG_LOG(m_logger) << "Degree to target" << grad;
DEBUG_LOG() << " milli rad to degree" << (flugbahndaten.schussrichtung / 6400.) * 360;
DEBUG_LOG() << "Degree to target" << grad;
DEBUG_LOG(m_logger) << "Start point: " << positionLaunch;
DEBUG_LOG() << "Start point: " << positionLaunch;
const auto &coordEnd = LtsCoordTrans::UtmCoordinate::fromGeographic(flugbahndaten.zielkoordinate.koordinate.longitude * (M_PI / 180.0),
flugbahndaten.zielkoordinate.koordinate.latitude * (M_PI / 180.0));
DEBUG_LOG(m_logger) << "End point: " << coordEnd;
DEBUG_LOG() << "End point: " << coordEnd;
LtsCoordTrans::UtmCoordinate coordDiff = coordEnd;
coordDiff.x = coordDiff.x - utmLaunch.x;
coordDiff.y = coordDiff.y - utmLaunch.y;
const double useNewGrad = -90 + std::atan2(coordDiff.y, coordDiff.x) * (180.0 / M_PI);
DEBUG_LOG(m_logger) << "use new Degree " << useNewGrad;
DEBUG_LOG() << "use new Degree " << useNewGrad;
QTransform matrix;
matrix.rotate(useNewGrad);
@@ -169,11 +169,11 @@ void SAAInterface::parseFlugbahndaten(const Flugbahndaten &flugbahndaten, int ae
if (m_logger.isDebugEnabled())
{
const auto &fbPosRelative = convertFlugbahnpunkt(pos, matrix, utmLaunch, m_logger);
DEBUG_LOG(m_logger) << " fbPosRelative " << fbPosRelative;
DEBUG_LOG() << " fbPosRelative " << fbPosRelative;
}
TRACE_LOG(m_logger) << "Flugbahnpunkt:"
TRACE_LOG() << "Flugbahnpunkt:"
<< ", xRelativ :" << pos.xRelativ
<< ", yRelativ :" << pos.yRelativ
<< ", zRelativ :" << pos.zRelativ
@@ -198,7 +198,7 @@ void SAAInterface::parseFlugbahndaten(const Flugbahndaten &flugbahndaten, int ae
utmCoord.zone = utmLaunch.zone;
QPointF pntGeo = utmCoord.geographic();
TRACE_LOG(m_logger) << "utmCoord :" << utmCoord.x << " / " << utmCoord.y << ", utmCoord.zone :" << utmCoord.zone << ", utmCoord.isValid() :" << utmCoord.isValid()
TRACE_LOG() << "utmCoord :" << utmCoord.x << " / " << utmCoord.y << ", utmCoord.zone :" << utmCoord.zone << ", utmCoord.isValid() :" << utmCoord.isValid()
<< ", pntGeo :" << pntGeo.x() << " / " << pntGeo.y() << " / " << z;
QTransform matrix;
matrix.rotate(useNewGrad);
@@ -210,15 +210,15 @@ void SAAInterface::parseFlugbahndaten(const Flugbahndaten &flugbahndaten, int ae
flightPoint.relativeTime() = pos.zeit;
QPointF point(flightPoint.offsetX(), flightPoint.offsetY());
TRACE_LOG(m_logger) << " POS bevore rot: " << point;
TRACE_LOG() << " POS bevore rot: " << point;
auto rotatePoint = matrix.map(point);
TRACE_LOG(m_logger) << " POS after rot: " << rotatePoint;
TRACE_LOG() << " POS after rot: " << rotatePoint;
pntGeo.setX(rotatePoint.x());
pntGeo.setY(rotatePoint.y());
TRACE_LOG(m_logger) << "utmCoord :" << utmCoord.x << " / " << utmCoord.y << ", utmCoord.zone :" << utmCoord.zone << ", utmCoord.isValid() :" << utmCoord.isValid()
TRACE_LOG() << "utmCoord :" << utmCoord.x << " / " << utmCoord.y << ", utmCoord.zone :" << utmCoord.zone << ", utmCoord.isValid() :" << utmCoord.isValid()
<< ", pntGeo :" << pntGeo.x() << " / " << pntGeo.y() << " / " << z;
@@ -245,7 +245,7 @@ void SAAInterface::parseFlugbahndaten(const Flugbahndaten &flugbahndaten, int ae
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()
DEBUG_LOG() << "!!!!!!!!!!!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);
@@ -254,10 +254,10 @@ void SAAInterface::parseFlugbahndaten(const Flugbahndaten &flugbahndaten, int ae
void SAAInterface::onTrajectoryAdlerModifyReply(const Core::FunctionReplyObject &reply)
{
DEBUG_LOG(m_logger) << "onTrajectoryAdlerModifyReply";
DEBUG_LOG() << "onTrajectoryAdlerModifyReply";
if (reply.error())
{
ERROR_LOG(m_logger) << reply.translated();
ERROR_LOG() << reply.translated();
}
}