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>
117 lines
3.8 KiB
C++
117 lines
3.8 KiB
C++
/**
|
|
**
|
|
** @RDE_HEADER@
|
|
** Implementation of base class for 3d rubberbands
|
|
** $Id$
|
|
** $HeadURL$
|
|
** $Author$
|
|
**
|
|
** -----------------------------------------------------------------------------------------------
|
|
**
|
|
** Hardware-Environment: Intel-PC
|
|
** Software-Environment: Windows 7, Qt 5.4. ArcGIS 10.2.5
|
|
**
|
|
** Language ........: C++ 11
|
|
**
|
|
** -----------------------------------------------------------------------------------------------
|
|
**
|
|
** Author ...........: Jörg Turla, SPD G, Tel. 3132
|
|
**
|
|
** -----------------------------------------------------------------------------------------------
|
|
**
|
|
** Notes .........:
|
|
**
|
|
** 27.03.2015, JT : First edition for use with Qt5
|
|
**
|
|
** -----------------------------------------------------------------------------------------------
|
|
*/
|
|
|
|
|
|
#include "rubberband_3d.h"
|
|
|
|
#include <Map/map.h>
|
|
|
|
#include <QtGui/QPainter>
|
|
|
|
namespace SituationMap
|
|
{
|
|
|
|
|
|
namespace RB
|
|
{
|
|
|
|
Rubberband3D::Rubberband3D( SituationMap::Map * map, QObject * parent, bool isActive )
|
|
: RubberbandBase(map,parent,isActive), _markerPixmap(nullptr), _markerSelectionPixmap(nullptr)
|
|
{
|
|
} // Rubberband3D::Rubberband3D( SituationMap::Map * map, QObject * parent, bool isActive )
|
|
|
|
|
|
Rubberband3D::~Rubberband3D()
|
|
{
|
|
delete _markerPixmap;
|
|
delete _markerSelectionPixmap;
|
|
} // Rubberband3D::~Rubberband3D()
|
|
|
|
|
|
void Rubberband3D::resetAction( AbstractEventDispatcher*,int,int ) {;}
|
|
bool Rubberband3D::selectAction( AbstractEventDispatcher*,int,int ) { return false; }
|
|
bool Rubberband3D::multiSelectActionPress ( AbstractEventDispatcher*,int,int ) { return false; }
|
|
bool Rubberband3D::multiSelectActionRelease( AbstractEventDispatcher*,int,int ) { return false; }
|
|
bool Rubberband3D::setCoordinateAction( AbstractEventDispatcher*,int,int ) { return false; }
|
|
bool Rubberband3D::moveAction( AbstractEventDispatcher*,int,int ) { return false; }
|
|
bool Rubberband3D::movePickedAction( AbstractEventDispatcher*,int,int ) { return false; }
|
|
bool Rubberband3D::contextMenuAction( AbstractEventDispatcher*,int,int ) { return false; }
|
|
bool Rubberband3D::completeStateAction( AbstractEventDispatcher*,int,int ) { return false; }
|
|
bool Rubberband3D::deleteAction( AbstractEventDispatcher*,int,int ) { return false; }
|
|
bool Rubberband3D::undoAction( AbstractEventDispatcher*,int,int ) { return false; }
|
|
|
|
|
|
QRectF Rubberband3D::sceneBbox() const { return QRectF(); }
|
|
|
|
|
|
#include "sphere_pattern.xpm"
|
|
|
|
QImage Rubberband3D::markerSelectionImage()
|
|
{
|
|
if (nullptr == _markerSelectionPixmap)
|
|
{
|
|
_markerSelectionPixmap = new QPixmap( sphere_pattern_xpm );
|
|
|
|
QPainter painter(_markerSelectionPixmap);
|
|
QBrush brush;
|
|
|
|
brush.setStyle(Qt::BrushStyle::SolidPattern);
|
|
brush.setColor(_handleSelectionColor);
|
|
|
|
painter.setCompositionMode(QPainter::CompositionMode::CompositionMode_Multiply);
|
|
painter.setPen(_handleDrawColor);
|
|
painter.setBrush(brush);
|
|
painter.drawEllipse( 0, 0, _markerSelectionPixmap->width(), _markerSelectionPixmap->height() );
|
|
}
|
|
return _markerSelectionPixmap->toImage();
|
|
} // QImage Rubberband3D::markerSelectionImage()
|
|
|
|
|
|
QImage Rubberband3D::markerImage()
|
|
{
|
|
if (nullptr == _markerPixmap)
|
|
{
|
|
_markerPixmap = new QPixmap( sphere_pattern_xpm );
|
|
|
|
QPainter painter(_markerPixmap);
|
|
QBrush brush;
|
|
|
|
brush.setStyle(Qt::BrushStyle::SolidPattern);
|
|
brush.setColor(_handleFillColor);
|
|
|
|
painter.setCompositionMode(QPainter::CompositionMode::CompositionMode_Multiply);
|
|
painter.setPen(_handleDrawColor);
|
|
painter.setBrush(brush);
|
|
painter.drawEllipse( 0, 0, _markerPixmap->width(), _markerPixmap->height() );
|
|
}
|
|
return _markerPixmap->toImage();
|
|
} // QImage Rubberband3D::markerImage()
|
|
|
|
|
|
} } /* namespace SituationMap::RB */
|