Restore atlas raster format handling

qgis · Jan 5, 2018 · 409d10f43d82982ab90abafc6e9b63f3e7b6b1cc · 409d10f
1 parent 5a782f4
commit 409d10f43d82982ab90abafc6e9b63f3e7b6b1cc
Unified Split

Showing with 4 additions and 11 deletions.

+3 −7 src/app/layout/qgslayoutatlaswidget.cpp

+1 −4 src/app/layout/qgslayoutdesignerdialog.cpp
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() )
   {