[layouts] Remove use of QStyleOptionGraphicsItem from QgsLayoutItem API

Turns out the useful methods in QStyleOptionGraphicsItem were deprecated in Qt 5.10. To future protect our API this replaces all public use of QStyleOptionGraphicsItem, so that we're free to revise the internals of how we use QStyleOptionGraphicsItem without breaking the public QGIS API.
qgis · Feb 19, 2018 · 0e3af9c · 0e3af9c
1 parent 9911209
commit 0e3af9c
Show file tree

Hide file tree

Showing 54 changed files with 268 additions and 125 deletions.
diff --git a/python/core/layout/qgslayoutframe.sip.in b/python/core/layout/qgslayoutframe.sip.in
@@ -118,7 +118,7 @@ Returns whether the frame is empty.
 
   protected:
 
-    virtual void draw( QgsRenderContext &context, const QStyleOptionGraphicsItem *itemStyle = 0 );
+    virtual void draw( QgsLayoutItemRenderContext &context );
 
     virtual void drawFrame( QgsRenderContext &context );
 

diff --git a/python/core/layout/qgslayoutitem.sip.in b/python/core/layout/qgslayoutitem.sip.in
@@ -9,10 +9,64 @@
 
 
 
+
+class QgsLayoutItemRenderContext
+{
+%Docstring
+Contains settings and helpers relating to a render of a QgsLayoutItem.
+
+.. versionadded:: 3.0
+%End
+
+%TypeHeaderCode
+#include "qgslayoutitem.h"
+%End
+  public:
+
+    QgsLayoutItemRenderContext( QgsRenderContext &context, double viewScaleFactor = 1.0 );
+%Docstring
+Constructor for QgsLayoutItemRenderContext.
+
+The ``renderContext`` parameter specifies a QgsRenderContext for use within
+the QgsLayoutItemRenderContext.
+
+The ``viewScaleFactor`` gives the current view zoom (scale factor). It can be
+used to scale render graphics so that they always appear a constant size,
+regardless of the current view zoom.
+%End
+
+
+
+    QgsRenderContext &renderContext();
+%Docstring
+Returns a reference to the context's render context.
+
+Note that the context's painter has been scaled so that painter units are pixels.
+Use the QgsRenderContext methods to convert from millimeters or other units to the painter's units.
+%End
+
+
+    double viewScaleFactor() const;
+%Docstring
+Returns the current view zoom (scale factor). It can be
+used to scale render graphics so that they always appear a constant size,
+regardless of the current view zoom.
+
+E.g. a value of 0.5 indicates that the view is zoomed out to 50% size, so rendered
+items must be scaled by 200% in order to have a constant visible size. A value
+of 2.0 indicates that the view is zoomed in 200%, so rendered items must be
+scaled by 50% in order to have a constant visible size.
+%End
+
+  private:
+    QgsLayoutItemRenderContext( const QgsLayoutItemRenderContext &rh );
+};
+
+
 class QgsLayoutItem : QgsLayoutObject, QGraphicsRectItem, QgsLayoutUndoObjectInterface
 {
 %Docstring
- Base class for graphical items within a QgsLayout.
+ Base class for graphical items within a :py:class:`QgsLayout`.
 
 .. versionadded:: 3.0
 %End
@@ -939,9 +993,10 @@ painter.
 :param painter: destination QPainter
 %End
 
-    virtual void draw( QgsRenderContext &context, const QStyleOptionGraphicsItem *itemStyle = 0 ) = 0;
+    virtual void draw( QgsLayoutItemRenderContext &context ) = 0;
 %Docstring
-Draws the item's contents using the specified render ``context``.
+Draws the item's contents using the specified item render ``context``.
+
 Note that the context's painter has been scaled so that painter units are pixels.
 Use the QgsRenderContext methods to convert from millimeters or other units to the painter's units.
 %End

diff --git a/python/core/layout/qgslayoutitemgroup.sip.in b/python/core/layout/qgslayoutitemgroup.sip.in
@@ -73,7 +73,7 @@ Returns a list of items contained by the group.
 
 
   protected:
-    virtual void draw( QgsRenderContext &context, const QStyleOptionGraphicsItem *itemStyle = 0 );
+    virtual void draw( QgsLayoutItemRenderContext &context );
 
     virtual bool writePropertiesToElement( QDomElement &parentElement, QDomDocument &document, const QgsReadWriteContext &context ) const;
 

diff --git a/python/core/layout/qgslayoutitemhtml.sip.in b/python/core/layout/qgslayoutitemhtml.sip.in
@@ -222,8 +222,8 @@ Returns whether user stylesheets are enabled for the HTML content.
 
     virtual QSizeF totalSize() const;
 
-     virtual void render( QgsRenderContext &context, const QRectF &renderExtent, int frameIndex,
+    virtual void render( QgsLayoutItemRenderContext &context, const QRectF &renderExtent, int frameIndex );
-                 const QStyleOptionGraphicsItem *itemStyle = 0 );
+
 
     virtual double findNearbyPageBreak( double yPos );
 

diff --git a/python/core/layout/qgslayoutitemlabel.sip.in b/python/core/layout/qgslayoutitemlabel.sip.in
@@ -233,7 +233,7 @@ Returns the label font color.
 
 
   protected:
-    virtual void draw( QgsRenderContext &context, const QStyleOptionGraphicsItem *itemStyle = 0 );
+    virtual void draw( QgsLayoutItemRenderContext &context );
 
     virtual bool writePropertiesToElement( QDomElement &element, QDomDocument &document, const QgsReadWriteContext &context ) const;
 

diff --git a/python/core/layout/qgslayoutitemlegend.sip.in b/python/core/layout/qgslayoutitemlegend.sip.in
@@ -495,7 +495,7 @@ Returns the legend's renderer settings object.
 
 
   protected:
-    virtual void draw( QgsRenderContext &context, const QStyleOptionGraphicsItem *itemStyle = 0 );
+    virtual void draw( QgsLayoutItemRenderContext &context );
 
     virtual bool writePropertiesToElement( QDomElement &element, QDomDocument &document, const QgsReadWriteContext &context ) const;
 

diff --git a/python/core/layout/qgslayoutitemmap.sip.in b/python/core/layout/qgslayoutitemmap.sip.in
@@ -472,7 +472,7 @@ will be calculated. This can be expensive to calculate, so if they are not requi
 
   protected:
 
-    virtual void draw( QgsRenderContext &context, const QStyleOptionGraphicsItem *itemStyle = 0 );
+    virtual void draw( QgsLayoutItemRenderContext &context );
 
     virtual bool writePropertiesToElement( QDomElement &element, QDomDocument &document, const QgsReadWriteContext &context ) const;
 

diff --git a/python/core/layout/qgslayoutitemnodeitem.sip.in b/python/core/layout/qgslayoutitemnodeitem.sip.in
@@ -125,7 +125,7 @@ Constructor for QgsLayoutNodesItem, attached to the specified ``layout``.
 Constructor for a QgsLayoutNodesItem with the given ``polygon`` nodes, attached to the specified ``layout``.
 %End
 
-    virtual void draw( QgsRenderContext &context, const QStyleOptionGraphicsItem *itemStyle = 0 );
+    virtual void draw( QgsLayoutItemRenderContext &context );
 
 
     virtual bool writePropertiesToElement( QDomElement &element, QDomDocument &document, const QgsReadWriteContext &context ) const;
@@ -145,7 +145,7 @@ Method called in addNode.
 Method called in removeNode.
 %End
 
-    virtual void _draw( QgsRenderContext &context, const QStyleOptionGraphicsItem *itemStyle = 0 ) = 0;
+    virtual void _draw( QgsLayoutItemRenderContext &context, const QStyleOptionGraphicsItem *itemStyle = 0 ) = 0;
 %Docstring
 Method called in paint.
 %End

diff --git a/python/core/layout/qgslayoutitempage.sip.in b/python/core/layout/qgslayoutitempage.sip.in
@@ -105,7 +105,7 @@ page orientation.
 
   protected:
 
-    virtual void draw( QgsRenderContext &context, const QStyleOptionGraphicsItem *itemStyle = 0 );
+    virtual void draw( QgsLayoutItemRenderContext &context );
 
     virtual void drawFrame( QgsRenderContext &context );
 

diff --git a/python/core/layout/qgslayoutitempicture.sip.in b/python/core/layout/qgslayoutitempicture.sip.in
@@ -299,7 +299,7 @@ Is emitted on picture rotation change
 
   protected:
 
-    virtual void draw( QgsRenderContext &context, const QStyleOptionGraphicsItem *itemStyle = 0 );
+    virtual void draw( QgsLayoutItemRenderContext &context );
 
     virtual QSizeF applyItemSizeConstraint( const QSizeF &targetSize );
 

diff --git a/python/core/layout/qgslayoutitempolygon.sip.in b/python/core/layout/qgslayoutitempolygon.sip.in
@@ -68,7 +68,7 @@ Ownership of ``symbol`` is not transferred.
 
     virtual bool _removeNode( const int nodeIndex );
 
-    virtual void _draw( QgsRenderContext &context, const QStyleOptionGraphicsItem *itemStyle = 0 );
+    virtual void _draw( QgsLayoutItemRenderContext &context, const QStyleOptionGraphicsItem *itemStyle = 0 );
 
     virtual void _readXmlStyle( const QDomElement &elmt, const QgsReadWriteContext &context );
 

diff --git a/python/core/layout/qgslayoutitempolyline.sip.in b/python/core/layout/qgslayoutitempolyline.sip.in
@@ -215,7 +215,7 @@ Returns the pen width in millimeters for the stroke of the arrow head.
 
     virtual bool _removeNode( const int nodeIndex );
 
-    virtual void _draw( QgsRenderContext &context, const QStyleOptionGraphicsItem *itemStyle = 0 );
+    virtual void _draw( QgsLayoutItemRenderContext &context, const QStyleOptionGraphicsItem *itemStyle = 0 );
 
     virtual void _readXmlStyle( const QDomElement &elmt, const QgsReadWriteContext &context );
 

diff --git a/python/core/layout/qgslayoutitemscalebar.sip.in b/python/core/layout/qgslayoutitemscalebar.sip.in
@@ -491,7 +491,7 @@ Adjusts the scale bar box size and updates the item.
 
   protected:
 
-    virtual void draw( QgsRenderContext &context, const QStyleOptionGraphicsItem *itemStyle = 0 );
+    virtual void draw( QgsLayoutItemRenderContext &context );
 
     virtual bool writePropertiesToElement( QDomElement &element, QDomDocument &document, const QgsReadWriteContext &context ) const;
 

diff --git a/python/core/layout/qgslayoutitemshape.sip.in b/python/core/layout/qgslayoutitemshape.sip.in
@@ -101,7 +101,7 @@ Returns the corner radius for rounded rectangle corners.
 
   protected:
 
-    virtual void draw( QgsRenderContext &context, const QStyleOptionGraphicsItem *itemStyle = 0 );
+    virtual void draw( QgsLayoutItemRenderContext &context );
 
 
     virtual bool writePropertiesToElement( QDomElement &element, QDomDocument &document, const QgsReadWriteContext &context ) const;

diff --git a/python/core/layout/qgslayoutmultiframe.sip.in b/python/core/layout/qgslayoutmultiframe.sip.in
@@ -144,15 +144,13 @@ the frame size has no minimum in that direction.
 .. seealso:: :py:func:`recalculateFrameRects`
 %End
 
-    virtual void render( QgsRenderContext &context, const QRectF &renderExtent, int frameIndex,
+    virtual void render( QgsLayoutItemRenderContext &context, const QRectF &renderExtent, int frameIndex ) = 0;
-                         const QStyleOptionGraphicsItem *itemStyle = 0 ) = 0;
 %Docstring
 Renders a portion of the multiframe's content into a render ``context``.
 
 :param context: destination render painter
 :param renderExtent: visible extent of content to render into the painter.
 :param frameIndex: frame number for content
-:param itemStyle: item style options for graphics item rendering
 %End
 
     virtual void addFrame( QgsLayoutFrame *frame /Transfer/, bool recalcFrameSizes = true );

diff --git a/python/core/layout/qgslayouttable.sip.in b/python/core/layout/qgslayouttable.sip.in
@@ -515,8 +515,8 @@ Returns the current contents of the table. Excludes header cells.
 
     virtual QSizeF totalSize() const;
 
-     virtual void render( QgsRenderContext &context, const QRectF &renderExtent, int frameIndex,
+    virtual void render( QgsLayoutItemRenderContext &context, const QRectF &renderExtent, int frameIndex );
-                 const QStyleOptionGraphicsItem *itemStyle = 0 );
+
 
   public slots:
 

diff --git a/python/core/symbology/qgssymbol.sip.in b/python/core/symbology/qgssymbol.sip.in
@@ -413,6 +413,10 @@ Constructor for QgsSymbolRenderContext
 
 
     QgsRenderContext &renderContext();
+%Docstring
+Returns a reference to the context's render context.
+%End
+
 
     void setOriginalValueVariable( const QVariant &value );
 %Docstring

diff --git a/src/core/layout/qgslayoutframe.cpp b/src/core/layout/qgslayoutframe.cpp
@@ -157,14 +157,14 @@ void QgsLayoutFrame::cleanup()
   QgsLayoutItem::cleanup();
 }
 
-void QgsLayoutFrame::draw( QgsRenderContext &context, const QStyleOptionGraphicsItem *itemStyle )
+void QgsLayoutFrame::draw( QgsLayoutItemRenderContext &context )
 {
   if ( mMultiFrame )
   {
     //calculate index of frame
     int frameIndex = mMultiFrame->frameIndex( this );
     Q_ASSERT_X( frameIndex >= 0, "QgsLayoutFrame::draw", "Invalid frame index for frame" );
-    mMultiFrame->render( context, mSection, frameIndex, itemStyle );
+    mMultiFrame->render( context, mSection, frameIndex );
   }
 }
 

diff --git a/src/core/layout/qgslayoutframe.h b/src/core/layout/qgslayoutframe.h
@@ -113,7 +113,7 @@ class CORE_EXPORT QgsLayoutFrame: public QgsLayoutItem
 
   protected:
 
-    void draw( QgsRenderContext &context, const QStyleOptionGraphicsItem *itemStyle = nullptr ) override;
+    void draw( QgsLayoutItemRenderContext &context ) override;
     void drawFrame( QgsRenderContext &context ) override;
     void drawBackground( QgsRenderContext &context ) override;
     bool writePropertiesToElement( QDomElement &parentElement, QDomDocument &document, const QgsReadWriteContext &context ) const override;

diff --git a/src/core/layout/qgslayoutitem.cpp b/src/core/layout/qgslayoutitem.cpp
@@ -33,6 +33,14 @@
 
 #define CACHE_SIZE_LIMIT 5000
 
+QgsLayoutItemRenderContext::QgsLayoutItemRenderContext( QgsRenderContext &context, double viewScaleFactor )
+  : mRenderContext( context )
+  , mViewScaleFactor( viewScaleFactor )
+{
+}
+
+
+
 QgsLayoutItem::QgsLayoutItem( QgsLayout *layout, bool manageZValue )
   : QgsLayoutObject( layout )
   , QGraphicsRectItem( nullptr )
@@ -312,7 +320,9 @@ void QgsLayoutItem::paint( QPainter *painter, const QStyleOptionGraphicsItem *it
       // need to translate so that item origin is at 0,0 in painter coordinates (not bounding rect origin)
       p.translate( -boundingRect().x() * context.scaleFactor(), -boundingRect().y() * context.scaleFactor() );
       drawBackground( context );
-      draw( context, itemStyle );
+      double viewScale = QgsLayoutUtils::scaleFactorFromItemStyle( itemStyle );
+      QgsLayoutItemRenderContext itemRenderContext( context, viewScale );
+      draw( itemRenderContext );
       drawFrame( context );
       p.end();
 
@@ -341,7 +351,9 @@ void QgsLayoutItem::paint( QPainter *painter, const QStyleOptionGraphicsItem *it
 
     // scale painter from mm to dots
     painter->scale( 1.0 / context.scaleFactor(), 1.0 / context.scaleFactor() );
-    draw( context, itemStyle );
+    double viewScale = QgsLayoutUtils::scaleFactorFromItemStyle( itemStyle );
+    QgsLayoutItemRenderContext itemRenderContext( context, viewScale );
+    draw( itemRenderContext );
 
     painter->scale( context.scaleFactor(), context.scaleFactor() );
     drawFrame( context );
@@ -1427,3 +1439,4 @@ void QgsLayoutItem::refreshBlendMode()
   // Update the item effect to use the new blend mode
   mEffect->setCompositionMode( blendMode );
 }
+