Skip to content
Permalink
Browse files

Restore atlas raster format handling

  • Loading branch information
nyalldawson committed Dec 23, 2017
1 parent 5a782f4 commit 409d10f43d82982ab90abafc6e9b63f3e7b6b1cc
Showing with 4 additions and 11 deletions.
  1. +3 −7 src/app/layout/qgslayoutatlaswidget.cpp
  2. +1 −4 src/app/layout/qgslayoutdesignerdialog.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 );
}
@@ -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() )
{

0 comments on commit 409d10f

Please sign in to comment.
You can’t perform that action at this time.