Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
fixed tests
  • Loading branch information
Samweli authored and github-actions[bot] committed Aug 2, 2021
1 parent 9f1a02e commit ef318f4
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 10 deletions.
2 changes: 1 addition & 1 deletion python/core/auto_generated/layout/qgslayoutatlas.sip.in
Expand Up @@ -237,7 +237,7 @@ Sets whether features should be ``filtered`` in the coverage layer.
Filters the coverage layer according to the current atlas filter expression.
Only filters when the coverage layer features are set to be filtered by the atlas.

.. seealso:: :py:func:`unfilterCoverageLayer`
.. seealso:: :py:func:`unFilterCoverageLayer`

.. versionadded:: 3.22
%End
Expand Down
16 changes: 8 additions & 8 deletions src/core/layout/qgslayoutatlas.cpp
Expand Up @@ -297,7 +297,7 @@ int QgsLayoutAtlas::updateFeatures()

QgsFeatureIterator fit = mCoverageLayer->getFeatures( req );

std::unique_ptr<QgsExpression> nameExpression;
std::unique_ptr<QgsExpression> nameExpression;
if ( !mPageNameExpression.isEmpty() )
{
nameExpression = std::make_unique< QgsExpression >( mPageNameExpression );
Expand Down Expand Up @@ -397,17 +397,17 @@ bool QgsLayoutAtlas::endRender()

void QgsLayoutAtlas::filterCoverageLayer()
{
if ( mFilterFeatures && !mFilterExpression.isEmpty() )
{
mOriginalFilterExpression = mCoverageLayer->subsetString();
mCoverageLayer->setSubsetString( mFilterExpression );
}
if ( mFilterFeatures && !mFilterExpression.isEmpty() )
{
mOriginalFilterExpression = mCoverageLayer->subsetString();
mCoverageLayer->setSubsetString( mFilterExpression );
}
}

void QgsLayoutAtlas::unFilterCoverageLayer()
{
if ( mCoverageLayer && mFilterFeatures && !mFilterExpression.isEmpty() )
mCoverageLayer->setSubsetString( mOriginalFilterExpression );
if ( mCoverageLayer && mFilterFeatures && !mFilterExpression.isEmpty() )
mCoverageLayer->setSubsetString( mOriginalFilterExpression );
}

int QgsLayoutAtlas::count() const
Expand Down
2 changes: 1 addition & 1 deletion src/core/layout/qgslayoutatlas.h
Expand Up @@ -218,7 +218,7 @@ class CORE_EXPORT QgsLayoutAtlas : public QObject, public QgsAbstractLayoutItera
* Filters the coverage layer according to the current atlas filter expression.
* Only filters when the coverage layer features are set to be filtered by the atlas.
*
* \see unfilterCoverageLayer()
* \see unFilterCoverageLayer()
* \since QGIS 3.22
*/
void filterCoverageLayer();
Expand Down

0 comments on commit ef318f4

Please sign in to comment.