From ae7321b930b6c1a5cd8e94636f583aa1c9214958 Mon Sep 17 00:00:00 2001 From: Nyall Dawson Date: Fri, 26 Jul 2024 09:19:50 +1000 Subject: [PATCH] Fix merge --- .../annotations/qgsannotationpictureitem.sip.in | 6 +++--- .../annotations/qgsannotationpictureitem.sip.in | 6 +++--- src/core/annotations/qgsannotationpictureitem.cpp | 10 +++++----- src/core/annotations/qgsannotationpictureitem.h | 6 +++--- 4 files changed, 14 insertions(+), 14 deletions(-) diff --git a/python/PyQt6/core/auto_generated/annotations/qgsannotationpictureitem.sip.in b/python/PyQt6/core/auto_generated/annotations/qgsannotationpictureitem.sip.in index 8d07739e8ae7..7c3dcf430700 100644 --- a/python/PyQt6/core/auto_generated/annotations/qgsannotationpictureitem.sip.in +++ b/python/PyQt6/core/auto_generated/annotations/qgsannotationpictureitem.sip.in @@ -37,11 +37,11 @@ within the specified ``bounds`` geometry. virtual bool writeXml( QDomElement &element, QDomDocument &document, const QgsReadWriteContext &context ) const; - virtual QList< QgsAnnotationItemNode > nodes() const; + virtual QList< QgsAnnotationItemNode > nodesV2( const QgsAnnotationItemEditContext &context ) const; - virtual Qgis::AnnotationItemEditOperationResult applyEdit( QgsAbstractAnnotationItemEditOperation *operation ); + virtual Qgis::AnnotationItemEditOperationResult applyEditV2( QgsAbstractAnnotationItemEditOperation *operation, const QgsAnnotationItemEditContext &context ); - virtual QgsAnnotationItemEditOperationTransientResults *transientEditResults( QgsAbstractAnnotationItemEditOperation *operation ) /Factory/; + virtual QgsAnnotationItemEditOperationTransientResults *transientEditResultsV2( QgsAbstractAnnotationItemEditOperation *operation, const QgsAnnotationItemEditContext &context ) /Factory/; static QgsAnnotationPictureItem *create() /Factory/; diff --git a/python/core/auto_generated/annotations/qgsannotationpictureitem.sip.in b/python/core/auto_generated/annotations/qgsannotationpictureitem.sip.in index 8d07739e8ae7..7c3dcf430700 100644 --- a/python/core/auto_generated/annotations/qgsannotationpictureitem.sip.in +++ b/python/core/auto_generated/annotations/qgsannotationpictureitem.sip.in @@ -37,11 +37,11 @@ within the specified ``bounds`` geometry. virtual bool writeXml( QDomElement &element, QDomDocument &document, const QgsReadWriteContext &context ) const; - virtual QList< QgsAnnotationItemNode > nodes() const; + virtual QList< QgsAnnotationItemNode > nodesV2( const QgsAnnotationItemEditContext &context ) const; - virtual Qgis::AnnotationItemEditOperationResult applyEdit( QgsAbstractAnnotationItemEditOperation *operation ); + virtual Qgis::AnnotationItemEditOperationResult applyEditV2( QgsAbstractAnnotationItemEditOperation *operation, const QgsAnnotationItemEditContext &context ); - virtual QgsAnnotationItemEditOperationTransientResults *transientEditResults( QgsAbstractAnnotationItemEditOperation *operation ) /Factory/; + virtual QgsAnnotationItemEditOperationTransientResults *transientEditResultsV2( QgsAbstractAnnotationItemEditOperation *operation, const QgsAnnotationItemEditContext &context ) /Factory/; static QgsAnnotationPictureItem *create() /Factory/; diff --git a/src/core/annotations/qgsannotationpictureitem.cpp b/src/core/annotations/qgsannotationpictureitem.cpp index 7acca011d0dd..72f00bb5ba00 100644 --- a/src/core/annotations/qgsannotationpictureitem.cpp +++ b/src/core/annotations/qgsannotationpictureitem.cpp @@ -228,7 +228,7 @@ bool QgsAnnotationPictureItem::writeXml( QDomElement &element, QDomDocument &doc return true; } -QList QgsAnnotationPictureItem::nodes() const +QList QgsAnnotationPictureItem::nodesV2( const QgsAnnotationItemEditContext & ) const { switch ( mSizeMode ) { @@ -250,7 +250,7 @@ QList QgsAnnotationPictureItem::nodes() const BUILTIN_UNREACHABLE } -Qgis::AnnotationItemEditOperationResult QgsAnnotationPictureItem::applyEdit( QgsAbstractAnnotationItemEditOperation *operation ) +Qgis::AnnotationItemEditOperationResult QgsAnnotationPictureItem::applyEditV2( QgsAbstractAnnotationItemEditOperation *operation, const QgsAnnotationItemEditContext & ) { switch ( operation->type() ) { @@ -321,7 +321,7 @@ Qgis::AnnotationItemEditOperationResult QgsAnnotationPictureItem::applyEdit( Qgs return Qgis::AnnotationItemEditOperationResult::Invalid; } -QgsAnnotationItemEditOperationTransientResults *QgsAnnotationPictureItem::transientEditResults( QgsAbstractAnnotationItemEditOperation *operation ) +QgsAnnotationItemEditOperationTransientResults *QgsAnnotationPictureItem::transientEditResultsV2( QgsAbstractAnnotationItemEditOperation *operation, const QgsAnnotationItemEditContext &context ) { switch ( operation->type() ) { @@ -358,7 +358,7 @@ QgsAnnotationItemEditOperationTransientResults *QgsAnnotationPictureItem::transi } case Qgis::AnnotationPictureSizeMode::FixedSize: { - const QgsRectangle currentBounds = operation->currentItemBounds(); + const QgsRectangle currentBounds = context.currentItemBounds(); const QgsRectangle newBounds = QgsRectangle::fromCenterAndSize( moveOperation->after(), currentBounds.width(), currentBounds.height() ); return new QgsAnnotationItemEditOperationTransientResults( QgsGeometry::fromRect( newBounds ) ); } @@ -382,7 +382,7 @@ QgsAnnotationItemEditOperationTransientResults *QgsAnnotationPictureItem::transi case Qgis::AnnotationPictureSizeMode::FixedSize: { - const QgsRectangle currentBounds = operation->currentItemBounds(); + const QgsRectangle currentBounds = context.currentItemBounds(); const QgsRectangle newBounds = QgsRectangle::fromCenterAndSize( mBounds.center() + QgsVector( moveOperation->translationX(), moveOperation->translationY() ), currentBounds.width(), currentBounds.height() ); return new QgsAnnotationItemEditOperationTransientResults( QgsGeometry::fromRect( newBounds ) ); diff --git a/src/core/annotations/qgsannotationpictureitem.h b/src/core/annotations/qgsannotationpictureitem.h index 628fa087f6ed..c8b33aeb7165 100644 --- a/src/core/annotations/qgsannotationpictureitem.h +++ b/src/core/annotations/qgsannotationpictureitem.h @@ -43,9 +43,9 @@ class CORE_EXPORT QgsAnnotationPictureItem : public QgsAnnotationItem Qgis::AnnotationItemFlags flags() const override; void render( QgsRenderContext &context, QgsFeedback *feedback ) override; bool writeXml( QDomElement &element, QDomDocument &document, const QgsReadWriteContext &context ) const override; - QList< QgsAnnotationItemNode > nodes() const override; - Qgis::AnnotationItemEditOperationResult applyEdit( QgsAbstractAnnotationItemEditOperation *operation ) override; - QgsAnnotationItemEditOperationTransientResults *transientEditResults( QgsAbstractAnnotationItemEditOperation *operation ) override SIP_FACTORY; + QList< QgsAnnotationItemNode > nodesV2( const QgsAnnotationItemEditContext &context ) const override; + Qgis::AnnotationItemEditOperationResult applyEditV2( QgsAbstractAnnotationItemEditOperation *operation, const QgsAnnotationItemEditContext &context ) override; + QgsAnnotationItemEditOperationTransientResults *transientEditResultsV2( QgsAbstractAnnotationItemEditOperation *operation, const QgsAnnotationItemEditContext &context ) override SIP_FACTORY; /** * Creates a new polygon annotation item.