[composer] Ensure that data defined page size and orientation is correctly set when printing directly from an atlas. (Note that mixed orientation prints are unsupported on some platforms/print drivers)

nyalldawson · nyalldawson · commit 692d0f5cb7c2 · 2014-08-12T22:25:50.000+10:00
diff --git a/src/app/composer/qgscomposer.cpp b/src/app/composer/qgscomposer.cpp
@@ -1590,12 +1590,12 @@ void QgsComposer::printComposition( QgsComposer::OutputMode mode )
   QgsAtlasComposition* atlasMap = &mComposition->atlasComposition();
   if ( mode == QgsComposer::Single )
   {
-    mComposition->print( mPrinter );
+    mComposition->print( mPrinter, true );
   }
   else
   {
 
-    mComposition->beginPrint( mPrinter );
+    mComposition->beginPrint( mPrinter, true );
     QPainter painter( &mPrinter );
 
     loadAtlasPredefinedScalesFromProject();
diff --git a/src/core/composer/qgscomposition.cpp b/src/core/composer/qgscomposition.cpp
@@ -2507,19 +2507,27 @@ void QgsComposition::doPrint( QPrinter& printer, QPainter& p, bool startNewPage
   }
 }
 
-void QgsComposition::beginPrint( QPrinter &printer )
+void QgsComposition::beginPrint( QPrinter &printer, const bool evaluateDDPageSize )
 {
   //set resolution based on composer setting
   printer.setFullPage( true );
   printer.setColorMode( QPrinter::Color );
 
   //set user-defined resolution
   printer.setResolution( printResolution() );
+
+  if ( evaluateDDPageSize )
+  {
+    //set data defined page size
+    refreshPageSize();
+    printer.setPaperSize( QSizeF( paperWidth(), paperHeight() ), QPrinter::Millimeter );
+    printer.setOrientation( paperWidth() > paperHeight() ? QPrinter::Landscape : QPrinter::Portrait );
+  }
 }
 
-bool QgsComposition::print( QPrinter &printer )
+bool QgsComposition::print( QPrinter &printer, const bool evaluateDDPageSize )
 {
-  beginPrint( printer );
+  beginPrint( printer, evaluateDDPageSize );
   QPainter p;
   bool ready = p.begin( &printer );
   if ( !ready )
diff --git a/src/core/composer/qgscomposition.h b/src/core/composer/qgscomposition.h
@@ -489,7 +489,7 @@ class CORE_EXPORT QgsComposition : public QGraphicsScene
     //printing
 
     /** Prepare the printer for printing */
-    void beginPrint( QPrinter& printer );
+    void beginPrint( QPrinter& printer, const bool evaluateDDPageSize = false );
     /** Prepare the printer for printing in a PDF */
     void beginPrintAsPDF( QPrinter& printer, const QString& file );
 
@@ -503,7 +503,7 @@ class CORE_EXPORT QgsComposition : public QGraphicsScene
     /**Convenience function that prepares the printer and prints
      * @returns true if print was successful
     */
-    bool print( QPrinter &printer );
+    bool print( QPrinter &printer, const bool evaluateDDPageSize = false );
 
     /**Convenience function that prepares the printer for printing in PDF and prints
      * @returns true if export was successful

Original file line number	Diff line number	Diff line change
`@@ -1590,12 +1590,12 @@ void QgsComposer::printComposition( QgsComposer::OutputMode mode )`
`1590`	`1590`	`QgsAtlasComposition* atlasMap = &mComposition->atlasComposition();`
`1591`	`1591`	`if ( mode == QgsComposer::Single )`
`1592`	`1592`	`{`
`1593`		`- mComposition->print( mPrinter );`
	`1593`	`+ mComposition->print( mPrinter, true );`
`1594`	`1594`	`}`
`1595`	`1595`	`else`
`1596`	`1596`	`{`
`1597`	`1597`
`1598`		`- mComposition->beginPrint( mPrinter );`
	`1598`	`+ mComposition->beginPrint( mPrinter, true );`
`1599`	`1599`	`QPainter painter( &mPrinter );`
`1600`	`1600`
`1601`	`1601`	`loadAtlasPredefinedScalesFromProject();`
Original file line number	Diff line number	Diff line change
`@@ -2507,19 +2507,27 @@ void QgsComposition::doPrint( QPrinter& printer, QPainter& p, bool startNewPage`
`2507`	`2507`	`}`
`2508`	`2508`	`}`
`2509`	`2509`
`2510`		`-void QgsComposition::beginPrint( QPrinter &printer )`
	`2510`	`+void QgsComposition::beginPrint( QPrinter &printer, const bool evaluateDDPageSize )`
`2511`	`2511`	`{`
`2512`	`2512`	`//set resolution based on composer setting`
`2513`	`2513`	`printer.setFullPage( true );`
`2514`	`2514`	`printer.setColorMode( QPrinter::Color );`
`2515`	`2515`
`2516`	`2516`	`//set user-defined resolution`
`2517`	`2517`	`printer.setResolution( printResolution() );`
	`2518`	`+`
	`2519`	`+ if ( evaluateDDPageSize )`
	`2520`	`+ {`
	`2521`	`+ //set data defined page size`
	`2522`	`+ refreshPageSize();`
	`2523`	`+ printer.setPaperSize( QSizeF( paperWidth(), paperHeight() ), QPrinter::Millimeter );`
	`2524`	`+ printer.setOrientation( paperWidth() > paperHeight() ? QPrinter::Landscape : QPrinter::Portrait );`
	`2525`	`+ }`
`2518`	`2526`	`}`
`2519`	`2527`
`2520`		`-bool QgsComposition::print( QPrinter &printer )`
	`2528`	`+bool QgsComposition::print( QPrinter &printer, const bool evaluateDDPageSize )`
`2521`	`2529`	`{`
`2522`		`- beginPrint( printer );`
	`2530`	`+ beginPrint( printer, evaluateDDPageSize );`
`2523`	`2531`	`QPainter p;`
`2524`	`2532`	`bool ready = p.begin( &printer );`
`2525`	`2533`	`if ( !ready )`