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,129 @@
|
||||
/**
|
||||
* @RDE_HEADER@
|
||||
*
|
||||
* EXM Function Topic test executable
|
||||
*
|
||||
* ModuleTests for create/modify/remove marker
|
||||
* ---------------------------------------------------
|
||||
* Client FTC is implemented
|
||||
*
|
||||
* => (!) Preconditon:
|
||||
* - Service svcMarkerManagent running
|
||||
*
|
||||
* -------------------------------------------------
|
||||
*
|
||||
* $Id$
|
||||
* $HeadURL$
|
||||
* $Author$
|
||||
* Created by hjl, SLSE, 2016-04-18
|
||||
*/
|
||||
|
||||
#pragma once
|
||||
|
||||
#include <Evaluations/evl_ftc.h>
|
||||
#include <Evaluations/evl_ftc_types.h>
|
||||
#include <Evaluations/evl_dtc.h>
|
||||
#include <Evaluations/evl_dtc_types.h>
|
||||
#include <Evaluations/logger.h>
|
||||
|
||||
#include <DDS/DDSConnector/dds_connector.h>
|
||||
|
||||
namespace Evaluations
|
||||
{
|
||||
class EvlTests : public QObject
|
||||
, protected Evaluations::Interface::Ftc::EvlCriteriumModifyReplyHandler
|
||||
, protected Evaluations::Interface::Ftc::EvlCriteriumRemoveReplyHandler
|
||||
, protected Evaluations::Interface::Ftc::EvlElementModifyReplyHandler
|
||||
, protected Evaluations::Interface::Ftc::EvlElementRemoveReplyHandler
|
||||
, protected Evaluations::Interface::Ftc::SanNineLinerModifyReplyHandler
|
||||
, protected Evaluations::Interface::Ftc::SanNineLinerRemoveReplyHandler
|
||||
{
|
||||
Q_OBJECT
|
||||
public:
|
||||
explicit EvlTests(QObject *parent = nullptr);
|
||||
~EvlTests() = default;
|
||||
|
||||
bool init(int domainId, int exerciseId, int testId, int operatorId, int criteriumId, int elementId, int sanNineLinerId);
|
||||
bool testsSuccessful() const { return m_bTestsSuccessful; }
|
||||
|
||||
public Q_SLOTS:
|
||||
void startTest();
|
||||
|
||||
protected Q_SLOTS:
|
||||
// used to check FTC
|
||||
void tryCreateCriterium();
|
||||
void tryModifyCriterium();
|
||||
void tryRemoveCriterium();
|
||||
|
||||
void tryCreateElement();
|
||||
void tryModifyElement();
|
||||
void tryRemoveElement();
|
||||
|
||||
// used to check DTC
|
||||
void tryGetAllCriteria();
|
||||
void tryGetCriterium();
|
||||
void tryGetSanNineLiner();
|
||||
|
||||
void tryCreateSanNineLiner();
|
||||
void tryModifySanNineLiner();
|
||||
void tryRemoveSanNineLiner();
|
||||
|
||||
// used to check DTC signal/slot connection
|
||||
void onReceiveCriteriumChanged(const EvaluationCriterium &data, DataModification modType);
|
||||
|
||||
protected:
|
||||
// Callbackfunctions for FTC
|
||||
void onEvlCriteriumModifyReply(const Core::FunctionReplyObject &replyObject) override final;
|
||||
void onEvlCriteriumRemoveReply(const Core::FunctionReplyObject &replyObject) override final;
|
||||
|
||||
void onEvlElementModifyReply(const Core::FunctionReplyObject &replyObject) override final;
|
||||
void onEvlElementRemoveReply(const Core::FunctionReplyObject &replyObject) override final;
|
||||
|
||||
void onSanNineLinerModifyReply(const Core::FunctionReplyObject &replyObject) override final;
|
||||
void onSanNineLinerRemoveReply(const Core::FunctionReplyObject &replyObject) override final;
|
||||
|
||||
private Q_SLOTS:
|
||||
bool onCompareCreatedData(EvaluationCriterium &data);
|
||||
bool onCompareCreatedData(SanNineLiner &data);
|
||||
|
||||
private:
|
||||
void getCriteriumModifyRequestData(EvlCriteriumModifyRequest &data);
|
||||
void getSanNineLinerModifyRequestData(SanNineLinerModifyRequest &data);
|
||||
void failExit();
|
||||
|
||||
private:
|
||||
std::shared_ptr<DDSConnector::DdsConnector> m_ddsConnector;
|
||||
std::shared_ptr<Evaluations::Interface::Ftc> m_ftc;
|
||||
std::shared_ptr<Evaluations::Interface::Dtc> m_dtc;
|
||||
|
||||
int m_exerciseId = 0;
|
||||
int m_testId = 0;
|
||||
int m_operatorId = 0;
|
||||
int m_criteriumId = 0;
|
||||
int m_elementId = 0;
|
||||
int m_sanNineLinerId = 0;
|
||||
|
||||
enum TestStep
|
||||
{
|
||||
eUnknown,
|
||||
eCreateCriterium,
|
||||
eModifyCriterium,
|
||||
eRemoveCriterium,
|
||||
eGetAllCriteria,
|
||||
eGetCriterium,
|
||||
eCreateElement,
|
||||
eModifyElement,
|
||||
eRemoveElement,
|
||||
eCreateSanNineLiner,
|
||||
eModifySanNineLiner,
|
||||
eRemoveSanNineLiner,
|
||||
eGetSanNineLiner
|
||||
}
|
||||
m_eTestStep = eUnknown;
|
||||
|
||||
bool m_bTestsSuccessful = true;
|
||||
NGL::INGLLogger &m_logger;
|
||||
|
||||
};
|
||||
|
||||
} // namespace Evaluations
|
||||
Reference in new issue
Block a user