Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

do not hold a pointer to an QGraphicsItem within a QGraphicsItem #30275

Closed
wants to merge 1 commit into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@




class QgsAdvancedDigitizingCanvasItem : QgsMapCanvasItem
{
%Docstring
Expand All @@ -25,8 +26,6 @@ The QgsAdvancedDigitizingCanvasItem class draws the graphical elements of the CA
virtual void paint( QPainter *painter );


protected:

};

/************************************************************************
Expand Down
12 changes: 0 additions & 12 deletions src/gui/qgsadvanceddigitizingcanvasitem.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,6 @@ QgsAdvancedDigitizingCanvasItem::QgsAdvancedDigitizingCanvasItem( QgsMapCanvas *
, mSnapPen( QPen( QColor( 127, 0, 0, 150 ), 1 ) )
, mSnapLinePen( QPen( QColor( 127, 0, 0, 150 ), 1, Qt::DashLine ) )
, mCursorPen( QPen( QColor( 127, 127, 127, 255 ), 1 ) )
, mSnapIndicator( qgis::make_unique< QgsSnapIndicator>( canvas ) )
, mAdvancedDigitizingDockWidget( cadDockWidget )
{
}
Expand Down Expand Up @@ -253,15 +252,4 @@ void QgsAdvancedDigitizingCanvasItem::paint( QPainter *painter )
painter->drawLine( curPointPix + QPointF( -5, +5 ),
curPointPix + QPointF( +5, -5 ) );
}


QgsPointLocator::Match match = mAdvancedDigitizingDockWidget->mapPointMatch();
if ( match.isValid() )
{
mSnapIndicator->setMatch( match );
mSnapIndicator->setVisible( true );
}
else
mSnapIndicator->setVisible( false );

}
8 changes: 2 additions & 6 deletions src/gui/qgsadvanceddigitizingcanvasitem.h
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@

#include "qgsmapcanvasitem.h"
#include "qgis_gui.h"
#include "qgssnapindicator.h"


class QgsAdvancedDigitizingDockWidget;

Expand All @@ -35,17 +35,13 @@ class GUI_EXPORT QgsAdvancedDigitizingCanvasItem : public QgsMapCanvasItem

void paint( QPainter *painter ) override;

protected:
private:
QPen mLockedPen;
QPen mConstruction1Pen;
QPen mConstruction2Pen;
QPen mSnapPen;
QPen mSnapLinePen;
QPen mCursorPen;
//! Snapping indicators
std::unique_ptr<QgsSnapIndicator> mSnapIndicator;

private:
QgsAdvancedDigitizingDockWidget *mAdvancedDigitizingDockWidget = nullptr;
};

Expand Down
12 changes: 12 additions & 0 deletions src/gui/qgsadvanceddigitizingdockwidget.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@
QgsAdvancedDigitizingDockWidget::QgsAdvancedDigitizingDockWidget( QgsMapCanvas *canvas, QWidget *parent )
: QgsDockWidget( parent )
, mMapCanvas( canvas )
, mSnapIndicator( qgis::make_unique< QgsSnapIndicator>( canvas ) )
, mCommonAngleConstraint( QgsSettings().value( QStringLiteral( "/Cad/CommonAngle" ), 90 ).toDouble() )
{
setupUi( this );
Expand Down Expand Up @@ -670,6 +671,17 @@ bool QgsAdvancedDigitizingDockWidget::applyConstraints( QgsMapMouseEvent *e )
e->setMapPoint( point );

mSnapMatch = context.snappingUtils->snapToMap( point );

if ( mSnapMatch.isValid() )
{
mSnapIndicator->setMatch( mSnapMatch );
mSnapIndicator->setVisible( true );
}
else
{
mSnapIndicator->setVisible( false );
}

/*
* Constraints are applied in 2D, they are always called when using the tool
* but they do not take into account if when you snap on a vertex it has
Expand Down
3 changes: 3 additions & 0 deletions src/gui/qgsadvanceddigitizingdockwidget.h
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@
#include "qgsmessagebaritem.h"
#include "qgspointxy.h"
#include "qgspointlocator.h"
#include "qgssnapindicator.h"


class QgsAdvancedDigitizingCanvasItem;
Expand Down Expand Up @@ -702,6 +703,8 @@ class GUI_EXPORT QgsAdvancedDigitizingDockWidget : public QgsDockWidget, private

QgsMapCanvas *mMapCanvas = nullptr;
QgsAdvancedDigitizingCanvasItem *mCadPaintItem = nullptr;
//! Snapping indicator
std::unique_ptr<QgsSnapIndicator> mSnapIndicator;

CadCapacities mCapacities = nullptr;

Expand Down