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,86 @@
|
||||
/**
|
||||
* MainHandler for TetraRadio
|
||||
* $Id$
|
||||
* $HeadURL$
|
||||
* $Author$
|
||||
* Created by Christian Ehrlicher, SLSE, 2016-04-14
|
||||
*/
|
||||
#pragma once
|
||||
|
||||
#include <QObject>
|
||||
#include "main_handler.h"
|
||||
#include <LtsCoordTrans/lts_coord_trans.h>
|
||||
#include <AssetManagement/asm_dtc.h>
|
||||
#include "training_area_telegrams.h"
|
||||
|
||||
#include "logger.h"
|
||||
|
||||
namespace TrainingAreaBase
|
||||
{
|
||||
class PositionHandler : public QObject
|
||||
{
|
||||
Q_OBJECT
|
||||
public:
|
||||
explicit PositionHandler(MainHandler *mainHandler);
|
||||
|
||||
struct ParticipantPosition
|
||||
{
|
||||
TrainingAreaBase::TabPosition pos;
|
||||
int mountPointTypeId = 0;
|
||||
int buildingId = 0;
|
||||
int roomId = 0;
|
||||
qint64 time = 0;
|
||||
};
|
||||
|
||||
bool init();
|
||||
|
||||
Core::GeoPosition2D relativeToGeographic2D(const TetraIcd::RelativePosition &p) const;
|
||||
Core::GeoPosition relativeToGeographic(const TetraIcd::RelativePosition &p) const;
|
||||
QPointF geographicToRelativePointF(const Core::GeoPosition &p) const;
|
||||
QPointF geographicToRelativePointF(const Core::GeoPosition2D &p) const;
|
||||
TetraIcd::RelativePosition geographicToRelative(const Core::GeoPosition &p) const;
|
||||
TetraIcd::RelativePosition geographicToRelative(const Core::GeoPosition2D &p, double z) const;
|
||||
const LtsCoordTrans::UtmCoordinate &baseCoordinate() const;
|
||||
|
||||
// checks if position was marked as invalid by sfm (0x800000 / 0x800000)
|
||||
static bool isPositionMarkedInvalid(const TetraIcd::RelativePosition &p)
|
||||
{
|
||||
static_assert(std::is_integral<decltype(p.offsetX)>::value, "RelativePosition.offsetX must be an integer!");
|
||||
static_assert(std::is_integral<decltype(p.offsetY)>::value, "RelativePosition.offsetY must be an integer!");
|
||||
static constexpr int invalidPos = 0x800000;
|
||||
static constexpr int threeBytes = 0xffffff;
|
||||
return ((invalidPos == (p.offsetX & threeBytes)) ||
|
||||
(invalidPos == (p.offsetY & threeBytes)));
|
||||
}
|
||||
|
||||
// Speed after Last Position to actual position
|
||||
double speed(const TetraIcd::RelativePosition &relPos, const int equipNo, const qint64 timeStamp) const;
|
||||
bool isTimeToPerformSpeedCheckExceeded(const int equipNo, const qint64 timeStamp, const int maxTime) const;
|
||||
|
||||
void setLastPosition(int equipNo, const TrainingAreaBase::TabPosition &pos);
|
||||
void setLastMountPointTypeId(int equipNo, const int lastMountPointTypeId);
|
||||
void setLastBuildingId(int equipNo, const int lastBuildingId);
|
||||
void setLastRoomId(int equipNo, const int lastRoomId);
|
||||
void setLastTime(int equipNo, const qint64 time);
|
||||
TrainingAreaBase::TabPosition lastPosition(int equipNo) const;
|
||||
int lastMountPointTypeId(const int equipNo) const;
|
||||
int lastBuildingId(const int equipNo) const;
|
||||
int lastRoomId(const int equipNo) const;
|
||||
|
||||
bool isInTrainingArea(const TetraIcd::RelativePosition &relPos) const;
|
||||
|
||||
private:
|
||||
bool initCoordinateConversion() const;
|
||||
|
||||
private:
|
||||
MainHandler *m_mainHandler;
|
||||
mutable std::shared_ptr<AssetManagement::Interface::Dtc> m_dtcAsm;
|
||||
mutable LtsCoordTrans::UtmCoordinate m_utm2Geographic;
|
||||
QHash<int, ParticipantPosition> m_lastPosition;
|
||||
|
||||
mutable QPointF m_relPosBottomLeft;
|
||||
mutable QPointF m_relPosTopRight;
|
||||
|
||||
LOGGER_T m_logger;
|
||||
};
|
||||
} // namespace TrainingAreaBase
|
||||
Reference in new issue
Block a user