torstenandCopilot
7173785915
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>
124 lines
3.4 KiB
C++
124 lines
3.4 KiB
C++
/**
|
|
* @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 <WarehouseGuez/whg_ftc.h>
|
|
#include <WarehouseGuez/whg_ftc_types.h>
|
|
#include <WarehouseGuez/whg_dtc.h>
|
|
#include <WarehouseGuez/whg_dtc_types.h>
|
|
#include <WarehouseGuez/logger.h>
|
|
|
|
#include <DDS/DDSConnector/dds_connector.h>
|
|
|
|
#include <QtWebSockets/QWebSocket>
|
|
|
|
namespace WarehouseGuez
|
|
{
|
|
class WhgTests : public QObject
|
|
, protected WarehouseGuez::Interface::Ftc::ModifyEquipmentTypeWhReplyHandler
|
|
, protected WarehouseGuez::Interface::Ftc::RemoveEquipmentTypeWhReplyHandler
|
|
, protected WarehouseGuez::Interface::Ftc::ModifyInjuryModelAgdusWhReplyHandler
|
|
, protected WarehouseGuez::Interface::Ftc::RemoveInjuryModelAgdusWhReplyHandler
|
|
{
|
|
Q_OBJECT
|
|
public:
|
|
explicit WhgTests(QObject *parent = nullptr);
|
|
~WhgTests();
|
|
|
|
bool init(int domainId, int testId, int eqtTypeWhId, int injuryModelWhId, int equipNo, int boxId);
|
|
bool testsSuccessful() const { return m_bTestsSuccessful; }
|
|
|
|
public Q_SLOTS:
|
|
void startTest();
|
|
|
|
protected Q_SLOTS:
|
|
// used to check FTC
|
|
void tryCreate();
|
|
void tryModify();
|
|
void tryRemove();
|
|
|
|
void tryCreateInjuryModel();
|
|
void tryModifyInjuryModel();
|
|
void tryRemoveInjuryModel();
|
|
|
|
// used to check DTC
|
|
void tryGetAllEquipmentTypesWh();
|
|
void tryGetEquipmentTypeWh();
|
|
|
|
void tryGetBiteData();
|
|
|
|
void onReceiveEqtTypeChanged(const WarehouseGuez::EquipmentTypeWh &data, DataModification modType);
|
|
|
|
protected:
|
|
// Callbackfunctions for FTC
|
|
void onModifyEquipmentTypeWhReply(const Core::FunctionReplyObject &replyObject) override final;
|
|
void onRemoveEquipmentTypeWhReply(const Core::FunctionReplyObject &replyObject) override final;
|
|
|
|
void onModifyInjuryModelAgdusWhReply(const Core::FunctionReplyObject &replyObject) override final;
|
|
void onRemoveInjuryModelAgdusWhReply(const Core::FunctionReplyObject &replyObject) override final;
|
|
|
|
private Q_SLOTS:
|
|
bool onCompareCreatedData(EquipmentTypeWh &data);
|
|
bool onCompareModifiedData(EquipmentTypeWh &data);
|
|
bool onCompareCreatedData(InjuryModelAgdusWh &data);
|
|
bool onCompareModifiedData(InjuryModelAgdusWh &data);
|
|
|
|
void onConnected();
|
|
void onTextMessageReceived(const QString &msg);
|
|
|
|
private:
|
|
void getEqtTypeWhCreateRequestData(EquipmentTypeWh &data);
|
|
void getEqtTypeWhModifyRequestData(EquipmentTypeWh &data);
|
|
void getInjuryModelWhCreateRequestData(InjuryModelAgdusWh &data);
|
|
void getInjuryModelWhModifyRequestData(InjuryModelAgdusWh &data);
|
|
void failExit();
|
|
|
|
private:
|
|
std::shared_ptr<DDSConnector::DdsConnector> m_ddsConnector;
|
|
std::shared_ptr<WarehouseGuez::Interface::Ftc> m_ftc;
|
|
std::shared_ptr<WarehouseGuez::Interface::Dtc> m_dtc;
|
|
QWebSocket m_wsClient;
|
|
int m_testId;
|
|
int m_equipmentTypeWhId;
|
|
int m_injuryModelWhId;
|
|
int m_equipNo;
|
|
int m_boxId;
|
|
|
|
enum TestStep
|
|
{
|
|
eUnknown,
|
|
eCreate,
|
|
eModify,
|
|
eRemove,
|
|
eGetAllEquipmentTypesWh,
|
|
eGetEquipmentTypeWh,
|
|
eCreateInjuryModel,
|
|
eModifyInjuryModel,
|
|
eRemoveInjuryModel
|
|
} m_eTestStep;
|
|
|
|
bool m_bTestsSuccessful;
|
|
NGL::INGLLogger &m_logger;
|
|
|
|
};
|
|
|
|
} // namespace WarehouseGuez
|