[layouts] Correctly restore dpi from 2.x compositions

qgis · Jan 31, 2018 · 6ec4d08 · 6ec4d08
1 parent 1194c78
commit 6ec4d08
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 0 deletions.
diff --git a/src/core/layout/qgscompositionconverter.cpp b/src/core/layout/qgscompositionconverter.cpp
@@ -128,6 +128,9 @@ std::unique_ptr< QgsPrintLayout > QgsCompositionConverter::createLayoutFromCompo
   // Guides
   layout->guides().setVisible( composerElement.attribute( QStringLiteral( "guidesVisible" ), QStringLiteral( "1" ) ).toInt() != 0 );
 
+  int printResolution = composerElement.attribute( "printResolution", "300" ).toInt();
+  layout->renderContext().setDpi( printResolution );
+
   // Create pages
   int pages = composerElement.attribute( QStringLiteral( "numPages" ) ).toInt( );
   float paperHeight = composerElement.attribute( QStringLiteral( "paperHeight" ) ).toDouble( );

diff --git a/tests/src/core/testqgscompositionconverter.cpp b/tests/src/core/testqgscompositionconverter.cpp
@@ -534,6 +534,7 @@ void TestQgsCompositionConverter::convertComposerTemplate()
   QVERIFY( layout );
   QCOMPARE( layout->pageCollection()->pageCount(), 2 );
   QCOMPARE( layout->name(), QStringLiteral( "composer title" ) );
+  QCOMPARE( layout->renderContext().dpi(), 305.0 );
 
   // Check guides
   QCOMPARE( layout->guides().rowCount( QModelIndex() ), 8 );