Decouple QgsLayoutExporter from QgsLayout

nyalldawson · nyalldawson · commit fb712d7d65e8 · 2017-12-17T14:14:30.000+10:00
diff --git a/src/core/layout/qgslayout.cpp b/src/core/layout/qgslayout.cpp
@@ -32,7 +32,6 @@ QgsLayout::QgsLayout( QgsProject *project )
   , mGridSettings( this )
   , mPageCollection( new QgsLayoutPageCollection( this ) )
   , mUndoStack( new QgsLayoutUndoStack( this ) )
-  , mExporter( QgsLayoutExporter( this ) )
 {
   // just to make sure - this should be the default, but maybe it'll change in some future Qt version...
   setBackgroundBrush( Qt::NoBrush );
@@ -112,11 +111,6 @@ QgsLayoutModel *QgsLayout::itemsModel()
   return mItemsModel.get();
 }
 
-QgsLayoutExporter &QgsLayout::exporter()
-{
-  return mExporter;
-}
-
 void QgsLayout::setName( const QString &name )
 {
   mName = name;
diff --git a/src/core/layout/qgslayout.h b/src/core/layout/qgslayout.h
@@ -93,12 +93,6 @@ class CORE_EXPORT QgsLayout : public QGraphicsScene, public QgsExpressionContext
      */
     QgsLayoutModel *itemsModel();
 
-    /**
-     * Returns the layout's exporter, which is used for rendering the layout and exporting
-     * to various formats.
-     */
-    QgsLayoutExporter &exporter();
-
     /**
      * Returns the layout's name.
      * \see setName()
@@ -608,7 +602,6 @@ class CORE_EXPORT QgsLayout : public QGraphicsScene, public QgsExpressionContext
 
     std::unique_ptr< QgsLayoutPageCollection > mPageCollection;
     std::unique_ptr< QgsLayoutUndoStack > mUndoStack;
-    QgsLayoutExporter mExporter;
 
     //! List of multiframe objects
     QList<QgsLayoutMultiFrame *> mMultiFrames;
diff --git a/src/core/qgsmultirenderchecker.cpp b/src/core/qgsmultirenderchecker.cpp
@@ -217,7 +217,8 @@ bool QgsLayoutChecker::testLayout( QString &checkedReport, int page, int pixelDi
   outputImage.setDotsPerMeterY( mDotsPerMeter );
   drawBackground( &outputImage );
   QPainter p( &outputImage );
-  mLayout->exporter().renderPage( &p, page );
+  QgsLayoutExporter exporter( mLayout );
+  exporter.renderPage( &p, page );
   p.end();
 
   QString renderedFilePath = QDir::tempPath() + '/' + QFileInfo( mTestName ).baseName() + "_rendered.png";
diff --git a/tests/src/python/qgslayoutchecker.py b/tests/src/python/qgslayoutchecker.py
@@ -19,7 +19,7 @@
 
 from qgis.PyQt.QtCore import QSize, QDir, QFileInfo
 from qgis.PyQt.QtGui import QImage, QPainter
-from qgis.core import QgsMultiRenderChecker, QgsLayout
+from qgis.core import QgsMultiRenderChecker, QgsLayoutExporter
 
 
 class QgsLayoutChecker(QgsMultiRenderChecker):
@@ -47,7 +47,8 @@ def testLayout(self, page=0, pixelDiff=0):
         outputImage.setDotsPerMeterY(self.dots_per_meter)
         QgsMultiRenderChecker.drawBackground(outputImage)
         p = QPainter(outputImage)
-        self.layout.exporter().renderPage(p, page)
+        exporter = QgsLayoutExporter(self.layout)
+        exporter.renderPage(p, page)
         p.end()
 
         renderedFilePath = QDir.tempPath() + QDir.separator() + QFileInfo(self.test_name).baseName() + "_rendered.png"

Original file line number	Diff line number	Diff line change
`@@ -32,7 +32,6 @@ QgsLayout::QgsLayout( QgsProject *project )`
`32`	`32`	`, mGridSettings( this )`
`33`	`33`	`, mPageCollection( new QgsLayoutPageCollection( this ) )`
`34`	`34`	`, mUndoStack( new QgsLayoutUndoStack( this ) )`
`35`		`- , mExporter( QgsLayoutExporter( this ) )`
`36`	`35`	`{`
`37`	`36`	`// just to make sure - this should be the default, but maybe it'll change in some future Qt version...`
`38`	`37`	`setBackgroundBrush( Qt::NoBrush );`
`@@ -112,11 +111,6 @@ QgsLayoutModel *QgsLayout::itemsModel()`
`112`	`111`	`return mItemsModel.get();`
`113`	`112`	`}`
`114`	`113`
`115`		`-QgsLayoutExporter &QgsLayout::exporter()`
`116`		`-{`
`117`		`- return mExporter;`
`118`		`-}`
`119`		`-`
`120`	`114`	`void QgsLayout::setName( const QString &name )`
`121`	`115`	`{`
`122`	`116`	`mName = name;`