Permalink
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Browse files
Fix check if ATLAS_PK parameter is there
- Loading branch information
|
@@ -1137,11 +1137,6 @@ namespace QgsWms |
|
|
return label; |
|
|
} |
|
|
|
|
|
bool QgsWmsParameters::atlasPrint() const |
|
|
{ |
|
|
return mWmsParameters.contains( QgsWmsParameter::ATLAS_PK ); |
|
|
} |
|
|
|
|
|
QStringList QgsWmsParameters::atlasPk() const |
|
|
{ |
|
|
return mWmsParameters[ QgsWmsParameter::ATLAS_PK ].toStringList(); |
|
|
|
@@ -1149,8 +1149,6 @@ namespace QgsWms |
|
|
*/ |
|
|
QString layoutParameter( const QString &id, bool &ok ) const; |
|
|
|
|
|
//! True if ATLAS_ID parameter is set |
|
|
bool atlasPrint() const; |
|
|
//! Return ATLAS_ID parameter |
|
|
QStringList atlasPk() const; |
|
|
|
|
|
|
@@ -379,7 +379,7 @@ namespace QgsWms |
|
|
//atlas print? |
|
|
QgsLayoutAtlas *atlas = 0; |
|
|
QStringList atlasPk = mWmsParameters.atlasPk(); |
|
|
if ( mWmsParameters.atlasPrint() ) |
|
|
if ( atlasPk.size() > 0 ) //atlas print requested? |
|
|
{ |
|
|
atlas = layout->atlas(); |
|
|
if ( !atlas || !atlas->enabled() ) |
|
|