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>
98 lines
2.9 KiB
C++
98 lines
2.9 KiB
C++
/**
|
|
* @RDE_HEADER@
|
|
* Parse building xml file and create MainStructureElementCreateRequest for the data
|
|
* $Id$
|
|
* $HeadURL$
|
|
* $Author$
|
|
* Created by Christian Ehrlicher, SLSE, 2017-02-02
|
|
*/
|
|
#pragma once
|
|
|
|
#include "ism_export.h"
|
|
|
|
#include <QObject>
|
|
#include <QVector>
|
|
#include <InfrastructureManagement/ism_dtc.h>
|
|
#include "logger.h"
|
|
|
|
class QDomElement;
|
|
class QDomDocument;
|
|
namespace InfrastructureManagement
|
|
{
|
|
class ISM_CLIENT_EXPORT ParseBuildingXml : public QObject
|
|
{
|
|
Q_OBJECT
|
|
public:
|
|
struct BuildingMetaInfo
|
|
{
|
|
QString filename;
|
|
Core::GeoPosition geoPosition;
|
|
double rotationAngleDegree = 0;
|
|
};
|
|
|
|
struct Egcu
|
|
{
|
|
int mountpointEgcu = 0;
|
|
QVector<int> rooms;
|
|
};
|
|
|
|
struct SoundArea
|
|
{
|
|
int id{-1};
|
|
std::vector <Core::GeoPosition> geometry ;
|
|
int mainEgcuMountpoint{-1};
|
|
std::vector <int> egcuMountpoints;
|
|
};
|
|
|
|
ParseBuildingXml(const QString &xmlFilename,
|
|
const QString &vulnerabilityFilename,
|
|
const QString &egcuToRoomFilename,
|
|
const QString &soundAreaFilename,
|
|
const Core::GeoPosition &geoPosition,
|
|
double rotationAngleDegree);
|
|
bool parseXml();
|
|
QString lastError() const { return m_lastError; }
|
|
QVector<BuildingMetaInfo> parseMetaXml(const QString &metaXml) const;
|
|
const MainStructureElementModifyRequest &parsedRequest() const { return m_request; }
|
|
private:
|
|
QDomDocument openXml(const QString &fileName) const;
|
|
void parseXmlInternal();
|
|
Egcu parseEgcu(const QDomElement &domEgcu);
|
|
bool parseXmlEgcus();
|
|
bool parseXmlSoundArea();
|
|
QJsonObject egcusToJson() const;
|
|
QJsonObject soundAreaToJson() const;
|
|
void importFootprint(const QDomElement &parent);
|
|
void importExternalReferences(const QDomElement &parent,
|
|
int parentIdx);
|
|
void importFloors(const QDomElement &parent,
|
|
int parentIdx);
|
|
void importRooms(const QDomElement &parent,
|
|
int parentIdx);
|
|
void tryGetRoomBoundingBox(const QDomElement &subRoomElem, StructureElement &se);
|
|
void addElementToRequest(const StructureElement &se,
|
|
int parentIdx);
|
|
|
|
static InfrastructureManagement::MountingPointType mptFromSubId(int subId);
|
|
StructureElement getStructureElement(const QDomElement &element) const;
|
|
template <typename T>
|
|
QDomElement getChildElement(const T &parent, const QString &childTag, bool bThrow = true) const;
|
|
int getInteger(const QDomElement &element, const QString &attribute) const;
|
|
private:
|
|
QString m_xmlFilename;
|
|
QString m_vulnerabilityFilename;
|
|
QString m_egcuToRoomFilename;
|
|
QString m_soundAreaFilename;
|
|
Core::GeoPosition m_geoPosition;
|
|
double m_rotationAngleDegree;
|
|
MainStructureElementModifyRequest m_request;
|
|
QString m_buildingName;
|
|
QString m_lastError;
|
|
QVector<Egcu> m_egcus;
|
|
SoundArea m_soundArea;
|
|
|
|
LOGGER_T m_logger;
|
|
};
|
|
|
|
} // namespace InfraStructureManagement
|