Fix pdf export page sizes

qgis · Dec 17, 2017 · eb25ab7 · eb25ab7
1 parent 8f0144b
commit eb25ab7
Show file tree

Hide file tree

Showing 2 changed files with 32 additions and 38 deletions.
diff --git a/src/core/layout/qgslayoutexporter.cpp b/src/core/layout/qgslayoutexporter.cpp
@@ -362,10 +362,10 @@ QgsLayoutExporter::ExportResult QgsLayoutExporter::exportToPdf( const QString &f
   ExportResult result = printPrivate( printer, p, false, settings.dpi, settings.rasterizeWholeImage );
   p.end();
 
-#if 0//TODO
-  georeferenceOutput( filePath );
-#endif
-
+  if ( mLayout->pageCollection()->pageCount() == 1 )
+  {
+    georeferenceOutput( filePath, nullptr, QRectF(), settings.dpi );
+  }
   return result;
 }
 
@@ -380,17 +380,7 @@ void QgsLayoutExporter::preparePrintAsPdf( QPrinter &printer, const QString &fil
   // Also an issue with PDF paper size using QPrinter::NativeFormat on Mac (always outputs portrait letter-size)
   printer.setOutputFormat( QPrinter::PdfFormat );
 
-#if 0 //TODO
-  refreshPageSize();
-#endif
-
-  //must set orientation to portrait before setting paper size, otherwise size will be flipped
-  //for landscape sized outputs (#11352)
-  printer.setOrientation( QPrinter::Portrait );
-
-#if 0 //TODO
-  printer.setPaperSize( QSizeF( paperWidth(), paperHeight() ), QPrinter::Millimeter );
-#endif
+  updatePrinterPageSize( printer, 0 );
 
   // TODO: add option for this in Composer
   // May not work on Windows or non-X11 Linux. Works fine on Mac using QPrinter::NativeFormat
@@ -399,25 +389,18 @@ void QgsLayoutExporter::preparePrintAsPdf( QPrinter &printer, const QString &fil
   QgsPaintEngineHack::fixEngineFlags( printer.paintEngine() );
 }
 
-void QgsLayoutExporter::preparePrint( QPrinter &printer, bool evaluateDDPageSize )
+void QgsLayoutExporter::preparePrint( QPrinter &printer, bool setFirstPageSize )
 {
   printer.setFullPage( true );
   printer.setColorMode( QPrinter::Color );
 
   //set user-defined resolution
   printer.setResolution( mLayout->context().dpi() );
 
-#if 0 //TODO
-  if ( evaluateDDPageSize && ddPageSizeActive() )
+  if ( setFirstPageSize )
   {
-    //set data defined page size
-    refreshPageSize();
-    //must set orientation to portrait before setting paper size, otherwise size will be flipped
-    //for landscape sized outputs (#11352)
-    printer.setOrientation( QPrinter::Portrait );
-    printer.setPaperSize( QSizeF( paperWidth(), paperHeight() ), QPrinter::Millimeter );
+    updatePrinterPageSize( printer, 0 );
   }
-#endif
 }
 
 QgsLayoutExporter::ExportResult QgsLayoutExporter::print( QPrinter &printer )
@@ -437,18 +420,6 @@ QgsLayoutExporter::ExportResult QgsLayoutExporter::print( QPrinter &printer )
 
 QgsLayoutExporter::ExportResult QgsLayoutExporter::printPrivate( QPrinter &printer, QPainter &painter, bool startNewPage, double dpi, bool rasterise )
 {
-#if 0 //TODO
-  if ( ddPageSizeActive() )
-  {
-    //set the page size again so that data defined page size takes effect
-    refreshPageSize();
-    //must set orientation to portrait before setting paper size, otherwise size will be flipped
-    //for landscape sized outputs (#11352)
-    printer.setOrientation( QPrinter::Portrait );
-    printer.setPaperSize( QSizeF( paperWidth(), paperHeight() ), QPrinter::Millimeter );
-  }
-#endif
-
   //layout starts page numbering at 0
   int fromPage = ( printer.fromPage() < 1 ) ? 0 : printer.fromPage() - 1;
   int toPage = ( printer.toPage() < 1 ) ? mLayout->pageCollection()->pageCount() - 1 : printer.toPage() - 1;
@@ -462,6 +433,12 @@ QgsLayoutExporter::ExportResult QgsLayoutExporter::printPrivate( QPrinter &print
       {
         continue;
       }
+
+      if ( i > 0 )
+      {
+        updatePrinterPageSize( printer, i );
+      }
+
       if ( ( pageExported && i > fromPage ) || startNewPage )
       {
         printer.newPage();
@@ -488,6 +465,12 @@ QgsLayoutExporter::ExportResult QgsLayoutExporter::printPrivate( QPrinter &print
       {
         continue;
       }
+
+      if ( i > 0 )
+      {
+        updatePrinterPageSize( printer, i );
+      }
+
       if ( ( pageExported && i > fromPage ) || startNewPage )
       {
         printer.newPage();
@@ -499,6 +482,16 @@ QgsLayoutExporter::ExportResult QgsLayoutExporter::printPrivate( QPrinter &print
   return Success;
 }
 
+void QgsLayoutExporter::updatePrinterPageSize( QPrinter &printer, int page )
+{
+  //must set orientation to portrait before setting paper size, otherwise size will be flipped
+  //for landscape sized outputs (#11352)
+  printer.setOrientation( QPrinter::Portrait );
+  QgsLayoutSize pageSize = mLayout->pageCollection()->page( page )->sizeWithUnits();
+  QgsLayoutSize pageSizeMM = mLayout->context().measurementConverter().convert( pageSize, QgsUnitTypes::LayoutMillimeters );
+  printer.setPaperSize( pageSizeMM.toQSizeF(), QPrinter::Millimeter );
+}
+
 double *QgsLayoutExporter::computeGeoTransform( const QgsLayoutItemMap *map, const QRectF &region, double dpi ) const
 {
   if ( !map )

diff --git a/src/core/layout/qgslayoutexporter.h b/src/core/layout/qgslayoutexporter.h
@@ -331,7 +331,7 @@ class CORE_EXPORT QgsLayoutExporter
      */
     void preparePrintAsPdf( QPrinter &printer, const QString &filePath );
 
-    void preparePrint( QPrinter &printer, bool evaluateDDPageSize = false );
+    void preparePrint( QPrinter &printer, bool setFirstPageSize = false );
 
     /**
      * Convenience function that prepares the printer and prints.
@@ -346,6 +346,7 @@ class CORE_EXPORT QgsLayoutExporter
      */
     ExportResult printPrivate( QPrinter &printer, QPainter &painter, bool startNewPage = false, double dpi = -1, bool rasterize = false );
 
+    void updatePrinterPageSize( QPrinter &printer, int page );
 
     friend class TestQgsLayout;