sharpetronics/QGIS
1
0
Fork 0
mirror of https://github.com/qgis/QGIS.git synced 2025-03-22 00:06:57 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fix layout display when canceling export settings dialogs

Browse Source
This commit is contained in:
Nyall Dawson 2018-11-30 15:39:05 +10:00
parent 1ccbdb870f
commit 88077e4ab9
1 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/app/layout/qgslayoutdesignerdialog.cpp
View File

@ -2064,13 +2064,13 @@ void QgsLayoutDesignerDialog::exportToPdf()
setLastExportPath( outputFileName ); setLastExportPath( outputFileName );
mView->setPaintingEnabled( false );
QgsTemporaryCursorOverride cursorOverride( Qt::BusyCursor );
QgsLayoutExporter::PdfExportSettings pdfSettings; QgsLayoutExporter::PdfExportSettings pdfSettings;
if ( !getPdfExportSettings( pdfSettings ) ) if ( !getPdfExportSettings( pdfSettings ) )
return; return;
mView->setPaintingEnabled( false );
QgsTemporaryCursorOverride cursorOverride( Qt::BusyCursor );
QgsProxyProgressTask *proxyTask = new QgsProxyProgressTask( tr( "Exporting “%1”" ).arg( mMasterLayout->name() ) ); QgsProxyProgressTask *proxyTask = new QgsProxyProgressTask( tr( "Exporting “%1”" ).arg( mMasterLayout->name() ) );
QgsApplication::taskManager()->addTask( proxyTask ); QgsApplication::taskManager()->addTask( proxyTask );
@ -2967,13 +2967,12 @@ void QgsLayoutDesignerDialog::exportAtlasToPdf()
outputFileName = QDir( dir ).filePath( QStringLiteral( "atlas" ) ); // filename is overridden by atlas outputFileName = QDir( dir ).filePath( QStringLiteral( "atlas" ) ); // filename is overridden by atlas
} }
mView->setPaintingEnabled( false );
QgsTemporaryCursorOverride cursorOverride( Qt::BusyCursor );
QgsLayoutExporter::PdfExportSettings pdfSettings; QgsLayoutExporter::PdfExportSettings pdfSettings;
if ( !getPdfExportSettings( pdfSettings ) ) if ( !getPdfExportSettings( pdfSettings ) )
return; return;
mView->setPaintingEnabled( false );
QgsTemporaryCursorOverride cursorOverride( Qt::BusyCursor );
pdfSettings.rasterizeWholeImage = mLayout->customProperty( QStringLiteral( "rasterize" ), false ).toBool(); pdfSettings.rasterizeWholeImage = mLayout->customProperty( QStringLiteral( "rasterize" ), false ).toBool();
QString error; QString error;
@ -3345,9 +3344,6 @@ void QgsLayoutDesignerDialog::exportReportToPdf()
} }
setLastExportPath( outputFileName ); setLastExportPath( outputFileName );
mView->setPaintingEnabled( false );
QgsTemporaryCursorOverride cursorOverride( Qt::BusyCursor );
bool rasterize = false; bool rasterize = false;
if ( mLayout ) if ( mLayout )
{ {
@ -3357,6 +3353,9 @@ void QgsLayoutDesignerDialog::exportReportToPdf()
if ( !getPdfExportSettings( pdfSettings ) ) if ( !getPdfExportSettings( pdfSettings ) )
return; return;
mView->setPaintingEnabled( false );
QgsTemporaryCursorOverride cursorOverride( Qt::BusyCursor );
pdfSettings.rasterizeWholeImage = rasterize; pdfSettings.rasterizeWholeImage = rasterize;
QString error; QString error;