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,98 @@
|
||||
/**
|
||||
* Retrieve data from InfrastructeManagement
|
||||
* $Id$
|
||||
* $HeadURL$
|
||||
* $Author$
|
||||
* Created by Christian Ehrlicher, SLSE, 2016-04-14
|
||||
*/
|
||||
#pragma once
|
||||
#include <QObject>
|
||||
#include <QMap>
|
||||
#include <QHash>
|
||||
#include <QLineF>
|
||||
#include <QRectF>
|
||||
#include <QPointF>
|
||||
#include <QPolygonF>
|
||||
#include <QMatrix>
|
||||
#include <InfrastructureManagement/ism.hpp>
|
||||
#include <InfrastructureManagement/ism_enums.hpp>
|
||||
#include <InfrastructureManagement/ism_dtc.h>
|
||||
#include <LtsUtilsCore/data_modification_enum.h>
|
||||
#include "logger.h"
|
||||
|
||||
namespace TrainingAreaBase
|
||||
{
|
||||
class MainHandler;
|
||||
class PositionHandler;
|
||||
|
||||
class IsmHandler : public QObject
|
||||
{
|
||||
Q_OBJECT
|
||||
public:
|
||||
struct OpsData
|
||||
{
|
||||
int opsCode = 0;
|
||||
int assetId = 0; // for lookup
|
||||
int structureElementId = 0; // for lookup
|
||||
int mainStructureElementId = 0; // buildingId
|
||||
int roomId = 0;
|
||||
bool opsTunnel = false;
|
||||
int mountingPointTypeId = 0;
|
||||
Core::GeoPosition position; // above ground
|
||||
};
|
||||
|
||||
explicit IsmHandler(MainHandler *mainHandler);
|
||||
|
||||
bool init();
|
||||
|
||||
OpsData dataFromOpsCode(int ipsCode) ;
|
||||
int getAssetTypeIdFromStructureElementId (int structureElementId) {return m_structure_ElementId2AssetTypeId.value(structureElementId);}
|
||||
|
||||
// IPS-GPS-crossing
|
||||
// if last valid position-report is an ips-position, next possible GPS-position is valid, if the participant has a distance to the building.
|
||||
bool posInExtendedBuildingFootprint(int mainStructureElementId, const Core::GeoPosition &position, const int mountPointTypeId) const;
|
||||
|
||||
private Q_SLOTS:
|
||||
void onInstrumentationAssetChanged(const InfrastructureManagement::InstrumentationAsset &data, DataModification modType = DataModification::eAdded);
|
||||
void onMountingPointAssetChanged(const InfrastructureManagement::MountingPointAsset &data, DataModification modType = DataModification::eAdded);
|
||||
void onMainStructureElementChanged(const InfrastructureManagement::MainStructureElement &data, DataModification modType = DataModification::eAdded);
|
||||
void onMainFootprintChanged(const InfrastructureManagement::MainFootprint &data, DataModification modType);
|
||||
|
||||
private:
|
||||
void rotateBuildingFootprint(int mseId);
|
||||
void removeOpsDataByStructureElementId(int structureElementId);
|
||||
void removeOpsAsset(int assetId);
|
||||
int getOpsCodeFromJSon(const std::string &s) const;
|
||||
bool getIsOpsTunnel(const std::string &s) const;
|
||||
void updateOpsData(OpsData &data, bool force = false);
|
||||
double distancePointLine(const QPointF &p, const QPointF &l1, const QPointF &l2) const;
|
||||
static double squareLen(const QPointF &p1, const QPointF &p2);
|
||||
|
||||
private:
|
||||
|
||||
MainHandler *m_mainHandler;
|
||||
|
||||
QHash<int, OpsData> m_opsData; // key=optical Code value = OpsData
|
||||
//QMap<int, OpsData> m_opsAssets; // assetId -> OpsData
|
||||
//QMap<int, int> m_opsCode2AssetId; // opsCode -> assetId
|
||||
QMap<int, int> m_structure_ElementId2AssetTypeId;
|
||||
QMap<int, int> m_structureElementId2AssetId;
|
||||
QMap<int, int> m_assetId2StructureElementId;
|
||||
//QMap<int, InfrastructureManagement::MainStructureElement> m_mainStructureElements; // key = MainStructureElementId
|
||||
//QMap<int, InfrastructureManagement::MainFootprint> m_mainFootprints; // key = MainStructureElementId
|
||||
QMap<int, QRectF> m_buildingBoundingBoxes; // key = MainStructureElementId
|
||||
QMap<int, QPolygonF> m_relBuildingFootprints; // key = MainStructureElementId
|
||||
QMap<int, QPolygonF> m_relBuildingFootprintsRotated; // key = MainStructureElementId
|
||||
|
||||
QMap<int, QRectF> m_buildingBoundingBoxesMgrs; // key = MainStructureElementId
|
||||
QMap<int, QPolygonF> m_relBuildingFootprintsRotatedMgrs; // key = MainStructureElementId
|
||||
|
||||
std::shared_ptr<InfrastructureManagement::Interface::Dtc> m_dtcIsm;
|
||||
|
||||
int m_distanceIpsToGps; // IPS to GPS: minimal distance to the building to receive valid GPS messages again
|
||||
int m_distanceOpsToGps; // IPS to GPS: minimal distance to the building to receive valid GPS messages again
|
||||
|
||||
LOGGER_T m_logger;
|
||||
};
|
||||
|
||||
} // namespace TrainingAreaBase
|
||||
Reference in new issue
Block a user