Permalink
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Browse files
Restore atlas raster format handling
- Loading branch information
|
@@ -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() ) |
|
|
{ |
|
|