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>
73 lines
2.2 KiB
C++
73 lines
2.2 KiB
C++
/**
|
|
**
|
|
** @RDE_HEADER@
|
|
** Definition of ellipse drawable
|
|
** $Id$
|
|
** $HeadURL$
|
|
** $Author$
|
|
*/
|
|
|
|
#pragma once
|
|
|
|
|
|
#include "rubberband_drawable.h"
|
|
|
|
#include <arcgis/Map.h>
|
|
|
|
|
|
namespace SituationMap { namespace RB
|
|
{
|
|
class DrawableEllipse : public RubberbandDrawable
|
|
{
|
|
Q_OBJECT
|
|
public:
|
|
|
|
explicit DrawableEllipse( Esri::ArcGISRuntime::MapGraphicsView * );
|
|
explicit DrawableEllipse( Esri::ArcGISRuntime::MapGraphicsView *, QGraphicsScene * );
|
|
~DrawableEllipse();
|
|
|
|
DrawableEllipse(const RubberbandDrawable &) = delete;
|
|
DrawableEllipse & operator = (const RubberbandDrawable &) = delete;
|
|
|
|
|
|
inline void setRect(const QPointF & center, qreal radiusX, qreal radiusY, qreal sin, qreal cos, const QPointF & sectorStart = QPointF(), const QPointF & sectorEnd = QPointF() )
|
|
{
|
|
// p1,p2 = corner points of unrotated ellipse in scene coordinates
|
|
_center = RubberbandCoordinate( _mapView, convert(center, _mapView->map()->spatialReference()) );
|
|
_radiusX = radiusX;
|
|
_radiusY = radiusY;
|
|
|
|
_sinRect = sin;
|
|
_cosRect = cos;
|
|
|
|
_sectorStart = sectorStart;
|
|
_sectorEnd = sectorEnd;
|
|
updateGraphic();
|
|
}
|
|
|
|
qreal radiusX() { return _radiusX; }
|
|
qreal radiusY() { return _radiusY; }
|
|
|
|
protected:
|
|
|
|
QGraphicsEllipseItem * _elliItem;
|
|
QGraphicsEllipseItem * _sectItem;
|
|
RubberbandDrawable::RubberbandCoordinate _center;
|
|
qreal _radiusX;
|
|
qreal _radiusY;
|
|
QPen _elliStyle;
|
|
qreal _sinRect;
|
|
qreal _cosRect;
|
|
QPointF _sectorStart;
|
|
QPointF _sectorEnd;
|
|
|
|
void updateGraphic() override;
|
|
|
|
|
|
void adjustCoordinates() override;
|
|
void adjustWindow( const QRectF& ) override;
|
|
|
|
}; /* DrawableEllipse */
|
|
|
|
} } /* namespace SituationMap::RB */
|