From faa9c3342afae32c6a6adf6a5d6b72da56fb484a Mon Sep 17 00:00:00 2001 From: Hugo Mercier Date: Thu, 27 Sep 2012 17:13:24 +0200 Subject: [PATCH] Robustify atlas generation --- src/app/composer/qgscomposer.cpp | 6 +- src/core/composer/qgscomposerlabel.cpp | 4 +- src/core/composer/qgscomposermap.cpp | 11 +- src/core/composer/qgscomposermap.h | 4 +- src/core/composer/qgscomposition.cpp | 222 +++++++++++++++---------- src/core/composer/qgscomposition.h | 12 +- 6 files changed, 160 insertions(+), 99 deletions(-) diff --git a/src/app/composer/qgscomposer.cpp b/src/app/composer/qgscomposer.cpp index 2fa3f5bc2d3..56779c7ce36 100644 --- a/src/app/composer/qgscomposer.cpp +++ b/src/app/composer/qgscomposer.cpp @@ -608,7 +608,7 @@ void QgsComposer::on_mActionExportAsPDF_triggered() { return; } - atlasMap->setAtlasFilenamePattern( "'output_'||$id" ); + atlasMap->setAtlasFilenamePattern( "'output_'||$feature" ); } QSettings myQSettings; @@ -858,7 +858,7 @@ void QgsComposer::on_mActionExportAsImage_triggered() { return; } - atlasMap->setAtlasFilenamePattern( "'output_'||$id" ); + atlasMap->setAtlasFilenamePattern( "'output_'||$feature" ); } QSettings myQSettings; @@ -1054,7 +1054,7 @@ void QgsComposer::on_mActionExportAsSVG_triggered() { return; } - atlasMap->setAtlasFilenamePattern( "'output_'||$id||'_'||$page" ); + atlasMap->setAtlasFilenamePattern( "'output_'||$feature" ); } QSettings myQSettings; diff --git a/src/core/composer/qgscomposerlabel.cpp b/src/core/composer/qgscomposerlabel.cpp index 867ad98aa64..917cc20147c 100644 --- a/src/core/composer/qgscomposerlabel.cpp +++ b/src/core/composer/qgscomposerlabel.cpp @@ -89,7 +89,9 @@ QString QgsComposerLabel::displayText() const { QString displayText = mText; replaceDateText( displayText ); - return QgsExpression::replaceExpressionText( displayText, mExpressionFeature, mExpressionLayer, &mSubstitutions ); + QMap subs = mSubstitutions; + subs[ "$page" ] = QVariant((int)mComposition->itemPageNumber( this ) + 1); + return QgsExpression::replaceExpressionText( displayText, mExpressionFeature, mExpressionLayer, &subs ); } void QgsComposerLabel::replaceDateText( QString& text ) const diff --git a/src/core/composer/qgscomposermap.cpp b/src/core/composer/qgscomposermap.cpp index 52bff9986bd..dbd4818fb0a 100644 --- a/src/core/composer/qgscomposermap.cpp +++ b/src/core/composer/qgscomposermap.cpp @@ -45,7 +45,7 @@ QgsComposerMap::QgsComposerMap( QgsComposition *composition, int x, int y, int w mBottomGridAnnotationPosition( OutsideMapFrame ), mAnnotationFrameDistance( 1.0 ), mLeftGridAnnotationDirection( Horizontal ), mRightGridAnnotationDirection( Horizontal ), mTopGridAnnotationDirection( Horizontal ), mBottomGridAnnotationDirection( Horizontal ), mGridFrameStyle( NoGridFrame ), mGridFrameWidth( 2.0 ), mCrossLength( 3 ), mMapCanvas( 0 ), mDrawCanvasItems( true ), - mAtlasMargin( 0.10 ), mAtlasFilenamePattern("'output_'||$id"), mAtlasCoverageLayer(0) + mAtlasMargin( 0.10 ), mAtlasFilenamePattern("'output_'||$feature"), mAtlasCoverageLayer(0) { mComposition = composition; mOverviewFrameMapSymbol = 0; @@ -87,7 +87,7 @@ QgsComposerMap::QgsComposerMap( QgsComposition *composition ) mBottomGridAnnotationPosition( OutsideMapFrame ), mAnnotationFrameDistance( 1.0 ), mLeftGridAnnotationDirection( Horizontal ), mRightGridAnnotationDirection( Horizontal ), mTopGridAnnotationDirection( Horizontal ), mBottomGridAnnotationDirection( Horizontal ), mGridFrameStyle( NoGridFrame ), mGridFrameWidth( 2.0 ), mCrossLength( 3 ), mMapCanvas( 0 ), mDrawCanvasItems( true ), - mAtlasMargin( 0.10 ), mAtlasFilenamePattern("'output_'||$id"), mAtlasCoverageLayer(0) + mAtlasMargin( 0.10 ), mAtlasFilenamePattern("'output_'||$feature"), mAtlasCoverageLayer(0) { mOverviewFrameMapSymbol = 0; createDefaultOverviewFrameSymbol(); @@ -633,6 +633,13 @@ void QgsComposerMap::syncAtlasCoverageLayer( QString lname ) } } +void QgsComposerMap::setAtlasCoverageLayer( QgsVectorLayer* map ) +{ + mAtlasCoverageLayer = map; + + emit atlasCoverageLayerChanged( map ); +} + bool QgsComposerMap::writeXML( QDomElement& elem, QDomDocument & doc ) const { if ( elem.isNull() ) diff --git a/src/core/composer/qgscomposermap.h b/src/core/composer/qgscomposermap.h index eb9a76bbe29..a8c6bae412a 100644 --- a/src/core/composer/qgscomposermap.h +++ b/src/core/composer/qgscomposermap.h @@ -330,7 +330,7 @@ class CORE_EXPORT QgsComposerMap : public QgsComposerItem void setAtlasFilenamePattern( const QString& pattern ) { mAtlasFilenamePattern = pattern; } QgsVectorLayer* atlasCoverageLayer() const { return mAtlasCoverageLayer; } - void setAtlasCoverageLayer( QgsVectorLayer* lmap ) { mAtlasCoverageLayer = lmap; } + void setAtlasCoverageLayer( QgsVectorLayer* lmap ); bool atlasSingleFile() const { return mAtlasSingleFile; } void setAtlasSingleFile( bool single ) { mAtlasSingleFile = single; } @@ -338,6 +338,8 @@ class CORE_EXPORT QgsComposerMap : public QgsComposerItem signals: void extentChanged(); + void atlasCoverageLayerChanged( QgsVectorLayer* ); + public slots: /**Called if map canvas has changed*/ diff --git a/src/core/composer/qgscomposition.cpp b/src/core/composer/qgscomposition.cpp index 10ede453f0b..de739bb57de 100644 --- a/src/core/composer/qgscomposition.cpp +++ b/src/core/composer/qgscomposition.cpp @@ -74,6 +74,9 @@ QgsAtlasRendering::QgsAtlasRendering( QgsComposition* composition ) void QgsAtlasRendering::begin( const QString& filenamePattern ) { + if ( !impl->composition || !impl->composition->atlasMap() || !impl->composition->atlasMap()->atlasCoverageLayer() ) + return; + impl->filenamePattern = filenamePattern; QgsVectorLayer* coverage = impl->composition->atlasMap()->atlasCoverageLayer(); @@ -103,12 +106,7 @@ void QgsAtlasRendering::begin( const QString& filenamePattern ) } // select all features with all attributes - QgsAttributeList selectedAttributes; - for ( QgsFieldMap::const_iterator fit = fieldmap.begin(); fit != fieldmap.end(); ++fit ) - { - selectedAttributes.push_back( fit.key() ); - } - provider->select( selectedAttributes ); + provider->select( provider->attributeIndexes() ); // features must be stored in a list, since modifying the layer's extent rewinds nextFeature() QgsFeature feature; @@ -134,101 +132,104 @@ void QgsAtlasRendering::begin( const QString& filenamePattern ) // special columns for expressions QgsExpression::setSpecialColumn( "$numfeatures", QVariant( (int)impl->nFeatures ) ); - QgsExpression::setSpecialColumn( "$numpages", QVariant( (int)impl->composition->numPages() ) ); } void QgsAtlasRendering::prepareForFeature( size_t featureI ) { - QgsFeature* fit = &impl->features[featureI]; + if ( !impl->composition || !impl->composition->atlasMap() || !impl->composition->atlasMap()->atlasCoverageLayer() ) + return; - if ( impl->filenamePattern.size() > 0 ) - { - QgsExpression::setSpecialColumn( "$feature", QVariant( (int)featureI + 1 ) ); - QVariant filenameRes = impl->filenameExpr->evaluate( &*fit ); - if ( impl->filenameExpr->hasEvalError() ) - { - throw std::runtime_error( "Filename eval error: " + impl->filenameExpr->evalErrorString().toStdString() ); - } - - impl->currentFilename = filenameRes.toString(); - } - - // - // compute the new extent - // keep the original aspect ratio - // and apply a margin - - // QgsGeometry::boundingBox is expressed in the geometry"s native CRS - // They have to be transformed to the MapRenderer's one - QgsRectangle geom_rect = impl->transform.transform( fit->geometry()->boundingBox() ); - double xa1 = geom_rect.xMinimum(); - double xa2 = geom_rect.xMaximum(); - double ya1 = geom_rect.yMinimum(); - double ya2 = geom_rect.yMaximum(); - QgsRectangle new_extent = geom_rect; - - // restore the original extent - // (successive calls to setNewExtent tend to deform the original rectangle) - impl->composition->atlasMap()->setNewExtent( impl->origExtent ); - - if ( impl->composition->atlasMap()->atlasFixedScale() ) - { - // only translate, keep the original scale (i.e. width x height) - - double geom_center_x = (xa1 + xa2) / 2.0; - double geom_center_y = (ya1 + ya2) / 2.0; - double xx = geom_center_x - impl->origExtent.width() / 2.0; - double yy = geom_center_y - impl->origExtent.height() / 2.0; - new_extent = QgsRectangle( xx, - yy, - xx + impl->origExtent.width(), - yy + impl->origExtent.height() ); - } - else - { - // auto scale - - double geom_ratio = geom_rect.width() / geom_rect.height(); - double map_ratio = impl->origExtent.width() / impl->origExtent.height(); - - // geometry height is too big - if ( geom_ratio < map_ratio ) - { - new_extent = QgsRectangle( (xa1 + xa2 + map_ratio * (ya1 - ya2)) / 2.0, - ya1, - xa1 + map_ratio * (ya2 - ya1), - ya2); - } - // geometry width is too big - else if ( geom_ratio > map_ratio ) - { - new_extent = QgsRectangle( xa1, - (ya1 + ya2 + (xa1 - xa2) / map_ratio) / 2.0, - xa2, - ya1 + (xa2 - xa1) / map_ratio); - } - if ( impl->composition->atlasMap()->atlasMargin() > 0.0 ) - { - new_extent.scale( 1 + impl->composition->atlasMap()->atlasMargin() ); - } - } - - // evaluate label expressions - QList labels; - impl->composition->composerItems( labels ); + QgsFeature* fit = &impl->features[featureI]; + + if ( impl->filenamePattern.size() > 0 ) + { QgsExpression::setSpecialColumn( "$feature", QVariant( (int)featureI + 1 ) ); - - for ( QList::iterator lit = labels.begin(); lit != labels.end(); ++lit ) + QVariant filenameRes = impl->filenameExpr->evaluate( &*fit ); + if ( impl->filenameExpr->hasEvalError() ) { - // build a local substitution map - QMap pageMap; - pageMap.insert( "$page", QVariant( (int)impl->composition->itemPageNumber( *lit ) + 1 ) ); - (*lit)->setExpressionContext( fit, impl->composition->atlasMap()->atlasCoverageLayer(), pageMap ); + throw std::runtime_error( "Filename eval error: " + impl->filenameExpr->evalErrorString().toStdString() ); } + + impl->currentFilename = filenameRes.toString(); + } + + // + // compute the new extent + // keep the original aspect ratio + // and apply a margin + + // QgsGeometry::boundingBox is expressed in the geometry"s native CRS + // We have to transform the grometry to the destination CRS and ask for the bounding box + // Note: we cannot directly take the transformation of the bounding box, since transformations are not linear + QgsGeometry tgeom( *fit->geometry() ); + tgeom.transform( impl->transform ); + QgsRectangle geom_rect = tgeom.boundingBox(); - // set the new extent (and render) - impl->composition->atlasMap()->setNewExtent( new_extent ); + double xa1 = geom_rect.xMinimum(); + double xa2 = geom_rect.xMaximum(); + double ya1 = geom_rect.yMinimum(); + double ya2 = geom_rect.yMaximum(); + QgsRectangle new_extent = geom_rect; + + // restore the original extent + // (successive calls to setNewExtent tend to deform the original rectangle) + impl->composition->atlasMap()->setNewExtent( impl->origExtent ); + + if ( impl->composition->atlasMap()->atlasFixedScale() ) + { + // only translate, keep the original scale (i.e. width x height) + + double geom_center_x = (xa1 + xa2) / 2.0; + double geom_center_y = (ya1 + ya2) / 2.0; + double xx = geom_center_x - impl->origExtent.width() / 2.0; + double yy = geom_center_y - impl->origExtent.height() / 2.0; + new_extent = QgsRectangle( xx, + yy, + xx + impl->origExtent.width(), + yy + impl->origExtent.height() ); + } + else + { + // auto scale + + double geom_ratio = geom_rect.width() / geom_rect.height(); + double map_ratio = impl->origExtent.width() / impl->origExtent.height(); + + // geometry height is too big + if ( geom_ratio < map_ratio ) + { + new_extent = QgsRectangle( (xa1 + xa2 + map_ratio * (ya1 - ya2)) / 2.0, + ya1, + xa1 + map_ratio * (ya2 - ya1), + ya2); + } + // geometry width is too big + else if ( geom_ratio > map_ratio ) + { + new_extent = QgsRectangle( xa1, + (ya1 + ya2 + (xa1 - xa2) / map_ratio) / 2.0, + xa2, + ya1 + (xa2 - xa1) / map_ratio); + } + if ( impl->composition->atlasMap()->atlasMargin() > 0.0 ) + { + new_extent.scale( 1 + impl->composition->atlasMap()->atlasMargin() ); + } + } + + // evaluate label expressions + QList labels; + impl->composition->composerItems( labels ); + QgsExpression::setSpecialColumn( "$feature", QVariant( (int)featureI + 1 ) ); + + for ( QList::iterator lit = labels.begin(); lit != labels.end(); ++lit ) + { + (*lit)->setExpressionContext( fit, impl->composition->atlasMap()->atlasCoverageLayer() ); + } + + // set the new extent (and render) + impl->composition->atlasMap()->setNewExtent( new_extent ); } size_t QgsAtlasRendering::numFeatures() const @@ -243,6 +244,9 @@ const QString& QgsAtlasRendering::currentFilename() const void QgsAtlasRendering::end() { + if ( !impl->composition || !impl->composition->atlasMap() || !impl->composition->atlasMap()->atlasCoverageLayer() ) + return; + // reset label expression contexts QList labels; impl->composition->composerItems( labels ); @@ -350,6 +354,10 @@ void QgsComposition::setNumPages( int pages ) mPages.removeLast(); } } + + // update the corresponding variable + QgsExpression::setSpecialColumn( "$numpages", QVariant((int)numPages()) ); + emit nPagesChanged(); } @@ -1700,6 +1708,8 @@ void QgsComposition::addPaperItem() addItem( paperItem ); paperItem->setZValue( 0 ); mPages.push_back( paperItem ); + + QgsExpression::setSpecialColumn( "$numpages", QVariant((int)mPages.size()) ); } void QgsComposition::removePaperItems() @@ -1709,6 +1719,7 @@ void QgsComposition::removePaperItems() delete mPages.at( i ); } mPages.clear(); + QgsExpression::setSpecialColumn( "$numpages", QVariant((int)0) ); } void QgsComposition::deleteAndRemoveMultiFrames() @@ -1836,3 +1847,32 @@ void QgsComposition::renderPage( QPainter* p, int page ) mPlotStyle = savedPlotStyle; } + +void QgsComposition::setAtlasMap( QgsComposerMap* map ) +{ + mAtlasMap = map; + if ( map != 0 ) + { + QObject::connect( map, SIGNAL( atlasCoverageLayerChanged( QgsVectorLayer* )), this, SLOT( onAtlasCoverageChanged( QgsVectorLayer* ) ) ); + } + else + { + QObject::disconnect( map, SIGNAL( atlasCoverageLayerChanged( QgsVectorLayer* )), this, SLOT( onAtlasCoverageChanged( QgsVectorLayer* ) ) ); + } +} + +void QgsComposition::onAtlasCoverageChanged( QgsVectorLayer* ) +{ + // update variables + if ( mAtlasMap != 0 && mAtlasMap->atlasCoverageLayer() != 0 ) + { + QgsVectorDataProvider* provider = mAtlasMap->atlasCoverageLayer()->dataProvider(); + QgsExpression::setSpecialColumn( "$numfeatures", QVariant( (int)provider->featureCount() ) ); + } + else + { + QgsExpression::setSpecialColumn( "$numfeatures", QVariant( (int)0 ) ); + } + // + QgsExpression::setSpecialColumn( "$numpages", QVariant( (int)numPages() ) ); +} diff --git a/src/core/composer/qgscomposition.h b/src/core/composer/qgscomposition.h index 3b04ac346de..673106b40f1 100644 --- a/src/core/composer/qgscomposition.h +++ b/src/core/composer/qgscomposition.h @@ -48,6 +48,7 @@ class QgsComposerShape; class QgsComposerAttributeTable; class QgsComposerMultiFrame; class QgsComposerMultiFrameCommand; +class QgsVectorLayer; /** \ingroup MapComposer * Class used to render an Atlas, iterating over geometry features. @@ -59,12 +60,18 @@ class QgsAtlasRendering public: QgsAtlasRendering( QgsComposition* composition ); + /** Begins the rendering. Sets an optional output filename pattern */ void begin( const QString& filenamePattern = "" ); + /** Ends the rendering. Restores original extent*/ void end(); + /** Returns the number of features in the coverage layer */ size_t numFeatures() const; + + /** Prepare the atlas map for the given feature. Sets the extent and context variables */ void prepareForFeature( size_t i ); + /** Returns the current filename. Must be called after prepareForFeature( i ) */ const QString& currentFilename() const; private: @@ -194,7 +201,7 @@ class CORE_EXPORT QgsComposition: public QGraphicsScene QgsMapRenderer* mapRenderer() {return mMapRenderer;} QgsComposerMap* atlasMap() { return mAtlasMap; } - void setAtlasMap( QgsComposerMap* map ) { mAtlasMap = map; } + void setAtlasMap( QgsComposerMap* map ); QgsComposition::PlotStyle plotStyle() const {return mPlotStyle;} void setPlotStyle( QgsComposition::PlotStyle style ) {mPlotStyle = style;} @@ -333,6 +340,9 @@ class CORE_EXPORT QgsComposition: public QGraphicsScene /**Casts object to the proper subclass type and calls corresponding itemAdded signal*/ void sendItemAddedSignal( QgsComposerItem* item ); + private slots: + void onAtlasCoverageChanged( QgsVectorLayer* ); + private: /**Pointer to map renderer of QGIS main map*/ QgsMapRenderer* mMapRenderer;