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>
99 lines
2.3 KiB
Objective-C
99 lines
2.3 KiB
Objective-C
/**
|
|
**
|
|
** @RDE_HEADER@
|
|
** Definition of internal data of base class for rubberbands
|
|
** $Id$
|
|
** $HeadURL$
|
|
** $Author$
|
|
**
|
|
** -----------------------------------------------------------------------------------------------
|
|
**
|
|
** Hardware-Environment: Intel-PC
|
|
** Software-Environment: Windows 7, Qt 5.4. ArcGIS 10.2.5
|
|
**
|
|
** Language ........: C++ 11
|
|
**
|
|
** -----------------------------------------------------------------------------------------------
|
|
**
|
|
** Author ...........: Joerg Turla, SPD G, Tel. 3132
|
|
**
|
|
** -----------------------------------------------------------------------------------------------
|
|
**
|
|
** Notes .........:
|
|
**
|
|
** 16.06.2015, JT : First edition for use with Qt5
|
|
**
|
|
** -----------------------------------------------------------------------------------------------
|
|
*/
|
|
|
|
#pragma once
|
|
|
|
|
|
#include <QtCore/QList>
|
|
#include <QtCore/QPointer>
|
|
|
|
#include <Common/ref_pointer.h>
|
|
#include <Common/situation_map_logging.h>
|
|
|
|
#include "rubberband.h"
|
|
|
|
#include "rubberband_handle.h"
|
|
#include "rubberband_drawable.h"
|
|
|
|
|
|
class QHBoxLayout;
|
|
class QWidget;
|
|
class QPushButton;
|
|
class QGraphicsScene;
|
|
|
|
|
|
namespace Esri {
|
|
namespace ArcGISRuntime {
|
|
class MapGraphicsView;
|
|
} }
|
|
|
|
|
|
namespace SituationMap
|
|
{
|
|
class Map;
|
|
class CoordTranslationFunctor;
|
|
}
|
|
|
|
namespace SituationMap { namespace RB
|
|
{
|
|
|
|
class RubberbandHandleProxy;
|
|
|
|
/**
|
|
@class Rubberband::InternalData rubberband_internal.h
|
|
@brief Definition of internal data of rubberband base class.
|
|
*/
|
|
struct Rubberband::InternalData
|
|
{
|
|
Q_DISABLE_COPY(InternalData)
|
|
|
|
QPointer<Esri::ArcGISRuntime::MapGraphicsView> _mapView;
|
|
QPointer<QGraphicsScene> _mapScene;
|
|
|
|
QList<SituationMap::RefPointer<RubberbandHandle>> _handleList;
|
|
RubberbandDrawable * _constructionObjectDraw;
|
|
QGraphicsPixmapItem * _connectedPreviewPixmap;
|
|
|
|
|
|
|
|
QPointF _lastClickPosition;
|
|
|
|
QGraphicsPixmapItem * _constrainFailedMarker;
|
|
|
|
LOGGER_T _logger;
|
|
|
|
explicit InternalData( SituationMap::Map * map );
|
|
|
|
~InternalData();
|
|
|
|
void markFailedConstrains( QPoint pos, bool on );
|
|
}; /* InternalData */
|
|
|
|
|
|
} } /* namespace SituationMap::RB */
|