Skip to content

Commit 6355e9b

Browse files
committed
Run prepare-commit on qgscomposer.cpp
1 parent f28ca59 commit 6355e9b

File tree

1 file changed

+28
-24
lines changed

1 file changed

+28
-24
lines changed

src/app/composer/qgscomposer.cpp

Lines changed: 28 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -661,15 +661,16 @@ void QgsComposer::on_mActionExportAsPDF_triggered()
661661

662662
QPainter painter;
663663

664-
try {
664+
try
665+
{
665666
atlasMap->beginRender();
666667
}
667668
catch ( std::exception& e )
668669
{
669670
QMessageBox::warning( this, tr( "Atlas processing error" ),
670-
e.what(),
671-
QMessageBox::Ok,
672-
QMessageBox::Ok );
671+
e.what(),
672+
QMessageBox::Ok,
673+
QMessageBox::Ok );
673674
mView->setPaintingEnabled( true );
674675
return;
675676
}
@@ -704,8 +705,8 @@ void QgsComposer::on_mActionExportAsPDF_triggered()
704705
e.what(),
705706
QMessageBox::Ok,
706707
QMessageBox::Ok );
707-
mView->setPaintingEnabled( true );
708-
return;
708+
mView->setPaintingEnabled( true );
709+
return;
709710
}
710711
if ( !atlasOnASingleFile )
711712
{
@@ -773,15 +774,16 @@ void QgsComposer::on_mActionPrint_triggered()
773774

774775
mComposition->beginPrint( mPrinter );
775776
QPainter painter( &mPrinter );
776-
try {
777+
try
778+
{
777779
atlasMap->beginRender();
778780
}
779781
catch ( std::exception& e )
780782
{
781783
QMessageBox::warning( this, tr( "Atlas processing error" ),
782-
e.what(),
783-
QMessageBox::Ok,
784-
QMessageBox::Ok );
784+
e.what(),
785+
QMessageBox::Ok,
786+
QMessageBox::Ok );
785787
mView->setPaintingEnabled( true );
786788
return;
787789
}
@@ -808,8 +810,8 @@ void QgsComposer::on_mActionPrint_triggered()
808810
e.what(),
809811
QMessageBox::Ok,
810812
QMessageBox::Ok );
811-
mView->setPaintingEnabled( true );
812-
return;
813+
mView->setPaintingEnabled( true );
814+
return;
813815
}
814816

815817

@@ -969,15 +971,16 @@ void QgsComposer::on_mActionExportAsImage_triggered()
969971
mView->setPaintingEnabled( false );
970972
QApplication::setOverrideCursor( Qt::BusyCursor );
971973

972-
try {
974+
try
975+
{
973976
atlasMap->beginRender();
974977
}
975978
catch ( std::exception& e )
976979
{
977980
QMessageBox::warning( this, tr( "Atlas processing error" ),
978-
e.what(),
979-
QMessageBox::Ok,
980-
QMessageBox::Ok );
981+
e.what(),
982+
QMessageBox::Ok,
983+
QMessageBox::Ok );
981984
mView->setPaintingEnabled( true );
982985
return;
983986
}
@@ -1005,8 +1008,8 @@ void QgsComposer::on_mActionExportAsImage_triggered()
10051008
e.what(),
10061009
QMessageBox::Ok,
10071010
QMessageBox::Ok );
1008-
mView->setPaintingEnabled( true );
1009-
return;
1011+
mView->setPaintingEnabled( true );
1012+
return;
10101013
}
10111014

10121015
QString filename = QDir( dir ).filePath( atlasMap->currentFilename() ) + fileExt;
@@ -1138,15 +1141,16 @@ void QgsComposer::on_mActionExportAsSVG_triggered()
11381141
size_t featureI = 0;
11391142
if ( hasAnAtlas )
11401143
{
1141-
try {
1144+
try
1145+
{
11421146
atlasMap->beginRender();
11431147
}
11441148
catch ( std::exception& e )
11451149
{
11461150
QMessageBox::warning( this, tr( "Atlas processing error" ),
1147-
e.what(),
1148-
QMessageBox::Ok,
1149-
QMessageBox::Ok );
1151+
e.what(),
1152+
QMessageBox::Ok,
1153+
QMessageBox::Ok );
11501154
mView->setPaintingEnabled( true );
11511155
return;
11521156
}
@@ -1178,8 +1182,8 @@ void QgsComposer::on_mActionExportAsSVG_triggered()
11781182
e.what(),
11791183
QMessageBox::Ok,
11801184
QMessageBox::Ok );
1181-
mView->setPaintingEnabled( true );
1182-
return;
1185+
mView->setPaintingEnabled( true );
1186+
return;
11831187
}
11841188
outputFileName = QDir( outputDir ).filePath( atlasMap->currentFilename() ) + ".svg";
11851189
}

0 commit comments

Comments
 (0)