[Atlas] Restore painting on error return

Hugo Mercier · Hugo Mercier · commit 198a699054a4 · 2013-02-06T17:52:44.000+01:00
diff --git a/src/app/composer/qgscomposer.cpp b/src/app/composer/qgscomposer.cpp
@@ -664,6 +664,8 @@ void QgsComposer::on_mActionExportAsPDF_triggered()
 			    e.what(),
 			    QMessageBox::Ok,
 			    QMessageBox::Ok );
+      mView->setPaintingEnabled( true );
+      return;
     }
     if ( atlasOnASingleFile )
     {
@@ -696,7 +698,8 @@ void QgsComposer::on_mActionExportAsPDF_triggered()
                               e.what(),
                               QMessageBox::Ok,
                               QMessageBox::Ok );
-        break;
+	mView->setPaintingEnabled( true );
+	return;
       }
       if ( !atlasOnASingleFile )
       {
@@ -773,6 +776,8 @@ void QgsComposer::on_mActionPrint_triggered()
 			    e.what(),
 			    QMessageBox::Ok,
 			    QMessageBox::Ok );
+      mView->setPaintingEnabled( true );
+      return;
     }
     QProgressDialog progress( tr( "Rendering maps..." ), tr( "Abort" ), 0, atlasMap->numFeatures(), this );
 
@@ -797,7 +802,8 @@ void QgsComposer::on_mActionPrint_triggered()
                               e.what(),
                               QMessageBox::Ok,
                               QMessageBox::Ok );
-        break;
+	mView->setPaintingEnabled( true );
+	return;
       }
 
 
@@ -966,6 +972,8 @@ void QgsComposer::on_mActionExportAsImage_triggered()
 			    e.what(),
 			    QMessageBox::Ok,
 			    QMessageBox::Ok );
+      mView->setPaintingEnabled( true );
+      return;
     }
 
     QProgressDialog progress( tr( "Rendering maps..." ), tr( "Abort" ), 0, atlasMap->numFeatures(), this );
@@ -991,7 +999,8 @@ void QgsComposer::on_mActionExportAsImage_triggered()
                               e.what(),
                               QMessageBox::Ok,
                               QMessageBox::Ok );
-        break;
+	mView->setPaintingEnabled( true );
+	return;
       }
 
       QString filename = QDir( dir ).filePath( atlasMap->currentFilename() ) + fileExt;
@@ -1132,6 +1141,8 @@ void QgsComposer::on_mActionExportAsSVG_triggered()
 			    e.what(),
 			    QMessageBox::Ok,
 			    QMessageBox::Ok );
+      mView->setPaintingEnabled( true );
+      return;
     }
   }
   QProgressDialog progress( tr( "Rendering maps..." ), tr( "Abort" ), 0, atlasMap->numFeatures(), this );
@@ -1161,7 +1172,8 @@ void QgsComposer::on_mActionExportAsSVG_triggered()
                               e.what(),
                               QMessageBox::Ok,
                               QMessageBox::Ok );
-        break;
+	mView->setPaintingEnabled( true );
+	return;
       }
       outputFileName = QDir( outputDir ).filePath( atlasMap->currentFilename() ) + ".svg";
     }

Original file line number	Diff line number	Diff line change
`@@ -664,6 +664,8 @@ void QgsComposer::on_mActionExportAsPDF_triggered()`
`664`	`664`	`e.what(),`
`665`	`665`	`QMessageBox::Ok,`
`666`	`666`	`QMessageBox::Ok );`
	`667`	`+ mView->setPaintingEnabled( true );`
	`668`	`+ return;`
`667`	`669`	`}`
`668`	`670`	`if ( atlasOnASingleFile )`
`669`	`671`	`{`
`@@ -696,7 +698,8 @@ void QgsComposer::on_mActionExportAsPDF_triggered()`
`696`	`698`	`e.what(),`
`697`	`699`	`QMessageBox::Ok,`
`698`	`700`	`QMessageBox::Ok );`
`699`		`- break;`
	`701`	`+ mView->setPaintingEnabled( true );`
	`702`	`+ return;`
`700`	`703`	`}`
`701`	`704`	`if ( !atlasOnASingleFile )`
`702`	`705`	`{`
`@@ -773,6 +776,8 @@ void QgsComposer::on_mActionPrint_triggered()`
`773`	`776`	`e.what(),`
`774`	`777`	`QMessageBox::Ok,`
`775`	`778`	`QMessageBox::Ok );`
	`779`	`+ mView->setPaintingEnabled( true );`
	`780`	`+ return;`
`776`	`781`	`}`
`777`	`782`	`QProgressDialog progress( tr( "Rendering maps..." ), tr( "Abort" ), 0, atlasMap->numFeatures(), this );`
`778`	`783`
`@@ -797,7 +802,8 @@ void QgsComposer::on_mActionPrint_triggered()`
`797`	`802`	`e.what(),`
`798`	`803`	`QMessageBox::Ok,`
`799`	`804`	`QMessageBox::Ok );`
`800`		`- break;`
	`805`	`+ mView->setPaintingEnabled( true );`
	`806`	`+ return;`
`801`	`807`	`}`
`802`	`808`
`803`	`809`
`@@ -966,6 +972,8 @@ void QgsComposer::on_mActionExportAsImage_triggered()`
`966`	`972`	`e.what(),`
`967`	`973`	`QMessageBox::Ok,`
`968`	`974`	`QMessageBox::Ok );`
	`975`	`+ mView->setPaintingEnabled( true );`
	`976`	`+ return;`
`969`	`977`	`}`
`970`	`978`
`971`	`979`	`QProgressDialog progress( tr( "Rendering maps..." ), tr( "Abort" ), 0, atlasMap->numFeatures(), this );`
`@@ -991,7 +999,8 @@ void QgsComposer::on_mActionExportAsImage_triggered()`
`991`	`999`	`e.what(),`
`992`	`1000`	`QMessageBox::Ok,`
`993`	`1001`	`QMessageBox::Ok );`
`994`		`- break;`
	`1002`	`+ mView->setPaintingEnabled( true );`
	`1003`	`+ return;`
`995`	`1004`	`}`
`996`	`1005`
`997`	`1006`	`QString filename = QDir( dir ).filePath( atlasMap->currentFilename() ) + fileExt;`
`@@ -1132,6 +1141,8 @@ void QgsComposer::on_mActionExportAsSVG_triggered()`
`1132`	`1141`	`e.what(),`
`1133`	`1142`	`QMessageBox::Ok,`
`1134`	`1143`	`QMessageBox::Ok );`
	`1144`	`+ mView->setPaintingEnabled( true );`
	`1145`	`+ return;`
`1135`	`1146`	`}`
`1136`	`1147`	`}`
`1137`	`1148`	`QProgressDialog progress( tr( "Rendering maps..." ), tr( "Abort" ), 0, atlasMap->numFeatures(), this );`
`@@ -1161,7 +1172,8 @@ void QgsComposer::on_mActionExportAsSVG_triggered()`
`1161`	`1172`	`e.what(),`
`1162`	`1173`	`QMessageBox::Ok,`
`1163`	`1174`	`QMessageBox::Ok );`
`1164`		`- break;`
	`1175`	`+ mView->setPaintingEnabled( true );`
	`1176`	`+ return;`
`1165`	`1177`	`}`
`1166`	`1178`	`outputFileName = QDir( outputDir ).filePath( atlasMap->currentFilename() ) + ".svg";`
`1167`	`1179`	`}`