Qt6 Migration: Complete migration with DDS/RTI support and build validation
Major Changes:
- Merged latest Qt5 devel content from dlbo (292 files changed, 7 new dirs)
- Consolidated forward-declarations and include folders
- Removed unneeded modules per Niklas' repo check list
Build System Fixes:
- Fixed CMake VERSION_GREATER syntax in ParticipantManagement/CMakeLists.txt
- Added VLC packages (libvlc-dev, vlc-plugin-base) to docker_build.sh
- Added PostgreSQL dev packages (libpq-dev, postgresql-server-dev-all) to Dockerfile
- Fixed locale warnings (ANSI_X3.4-1968 → C.UTF-8)
- Fixed ArcGIS SDK path warnings when BUILD_ARCGIS=OFF
Code Generation Fixes:
- Fixed IDL enum collisions (PortType→CorePortType/DdsutPortType, PdmEventType)
- Fixed Grantlee template svc_translation.cpp.grantlee:
- Changed {{ idl_enum.name }}_def:: to {{ idl_enum.name }}::
- Fixed .underlying() calls for C++11 scoped enums (enum class)
- Removed generated files from repo (moc_*, *_dtc.h, *_ftc.h)
Validation:
- BUILD_RTI=ON: SUCCESS
- BUILD_RTI=OFF: SUCCESS
- C++17 standard maintained for RTI 7.7 compatibility
- Ubuntu 26.04 Docker environment verified
Remaining Warnings (expected):
- BgViewer, KDChart, KDReports, Poppler-Qt6 not found (optional features)
Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
This commit is contained in:
18662 files changed
+4115092
-5435
No files matched your search
@@ -0,0 +1,95 @@
|
||||
/**
|
||||
* @RDE_HEADER@
|
||||
* TrainingArea
|
||||
* $Id$
|
||||
* $HeadURL$
|
||||
* $Author$
|
||||
* Created by Christian Fröbel, NLE, 2019-08-02
|
||||
*/
|
||||
|
||||
#include "training_area.h"
|
||||
#include "WebSocketInterface/Messages/reply_message.h"
|
||||
#include "helper.h"
|
||||
#include <LtsCoordTrans/lts_coord_trans.h>
|
||||
#include <LtsUtilsCore/json_object.h>
|
||||
#include <AssetManagement/asm_dtc.h>
|
||||
#include <InfrastructureManagement/ism_dtc.h>
|
||||
#include <QtGlobal>
|
||||
#include <QPointF>
|
||||
|
||||
namespace CombatNetRadio
|
||||
{
|
||||
|
||||
TrainingArea::TrainingArea(int trainingAreaId, AssetManagement::Interface::Dtc *asmDtc, InfrastructureManagement::Interface::Dtc *ismDtc)
|
||||
: m_logger(getLogger("TrainingArea"))
|
||||
{
|
||||
Q_ASSERT(trainingAreaId > 0);
|
||||
Q_ASSERT(asmDtc);
|
||||
Q_ASSERT(ismDtc);
|
||||
|
||||
getTrainingArea(trainingAreaId, asmDtc);
|
||||
getRadioStations(ismDtc);
|
||||
}
|
||||
|
||||
void TrainingArea::getTrainingArea(int trainingAreaId, AssetManagement::Interface::Dtc *asmDtc)
|
||||
{
|
||||
AssetManagement::TrainingArea ddsTrainingArea = asmDtc->trainingArea(trainingAreaId);
|
||||
|
||||
m_trainingAreaData.designation = QString::fromStdString(ddsTrainingArea.name());
|
||||
m_trainingAreaData.id = trainingAreaId;
|
||||
m_trainingAreaData.refPoint.lat = -1.;
|
||||
m_trainingAreaData.refPoint.lon = -1.;
|
||||
|
||||
WebSocketInterface::Messages::ReplyMessage::LonLatPoint point;
|
||||
|
||||
// bottom left
|
||||
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;
|
||||
|
||||
// bottom right
|
||||
QPointF coord = utmCoordinate.geographic(ddsTrainingArea.width());
|
||||
point.lon = toDeg(coord.x());
|
||||
point.lat = toDeg(coord.y());
|
||||
m_trainingAreaData.path << point;
|
||||
|
||||
// upper right
|
||||
coord = utmCoordinate.geographic(ddsTrainingArea.width(), ddsTrainingArea.height());
|
||||
point.lon = toDeg(coord.x());
|
||||
point.lat = toDeg(coord.y());
|
||||
m_trainingAreaData.path << point;
|
||||
|
||||
// upper left
|
||||
coord = utmCoordinate.geographic(0, ddsTrainingArea.height());
|
||||
point.lon = toDeg(coord.x());
|
||||
point.lat = toDeg(coord.y());
|
||||
m_trainingAreaData.path << point;
|
||||
}
|
||||
|
||||
void TrainingArea::getRadioStations(InfrastructureManagement::Interface::Dtc *ismDtc)
|
||||
{
|
||||
auto cb = [this](const InfrastructureManagement::MainStructureElement &mse)
|
||||
{
|
||||
if (mse.structureElementTypeId() != InfrastructureManagement::StructureElementType::RadioStation || mse.isDeleted())
|
||||
return;
|
||||
|
||||
WebSocketInterface::Messages::RadioStationMessage::RadioStationData data;
|
||||
data.id = stationId(mse);
|
||||
if (data.id == 0)
|
||||
{
|
||||
WARNING_LOG(m_logger) << "Got MainStructureElement of type 'RadioStation' but property 'stationId' was not set"
|
||||
<< " - database id: " << mse.id() << " - ignoring!";
|
||||
return;
|
||||
}
|
||||
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());
|
||||
|
||||
m_radioStations.push_back(data);
|
||||
};
|
||||
ismDtc->mainStructureElements(cb);
|
||||
}
|
||||
|
||||
} // namespace CombatNetRadio
|
||||
Reference in new issue
Block a user