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

Adds immediate migration results in progress

Browse Source
This commit is contained in:
torsten committed 2026-08-19 11:18:24 +02:00
1 parent 8453e104c5
commit 3bb6e89496
2102 files changed
+17482 -15071
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/position_handler.cpp
+9 -10
View File
@@ -8,10 +8,9 @@
using namespace TrainingAreaBase;
PositionHandler::PositionHandler(MainHandler *mainHandler)
: QObject()
, m_mainHandler(mainHandler)
{}
PositionHandler::PositionHandler(MainHandler *mainHandler) : QObject()
, m_mainHandler(mainHandler),
m_logger(NGL::NGLLoggerBootstrap::getLogger()) {}
bool PositionHandler::init()
{
@@ -31,18 +30,18 @@ bool PositionHandler::initCoordinateConversion() const
const auto ex = m_mainHandler->exmHandler()->exercise(m_mainHandler->exerciseId());
if (ex.id() <= 0)
{
ERROR_LOG() << "Can not retrieve exercise information for id " << m_mainHandler->exerciseId();
ERROR_LOG(m_logger) << "Can not retrieve exercise information for id " << m_mainHandler->exerciseId();
return false;
}
if (!m_dtcAsm->waitForHistoricalDataTrainingArea(ddsTimeout))
{
ERROR_LOG() << "Error initializing AssetManagement DTC";
ERROR_LOG(m_logger) << "Error initializing AssetManagement DTC";
return false;
}
const auto ta = m_dtcAsm->trainingArea(ex.trainingAreaId());
if (ta.id() <= 0)
{
ERROR_LOG() << "Can not retrieve training are information for id " << ex.trainingAreaId();
ERROR_LOG(m_logger) << "Can not retrieve training are information for id " << ex.trainingAreaId();
return false;
}
@@ -103,7 +102,7 @@ Core::GeoPosition PositionHandler::relativeToGeographic(const TetraIcd::Relative
ret.lon(pos2d.lon());
ret.lat(pos2d.lat());
ret.z(p.offsetZ);
DEBUG_LOG() << "x/y -> lon/lat: " << p.offsetX << "," << p.offsetY
DEBUG_LOG(m_logger) << "x/y -> lon/lat: " << p.offsetX << "," << p.offsetY
<< " -> " << ret.lon() * LtsCoordTrans::rad2deg() << "," << ret.lat() * LtsCoordTrans::rad2deg();
return ret;
}
@@ -132,7 +131,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() << "lon/lat -> x/y: " << p.lon() * LtsCoordTrans::rad2deg() << "," << p.lat() * LtsCoordTrans::rad2deg()
DEBUG_LOG(m_logger) << "lon/lat -> x/y: " << p.lon() * LtsCoordTrans::rad2deg() << "," << p.lat() * LtsCoordTrans::rad2deg()
<< " -> " << ret.offsetX << "," << ret.offsetY;
return ret;
}
@@ -159,7 +158,7 @@ double PositionHandler::speed (const TetraIcd::RelativePosition &relPos, const i
QLineF line(QPointF(lastRelPosition.offsetX, lastRelPosition.offsetY),
QPointF(relPos.offsetX, relPos.offsetY));
DEBUG_LOG() << "POS alt=" << lastRelPosition.offsetX << "/" << lastRelPosition.offsetY
DEBUG_LOG(m_logger) << "POS alt=" << lastRelPosition.offsetX << "/" << lastRelPosition.offsetY
<< " POS neu=" << relPos.offsetX << "/" << relPos.offsetY
<< " distance= " << line.length()
<< " timeStamp=" << timeStamp