Qt6 Migration: DDS-Stubs, Logger-Fixes, Export-Header Korrekturen
- 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:
2785 files changed
+18754
-18316
No files matched your search
@@ -11,7 +11,6 @@ using namespace TrainingAreaBase;
|
||||
PositionHandler::PositionHandler(MainHandler *mainHandler)
|
||||
: QObject()
|
||||
, m_mainHandler(mainHandler)
|
||||
, m_logger(getLogger("PositionHandler"))
|
||||
{}
|
||||
|
||||
bool PositionHandler::init()
|
||||
@@ -32,18 +31,18 @@ bool PositionHandler::initCoordinateConversion() const
|
||||
const auto ex = m_mainHandler->exmHandler()->exercise(m_mainHandler->exerciseId());
|
||||
if (ex.id() <= 0)
|
||||
{
|
||||
ERROR_LOG(m_logger) << "Can not retrieve exercise information for id " << m_mainHandler->exerciseId();
|
||||
ERROR_LOG() << "Can not retrieve exercise information for id " << m_mainHandler->exerciseId();
|
||||
return false;
|
||||
}
|
||||
if (!m_dtcAsm->waitForHistoricalDataTrainingArea(ddsTimeout))
|
||||
{
|
||||
ERROR_LOG(m_logger) << "Error initializing AssetManagement DTC";
|
||||
ERROR_LOG() << "Error initializing AssetManagement DTC";
|
||||
return false;
|
||||
}
|
||||
const auto ta = m_dtcAsm->trainingArea(ex.trainingAreaId());
|
||||
if (ta.id() <= 0)
|
||||
{
|
||||
ERROR_LOG(m_logger) << "Can not retrieve training are information for id " << ex.trainingAreaId();
|
||||
ERROR_LOG() << "Can not retrieve training are information for id " << ex.trainingAreaId();
|
||||
return false;
|
||||
}
|
||||
|
||||
@@ -104,7 +103,7 @@ Core::GeoPosition PositionHandler::relativeToGeographic(const TetraIcd::Relative
|
||||
ret.lon(pos2d.lon());
|
||||
ret.lat(pos2d.lat());
|
||||
ret.z(p.offsetZ);
|
||||
DEBUG_LOG(m_logger) << "x/y -> lon/lat: " << p.offsetX << "," << p.offsetY
|
||||
DEBUG_LOG() << "x/y -> lon/lat: " << p.offsetX << "," << p.offsetY
|
||||
<< " -> " << ret.lon() * LtsCoordTrans::rad2deg() << "," << ret.lat() * LtsCoordTrans::rad2deg();
|
||||
return ret;
|
||||
}
|
||||
@@ -133,7 +132,7 @@ TetraIcd::RelativePosition PositionHandler::geographicToRelative(const Core::Geo
|
||||
{
|
||||
const QPointF rel(geographicToRelativePointF(p));
|
||||
const TetraIcd::RelativePosition ret(qRound(rel.x()), qRound(rel.y()), p.z());
|
||||
DEBUG_LOG(m_logger) << "lon/lat -> x/y: " << p.lon() * LtsCoordTrans::rad2deg() << "," << p.lat() * LtsCoordTrans::rad2deg()
|
||||
DEBUG_LOG() << "lon/lat -> x/y: " << p.lon() * LtsCoordTrans::rad2deg() << "," << p.lat() * LtsCoordTrans::rad2deg()
|
||||
<< " -> " << ret.offsetX << "," << ret.offsetY;
|
||||
return ret;
|
||||
}
|
||||
@@ -160,7 +159,7 @@ double PositionHandler::speed (const TetraIcd::RelativePosition &relPos, const i
|
||||
QLineF line(QPointF(lastRelPosition.offsetX, lastRelPosition.offsetY),
|
||||
QPointF(relPos.offsetX, relPos.offsetY));
|
||||
|
||||
DEBUG_LOG(m_logger) << "POS alt=" << lastRelPosition.offsetX << "/" << lastRelPosition.offsetY
|
||||
DEBUG_LOG() << "POS alt=" << lastRelPosition.offsetX << "/" << lastRelPosition.offsetY
|
||||
<< " POS neu=" << relPos.offsetX << "/" << relPos.offsetY
|
||||
<< " distance= " << line.length()
|
||||
<< " timeStamp=" << timeStamp
|
||||
|
||||
Reference in new issue
Block a user