Restore atlas raster format handling

nyalldawson · nyalldawson · commit 409d10f43d82 · 2018-01-05T11:15:03.000+10:00
diff --git a/src/app/layout/qgslayoutatlaswidget.cpp b/src/app/layout/qgslayoutatlaswidget.cpp
@@ -314,11 +314,9 @@ void QgsLayoutAtlasWidget::mAtlasSortFeatureDirectionButton_clicked()
 
 void QgsLayoutAtlasWidget::changeFileFormat()
 {
-#if 0 //TODO
-  QgsAtlasComposition *atlasMap = mAtlas;
-  atlasMap->setFileFormat( mAtlasFileFormat->currentText() );
-#endif
+  mLayout->setCustomProperty( QStringLiteral( "atlasRasterFormat" ), mAtlasFileFormat->currentText() );
 }
+
 void QgsLayoutAtlasWidget::updateGuiElements()
 {
   blockAllSignals( true );
@@ -353,9 +351,7 @@ void QgsLayoutAtlasWidget::updateGuiElements()
   mAtlasFeatureFilterEdit->setEnabled( mAtlas->filterFeatures() );
   mAtlasFeatureFilterButton->setEnabled( mAtlas->filterFeatures() );
 
-#if 0 //TODO
-  mAtlasFileFormat->setCurrentIndex( mAtlasFileFormat->findText( mAtlas->fileFormat() ) );
-#endif
+  mAtlasFileFormat->setCurrentIndex( mAtlasFileFormat->findText( mLayout->customProperty( QStringLiteral( "atlasRasterFormat" ), QStringLiteral( "png" ) ).toString() ) );
 
   blockAllSignals( false );
 }
diff --git a/src/app/layout/qgslayoutdesignerdialog.cpp b/src/app/layout/qgslayoutdesignerdialog.cpp
@@ -2058,10 +2058,7 @@ void QgsLayoutDesignerDialog::exportAtlasToRaster()
     return;
   }
   QString dir = files.at( 0 );
-#if 0 //TODO
-  QString format = printAtlas->fileFormat();
-#endif
-  QString format = "png";
+  QString format = mLayout->customProperty( QStringLiteral( "atlasRasterFormat" ), QStringLiteral( "png" ) ).toString();
   QString fileExt = '.' + format;
   if ( dir.isEmpty() )
   {

Original file line number	Diff line number	Diff line change
`@@ -314,11 +314,9 @@ void QgsLayoutAtlasWidget::mAtlasSortFeatureDirectionButton_clicked()`
`314`	`314`
`315`	`315`	`void QgsLayoutAtlasWidget::changeFileFormat()`
`316`	`316`	`{`
`317`		`-#if 0 //TODO`
`318`		`- QgsAtlasComposition *atlasMap = mAtlas;`
`319`		`- atlasMap->setFileFormat( mAtlasFileFormat->currentText() );`
`320`		`-#endif`
	`317`	`+ mLayout->setCustomProperty( QStringLiteral( "atlasRasterFormat" ), mAtlasFileFormat->currentText() );`
`321`	`318`	`}`
	`319`	`+`
`322`	`320`	`void QgsLayoutAtlasWidget::updateGuiElements()`
`323`	`321`	`{`
`324`	`322`	`blockAllSignals( true );`
`@@ -353,9 +351,7 @@ void QgsLayoutAtlasWidget::updateGuiElements()`
`353`	`351`	`mAtlasFeatureFilterEdit->setEnabled( mAtlas->filterFeatures() );`
`354`	`352`	`mAtlasFeatureFilterButton->setEnabled( mAtlas->filterFeatures() );`
`355`	`353`
`356`		`-#if 0 //TODO`
`357`		`- mAtlasFileFormat->setCurrentIndex( mAtlasFileFormat->findText( mAtlas->fileFormat() ) );`
`358`		`-#endif`
	`354`	`+ mAtlasFileFormat->setCurrentIndex( mAtlasFileFormat->findText( mLayout->customProperty( QStringLiteral( "atlasRasterFormat" ), QStringLiteral( "png" ) ).toString() ) );`
`359`	`355`
`360`	`356`	`blockAllSignals( false );`
`361`	`357`	`}`
Original file line number	Diff line number	Diff line change
`@@ -2058,10 +2058,7 @@ void QgsLayoutDesignerDialog::exportAtlasToRaster()`
`2058`	`2058`	`return;`
`2059`	`2059`	`}`
`2060`	`2060`	`QString dir = files.at( 0 );`
`2061`		`-#if 0 //TODO`
`2062`		`- QString format = printAtlas->fileFormat();`
`2063`		`-#endif`
`2064`		`- QString format = "png";`
	`2061`	`+ QString format = mLayout->customProperty( QStringLiteral( "atlasRasterFormat" ), QStringLiteral( "png" ) ).toString();`
`2065`	`2062`	`QString fileExt = '.' + format;`
`2066`	`2063`	`if ( dir.isEmpty() )`
`2067`	`2064`	`{`