Migrates OcSituation and ServiceManagement to generated rtiddsgen API
Converts accessor calls to plain member access in osc, oss and obd services.
This commit is contained in:
30 files changed
+1000
-1007
No files matched your search
+6
-6
@@ -46,7 +46,7 @@ bool PositionConverter::initCoordConversion()
|
||||
return false;
|
||||
}
|
||||
const auto ex = m_exmDtc->exercise(m_mainHandler->exerciseId());
|
||||
if (ex.id() <= 0)
|
||||
if (ex.id <= 0)
|
||||
{
|
||||
ERROR_LOG(m_logger) << "Can not retrieve exercise information for id " << m_mainHandler->exerciseId();
|
||||
return false;
|
||||
@@ -56,16 +56,16 @@ bool PositionConverter::initCoordConversion()
|
||||
ERROR_LOG(m_logger) << "Error initializing AssetManagement DTC";
|
||||
return false;
|
||||
}
|
||||
const auto ta = m_asmDtc->trainingArea(ex.trainingAreaId());
|
||||
if (ta.id() <= 0)
|
||||
const auto ta = m_asmDtc->trainingArea(ex.trainingAreaId);
|
||||
if (ta.id <= 0)
|
||||
{
|
||||
ERROR_LOG(m_logger) << "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;
|
||||
}
|
||||
|
||||
// calc tetra base point from training area center
|
||||
const LtsCoordTrans::UtmCoordinate bottomLeft(LtsCoordTrans::UtmCoordinate::fromGeographic(ta.bottomLeft().lon(), ta.bottomLeft().lat()));
|
||||
const QPointF mid(bottomLeft.geographic(ta.width() / 2, ta.height() / 2));
|
||||
const LtsCoordTrans::UtmCoordinate bottomLeft(LtsCoordTrans::UtmCoordinate::fromGeographic(ta.bottomLeft.lon, ta.bottomLeft.lat));
|
||||
const QPointF mid(bottomLeft.geographic(ta.width / 2, ta.height / 2));
|
||||
|
||||
// our center point is NNxYY 00000 00000 by definition
|
||||
// (we can also use current ta center but the it's hard to debug the coordinates in Tetra LogViewer)
|
||||
|
||||
Reference in new issue
Block a user