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

Migrates residual Lts sources to generated rtiddsgen API

Browse Source 
Adds NmeaManagement tests, fixes codegen includes and Qt6 SerialPort CMake target.
This commit is contained in:
berrux-dev committed 2026-09-23 12:05:37 +02:00
1 parent 5485a90385
commit 881d44f4dd
512 files changed
+6887 -6426
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

qt6-after/qt6-migrated-legatus/Lts/Proxies/CombatNetRadio/training_area.cpp
+12 -12
View File
@@ -29,7 +29,7 @@ void TrainingArea::getTrainingArea(int trainingAreaId, AssetManagement::Interfac
{
AssetManagement::TrainingArea ddsTrainingArea = asmDtc->trainingArea(trainingAreaId);
m_trainingAreaData.designation = QString::fromStdString(ddsTrainingArea.name());
m_trainingAreaData.designation = QString::fromStdString(ddsTrainingArea.name);
m_trainingAreaData.id = trainingAreaId;
m_trainingAreaData.refPoint.lat = -1.;
m_trainingAreaData.refPoint.lon = -1.;
@@ -37,25 +37,25 @@ void TrainingArea::getTrainingArea(int trainingAreaId, AssetManagement::Interfac
WebSocketInterface::Messages::ReplyMessage::LonLatPoint point;
LtsCoordTrans::UtmCoordinate utmCoordinate = LtsCoordTrans::UtmCoordinate::fromGeographic(ddsTrainingArea.bottomLeft().lon(), ddsTrainingArea.bottomLeft().lat());
point.lat = toDeg(ddsTrainingArea.bottomLeft().lat());
point.lon = toDeg(ddsTrainingArea.bottomLeft().lon());
LtsCoordTrans::UtmCoordinate utmCoordinate = LtsCoordTrans::UtmCoordinate::fromGeographic(ddsTrainingArea.bottomLeft.lon, ddsTrainingArea.bottomLeft.lat);
point.lat = toDeg(ddsTrainingArea.bottomLeft.lat);
point.lon = toDeg(ddsTrainingArea.bottomLeft.lon);
m_trainingAreaData.path << point;
QPointF coord = utmCoordinate.geographic(ddsTrainingArea.width());
QPointF coord = utmCoordinate.geographic(ddsTrainingArea.width);
point.lon = toDeg(coord.x());
point.lat = toDeg(coord.y());
m_trainingAreaData.path << point;
coord = utmCoordinate.geographic(ddsTrainingArea.width(), ddsTrainingArea.height());
coord = utmCoordinate.geographic(ddsTrainingArea.width, ddsTrainingArea.height);
point.lon = toDeg(coord.x());
point.lat = toDeg(coord.y());
m_trainingAreaData.path << point;
coord = utmCoordinate.geographic(0, ddsTrainingArea.height());
coord = utmCoordinate.geographic(0, ddsTrainingArea.height);
point.lon = toDeg(coord.x());
point.lat = toDeg(coord.y());
m_trainingAreaData.path << point;
@@ -65,7 +65,7 @@ void TrainingArea::getRadioStations(InfrastructureManagement::Interface::Dtc *is
{
auto cb = [this](const InfrastructureManagement::MainStructureElement &mse)
{
if (mse.structureElementTypeId() != InfrastructureManagement::StructureElementType::RadioStation || mse.isDeleted())
if (mse.structureElementTypeId != InfrastructureManagement::StructureElementType::RadioStation || mse.isDeleted)
return;
WebSocketInterface::Messages::RadioStationMessage::RadioStationData data;
@@ -73,13 +73,13 @@ void TrainingArea::getRadioStations(InfrastructureManagement::Interface::Dtc *is
if (data.id == 0)
{
WARNING_LOG(m_logger) << "Got MainStructureElement of type 'RadioStation' but property 'stationId' was not set"
<< " - database id: " << mse.id() << " - ignoring!";
<< " - database id: " << mse.id << " - ignoring!";
return;
}
data.geoPoint.lon = toDeg(mse.geoPosition().lon());
data.geoPoint.lat = toDeg(mse.geoPosition().lat());
data.geoPoint.lon = toDeg(mse.geoPosition.lon);
data.geoPoint.lat = toDeg(mse.geoPosition.lat);
data.trainingAreaId = m_trainingAreaData.id;
data.designation = QString::fromStdString(mse.name());
data.designation = QString::fromStdString(mse.name);
m_radioStations.push_back(data);
};