Make current item bounds available for annotation edit operations

python/PyQt6/core/auto_generated/annotations/qgsannotationitem.sip.in

@@ -115,18 +115,34 @@ Implementations should include a call to :py:func:`~QgsAnnotationItem.readCommon
 .. seealso:: :py:func:`readCommonProperties`
 %End
 
-    virtual Qgis::AnnotationItemEditOperationResult applyEdit( QgsAbstractAnnotationItemEditOperation *operation );
+ virtual Qgis::AnnotationItemEditOperationResult applyEdit( QgsAbstractAnnotationItemEditOperation *operation ) /Deprecated/;
 %Docstring
 Applies an edit ``operation`` to the item.
 
-.. versionadded:: 3.22
+.. deprecated::
+   QGIS 3.40, use :py:func:`~QgsAnnotationItem.applyEditV2` instead.
 %End
 
-    virtual QgsAnnotationItemEditOperationTransientResults *transientEditResults( QgsAbstractAnnotationItemEditOperation *operation ) /Factory/;
+    virtual Qgis::AnnotationItemEditOperationResult applyEditV2( QgsAbstractAnnotationItemEditOperation *operation, const QgsAnnotationItemEditContext &context );
+%Docstring
+Applies an edit ``operation`` to the item.
+
+.. versionadded:: 3.40
+%End
+
+ virtual QgsAnnotationItemEditOperationTransientResults *transientEditResults( QgsAbstractAnnotationItemEditOperation *operation ) /Factory/;
 %Docstring
 Retrieves the results of a transient (in progress) edit ``operation`` on the item.
 
-.. versionadded:: 3.22
+.. deprecated::
+   QGIS 3.40, use :py:func:`~QgsAnnotationItem.transientEditResultsV2` instead.
+%End
+
+    virtual QgsAnnotationItemEditOperationTransientResults *transientEditResultsV2( QgsAbstractAnnotationItemEditOperation *operation, const QgsAnnotationItemEditContext &context ) /Factory/;
+%Docstring
+Retrieves the results of a transient (in progress) edit ``operation`` on the item.
+
+.. versionadded:: 3.40
 %End
 
     int zIndex() const;
@@ -163,11 +179,19 @@ Sets if the item will be rendered or not in the layer.
 .. versionadded:: 3.36
 %End
 
-    virtual QList< QgsAnnotationItemNode > nodes() const;
+ virtual QList< QgsAnnotationItemNode > nodes() const /Deprecated/;
 %Docstring
 Returns the nodes for the item, used for editing the item.
 
-.. versionadded:: 3.22
+.. deprecated::
+   QGIS 3.40, use :py:func:`~QgsAnnotationItem.nodesV2` instead.
+%End
+
+    virtual QList< QgsAnnotationItemNode > nodesV2( const QgsAnnotationItemEditContext &context ) const;
+%Docstring
+Returns the nodes for the item, used for editing the item.
+
+.. versionadded:: 3.40
 %End
 
     bool useSymbologyReferenceScale() const;

python/PyQt6/core/auto_generated/annotations/qgsannotationitemeditoperation.sip.in

@@ -9,6 +9,37 @@
 
 
 
+class QgsAnnotationItemEditContext
+{
+%Docstring(signature="appended")
+Encapsulates the context for an annotation item edit operation.
+
+.. versionadded:: 3.40
+%End
+
+%TypeHeaderCode
+#include "qgsannotationitemeditoperation.h"
+%End
+  public:
+
+    QgsAnnotationItemEditContext();
+
+    QgsRectangle currentItemBounds() const;
+%Docstring
+Returns the current rendered bounds of the item, in the annotation layer's CRS.
+
+.. seealso:: :py:func:`setCurrentItemBounds`
+%End
+
+    void setCurrentItemBounds( const QgsRectangle &bounds );
+%Docstring
+Sets the current rendered ``bounds`` of the item, in the annotation layer's CRS.
+
+.. seealso:: :py:func:`currentItemBounds`
+%End
+
+};
+
 class QgsAbstractAnnotationItemEditOperation
 {
 %Docstring(signature="appended")

python/PyQt6/core/auto_generated/annotations/qgsannotationlayer.sip.in

@@ -121,13 +121,23 @@ The optional ``feedback`` argument can be used to cancel the search early.
 .. versionadded:: 3.22
 %End
 
-    Qgis::AnnotationItemEditOperationResult applyEdit( QgsAbstractAnnotationItemEditOperation *operation );
+ Qgis::AnnotationItemEditOperationResult applyEdit( QgsAbstractAnnotationItemEditOperation *operation ) /Deprecated/;
 %Docstring
 Applies an edit ``operation`` to the layer.
 
 Returns ``True`` if the operation was successfully applied.
 
-.. versionadded:: 3.22
+.. deprecated::
+   QGIS 3.40 Use :py:func:`~QgsAnnotationLayer.applyEditV2` instead.
+%End
+
+    Qgis::AnnotationItemEditOperationResult applyEditV2( QgsAbstractAnnotationItemEditOperation *operation, const QgsAnnotationItemEditContext &context );
+%Docstring
+Applies an edit ``operation`` to the layer.
+
+Returns ``True`` if the operation was successfully applied.
+
+.. versionadded:: 3.40
 %End
 
     virtual Qgis::MapLayerProperties properties() const;

python/PyQt6/core/auto_generated/annotations/qgsannotationlineitem.sip.in

@@ -35,11 +35,11 @@ Constructor for QgsAnnotationLineItem, with the specified ``curve``.
 
     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 QgsAnnotationLineItem *create() /Factory/;

python/PyQt6/core/auto_generated/annotations/qgsannotationlinetextitem.sip.in

@@ -37,11 +37,11 @@ Constructor for QgsAnnotationLineTextItem, with the specified ``curve`` and ``te
 
     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 QgsAnnotationLineTextItem *create() /Factory/;

python/PyQt6/core/auto_generated/annotations/qgsannotationmarkeritem.sip.in

@@ -36,11 +36,11 @@ Constructor for QgsAnnotationMarkerItem, at the specified ``point``.
 
     virtual Qgis::AnnotationItemFlags flags() 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 QgsAnnotationMarkerItem *create() /Factory/;

python/PyQt6/core/auto_generated/annotations/qgsannotationpointtextitem.sip.in

@@ -51,11 +51,11 @@ Creates a new text at point annotation item.
 
     virtual QgsRectangle boundingBox( QgsRenderContext &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/;
 
 
     QgsPointXY point() const;

python/PyQt6/core/auto_generated/annotations/qgsannotationpolygonitem.sip.in

@@ -35,11 +35,11 @@ Constructor for QgsAnnotationPolygonItem, with the specified ``polygon`` geometr
 
     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 QgsAnnotationPolygonItem *create() /Factory/;

python/core/auto_generated/annotations/qgsannotationitem.sip.in

@@ -115,18 +115,34 @@ Implementations should include a call to :py:func:`~QgsAnnotationItem.readCommon
 .. seealso:: :py:func:`readCommonProperties`
 %End
 
-    virtual Qgis::AnnotationItemEditOperationResult applyEdit( QgsAbstractAnnotationItemEditOperation *operation );
+ virtual Qgis::AnnotationItemEditOperationResult applyEdit( QgsAbstractAnnotationItemEditOperation *operation ) /Deprecated/;
 %Docstring
 Applies an edit ``operation`` to the item.
 
-.. versionadded:: 3.22
+.. deprecated::
+   QGIS 3.40, use :py:func:`~QgsAnnotationItem.applyEditV2` instead.
 %End
 
-    virtual QgsAnnotationItemEditOperationTransientResults *transientEditResults( QgsAbstractAnnotationItemEditOperation *operation ) /Factory/;
+    virtual Qgis::AnnotationItemEditOperationResult applyEditV2( QgsAbstractAnnotationItemEditOperation *operation, const QgsAnnotationItemEditContext &context );
+%Docstring
+Applies an edit ``operation`` to the item.
+
+.. versionadded:: 3.40
+%End
+
+ virtual QgsAnnotationItemEditOperationTransientResults *transientEditResults( QgsAbstractAnnotationItemEditOperation *operation ) /Factory/;
 %Docstring
 Retrieves the results of a transient (in progress) edit ``operation`` on the item.
 
-.. versionadded:: 3.22
+.. deprecated::
+   QGIS 3.40, use :py:func:`~QgsAnnotationItem.transientEditResultsV2` instead.
+%End
+
+    virtual QgsAnnotationItemEditOperationTransientResults *transientEditResultsV2( QgsAbstractAnnotationItemEditOperation *operation, const QgsAnnotationItemEditContext &context ) /Factory/;
+%Docstring
+Retrieves the results of a transient (in progress) edit ``operation`` on the item.
+
+.. versionadded:: 3.40
 %End
 
     int zIndex() const;
@@ -163,11 +179,19 @@ Sets if the item will be rendered or not in the layer.
 .. versionadded:: 3.36
 %End
 
-    virtual QList< QgsAnnotationItemNode > nodes() const;
+ virtual QList< QgsAnnotationItemNode > nodes() const /Deprecated/;
 %Docstring
 Returns the nodes for the item, used for editing the item.
 
-.. versionadded:: 3.22
+.. deprecated::
+   QGIS 3.40, use :py:func:`~QgsAnnotationItem.nodesV2` instead.
+%End
+
+    virtual QList< QgsAnnotationItemNode > nodesV2( const QgsAnnotationItemEditContext &context ) const;
+%Docstring
+Returns the nodes for the item, used for editing the item.
+
+.. versionadded:: 3.40
 %End
 
     bool useSymbologyReferenceScale() const;

python/core/auto_generated/annotations/qgsannotationitemeditoperation.sip.in

@@ -9,6 +9,37 @@
 
 
 
+class QgsAnnotationItemEditContext
+{
+%Docstring(signature="appended")
+Encapsulates the context for an annotation item edit operation.
+
+.. versionadded:: 3.40
+%End
+
+%TypeHeaderCode
+#include "qgsannotationitemeditoperation.h"
+%End
+  public:
+
+    QgsAnnotationItemEditContext();
+
+    QgsRectangle currentItemBounds() const;
+%Docstring
+Returns the current rendered bounds of the item, in the annotation layer's CRS.
+
+.. seealso:: :py:func:`setCurrentItemBounds`
+%End
+
+    void setCurrentItemBounds( const QgsRectangle &bounds );
+%Docstring
+Sets the current rendered ``bounds`` of the item, in the annotation layer's CRS.
+
+.. seealso:: :py:func:`currentItemBounds`
+%End
+
+};
+
 class QgsAbstractAnnotationItemEditOperation
 {
 %Docstring(signature="appended")

python/core/auto_generated/annotations/qgsannotationlayer.sip.in

@@ -121,13 +121,23 @@ The optional ``feedback`` argument can be used to cancel the search early.
 .. versionadded:: 3.22
 %End
 
-    Qgis::AnnotationItemEditOperationResult applyEdit( QgsAbstractAnnotationItemEditOperation *operation );
+ Qgis::AnnotationItemEditOperationResult applyEdit( QgsAbstractAnnotationItemEditOperation *operation ) /Deprecated/;
 %Docstring
 Applies an edit ``operation`` to the layer.
 
 Returns ``True`` if the operation was successfully applied.
 
-.. versionadded:: 3.22
+.. deprecated::
+   QGIS 3.40 Use :py:func:`~QgsAnnotationLayer.applyEditV2` instead.
+%End
+
+    Qgis::AnnotationItemEditOperationResult applyEditV2( QgsAbstractAnnotationItemEditOperation *operation, const QgsAnnotationItemEditContext &context );
+%Docstring
+Applies an edit ``operation`` to the layer.
+
+Returns ``True`` if the operation was successfully applied.
+
+.. versionadded:: 3.40
 %End
 
     virtual Qgis::MapLayerProperties properties() const;

python/core/auto_generated/annotations/qgsannotationlineitem.sip.in

@@ -35,11 +35,11 @@ Constructor for QgsAnnotationLineItem, with the specified ``curve``.
 
     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 QgsAnnotationLineItem *create() /Factory/;

python/core/auto_generated/annotations/qgsannotationlinetextitem.sip.in

@@ -37,11 +37,11 @@ Constructor for QgsAnnotationLineTextItem, with the specified ``curve`` and ``te
 
     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 QgsAnnotationLineTextItem *create() /Factory/;

python/core/auto_generated/annotations/qgsannotationmarkeritem.sip.in

@@ -36,11 +36,11 @@ Constructor for QgsAnnotationMarkerItem, at the specified ``point``.
 
     virtual Qgis::AnnotationItemFlags flags() 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 QgsAnnotationMarkerItem *create() /Factory/;

python/core/auto_generated/annotations/qgsannotationpointtextitem.sip.in

@@ -51,11 +51,11 @@ Creates a new text at point annotation item.
 
     virtual QgsRectangle boundingBox( QgsRenderContext &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/;
 
 
     QgsPointXY point() const;

python/core/auto_generated/annotations/qgsannotationpolygonitem.sip.in

@@ -35,11 +35,11 @@ Constructor for QgsAnnotationPolygonItem, with the specified ``polygon`` geometr
 
     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 QgsAnnotationPolygonItem *create() /Factory/;