Merge pull request #280 from Oslandia/atlas

mhugent · mhugent · commit dc522e0b61dc · 2012-10-08T08:47:20.000-07:00
Fix a bug in atlas generation GUI.
diff --git a/src/app/composer/qgscomposer.cpp b/src/app/composer/qgscomposer.cpp
@@ -746,7 +746,7 @@ void QgsComposer::on_mActionPrint_triggered()
   mView->setPaintingEnabled( false );
 
   QgsAtlasComposition* atlasMap = &mComposition->atlasComposition();
-  if ( atlasMap == 0 )
+  if ( !atlasMap->enabled() )
   {
     mComposition->print( mPrinter );
   }
@@ -830,7 +830,7 @@ void QgsComposer::on_mActionExportAsImage_triggered()
   }
 
   QgsAtlasComposition* atlasMap = &mComposition->atlasComposition();
-  if ( 0 == atlasMap )
+  if ( !atlasMap->enabled() )
   {
     QPair<QString, QString> fileNExt = QgisGui::getSaveAsImageName( this, tr( "Choose a file name to save the map image as" ) );
     

Original file line number	Diff line number	Diff line change
`@@ -746,7 +746,7 @@ void QgsComposer::on_mActionPrint_triggered()`
`746`	`746`	`mView->setPaintingEnabled( false );`
`747`	`747`
`748`	`748`	`QgsAtlasComposition* atlasMap = &mComposition->atlasComposition();`
`749`		`- if ( atlasMap == 0 )`
	`749`	`+ if ( !atlasMap->enabled() )`
`750`	`750`	`{`
`751`	`751`	`mComposition->print( mPrinter );`
`752`	`752`	`}`
`@@ -830,7 +830,7 @@ void QgsComposer::on_mActionExportAsImage_triggered()`
`830`	`830`	`}`
`831`	`831`
`832`	`832`	`QgsAtlasComposition* atlasMap = &mComposition->atlasComposition();`
`833`		`- if ( 0 == atlasMap )`
	`833`	`+ if ( !atlasMap->enabled() )`
`834`	`834`	`{`
`835`	`835`	`QPair<QString, QString> fileNExt = QgisGui::getSaveAsImageName( this, tr( "Choose a file name to save the map image as" ) );`
`836`	`836`