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>
69 lines
1.6 KiB
C++
69 lines
1.6 KiB
C++
/**
|
|
* @RDE_HEADER@
|
|
* $Id$
|
|
* $HeadURL$
|
|
* $Author$
|
|
* Created by Philipp Last, SLSY, 2017-09-22
|
|
*/
|
|
|
|
#pragma once
|
|
|
|
#include <QString>
|
|
#include <QJsonObject>
|
|
#include <LtsUtilsCore/qpoint3d.h>
|
|
#include <Common/buildingviewercommon_export.h>
|
|
|
|
namespace BuildingViewer
|
|
{
|
|
struct BuildingTuple
|
|
{
|
|
QString buildingId;
|
|
QString description;
|
|
int entityId = 0;
|
|
bool isShown = false;
|
|
};
|
|
|
|
// merge with BuildingTuple?
|
|
struct BuildingInfo
|
|
{
|
|
QString name;
|
|
LtsUtils::QPoint3D position;
|
|
double angleDegree = 0;
|
|
int id = 0;
|
|
|
|
bool operator==(const BuildingInfo &o) const
|
|
{
|
|
return id == o.id; // id is the key so this is enough
|
|
}
|
|
|
|
static BuildingInfo fromJson(const QJsonObject &obj)
|
|
{
|
|
BuildingInfo ret;
|
|
ret.name = obj[QStringLiteral("name")].toString();
|
|
ret.position.rx() = obj[QStringLiteral("positionX")].toDouble();
|
|
ret.position.ry() = obj[QStringLiteral("positionY")].toDouble();
|
|
ret.position.rz() = obj[QStringLiteral("positionZ")].toDouble();
|
|
ret.angleDegree = obj[QStringLiteral("angleDegree")].toDouble();
|
|
ret.id = obj[QStringLiteral("id")].toInt();
|
|
return ret;
|
|
}
|
|
QJsonObject toJson() const
|
|
{
|
|
return {
|
|
{QStringLiteral("name"), name},
|
|
{QStringLiteral("positionX"), position.x()},
|
|
{QStringLiteral("positionY"), position.y()},
|
|
{QStringLiteral("positionZ"), position.z()},
|
|
{QStringLiteral("angleDegree"), angleDegree},
|
|
{QStringLiteral("id"), id},
|
|
};
|
|
}
|
|
bool isValid() const { return id > 0; }
|
|
};
|
|
|
|
|
|
QString BUILDINGVIEWERCOMMON_EXPORT databaseId2FeatureId(int32_t buildingDatabaseId);
|
|
int32_t BUILDINGVIEWERCOMMON_EXPORT featureId2DatabaseId(const QString& strFeatureId);
|
|
}
|
|
|