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>
62 lines
1.6 KiB
C++
Executable File
62 lines
1.6 KiB
C++
Executable File
/**
|
|
* Marker object
|
|
* $Id$
|
|
* $HeadURL$
|
|
* $Author$
|
|
* Created by hjl, SLSE, 2016-04-12
|
|
*/
|
|
|
|
#pragma once
|
|
|
|
#include "dds_handler.h"
|
|
#include "mrk_db.h"
|
|
#include <DDS/Core/function_reply_object.h>
|
|
|
|
// Generated
|
|
#include <MarkerManagement/mrk_db.h>
|
|
|
|
namespace MarkerManagement
|
|
{
|
|
|
|
class ObjectMarker final
|
|
{
|
|
public:
|
|
explicit ObjectMarker(const std::shared_ptr<DdsHandler> &ddsHandler,
|
|
const std::shared_ptr<DatabaseInterface> &db);
|
|
|
|
~ObjectMarker();
|
|
|
|
Core::FunctionReplyObject createObject(const Marker &data);
|
|
Core::FunctionReplyObject updateObject(const Marker &data);
|
|
Core::FunctionReplyObject removeObject();
|
|
|
|
Core::FunctionReplyObject setUsed(bool isUsed);
|
|
|
|
qint32 getId() const { return m_dataMarkerObject.id(); }
|
|
Marker getData() const { return m_dataMarkerObject; }
|
|
QString getName() const { return QString::fromStdString(m_dataMarkerObject.name()); }
|
|
|
|
bool isValid() const;
|
|
bool isUsed() const;
|
|
|
|
|
|
// convert methods
|
|
static Database::MrkMarker toDbData(const Marker &ddsData); // dds -> db
|
|
static Marker toDdsData(const Database::MrkMarker &dbData); // db -> dds
|
|
|
|
static Database::MrkMarkerDescription toDbData(const MarkerDescription &ddsData); // dds -> db
|
|
static MarkerDescription toDdsData(const Database::MrkMarkerDescription &dbData); // db -> dds
|
|
|
|
private:
|
|
void onPublishData();
|
|
|
|
private:
|
|
std::shared_ptr<DdsHandler> m_ddsHandler;
|
|
std::shared_ptr<DatabaseInterface> m_db;
|
|
Marker m_dataMarkerObject;
|
|
|
|
NGL::INGLLogger &m_logger;
|
|
|
|
};
|
|
} // namespace MarkerManagement
|