sharpetronics/QGIS
1
0
Fork 0
mirror of https://github.com/qgis/QGIS.git synced 2025-10-11 00:04:09 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #62535 from nyalldawson/backport_62488

Browse Source 
Add (hidden) setting to force raster clip masks for layout exports (3.44 backport)
This commit is contained in:
Alexander Bruy 2025-07-08 09:32:00 +01:00 committed by GitHub
commit cf08ec10dd
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 16 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
python/PyQt6/core/auto_generated/layout/qgslayoutitemmap.sip.in
View File

@ -314,6 +314,7 @@ Layout graphical items for displaying a map.
%End %End
public: public:
enum AtlasScalingMode /BaseType=IntEnum/ enum AtlasScalingMode /BaseType=IntEnum/
{ {
Fixed, Fixed,

1
python/core/auto_generated/layout/qgslayoutitemmap.sip.in
View File

@ -314,6 +314,7 @@ Layout graphical items for displaying a map.
%End %End
public: public:
enum AtlasScalingMode enum AtlasScalingMode
{ {
Fixed, Fixed,

7
src/core/layout/qgslayoutitemmap.cpp
View File

@ -40,6 +40,7 @@
#include "qgslabelingresults.h" #include "qgslabelingresults.h"
#include "qgsvectortileutils.h" #include "qgsvectortileutils.h"
#include "qgsunittypes.h" #include "qgsunittypes.h"
#include "qgssettingstree.h"
#include <QApplication> #include <QApplication>
#include <QPainter> #include <QPainter>
@ -47,6 +48,8 @@
#include <QStyleOptionGraphicsItem> #include <QStyleOptionGraphicsItem>
#include <QTimer> #include <QTimer>
const QgsSettingsEntryBool *QgsLayoutItemMap::settingForceRasterMasks = new QgsSettingsEntryBool( QStringLiteral( "force-raster-masks" ), QgsSettingsTree::sTreeLayout, false, QStringLiteral( "Whether to force rasterised clipping masks, regardless of output format." ) );
QgsLayoutItemMap::QgsLayoutItemMap( QgsLayout *layout ) QgsLayoutItemMap::QgsLayoutItemMap( QgsLayout *layout )
: QgsLayoutItem( layout ) : QgsLayoutItem( layout )
, mAtlasClippingSettings( new QgsLayoutItemMapAtlasClippingSettings( this ) ) , mAtlasClippingSettings( new QgsLayoutItemMapAtlasClippingSettings( this ) )
@ -1751,6 +1754,10 @@ QgsMapSettings QgsLayoutItemMap::mapSettings( const QgsRectangle &extent, QSizeF
jobMapSettings.setSimplifyMethod( mLayout->renderContext().simplifyMethod() ); jobMapSettings.setSimplifyMethod( mLayout->renderContext().simplifyMethod() );
jobMapSettings.setMaskSettings( mLayout->renderContext().maskSettings() ); jobMapSettings.setMaskSettings( mLayout->renderContext().maskSettings() );
jobMapSettings.setRendererUsage( Qgis::RendererUsage::Export ); jobMapSettings.setRendererUsage( Qgis::RendererUsage::Export );
if ( settingForceRasterMasks->value() )
{
jobMapSettings.setFlag( Qgis::MapSettingsFlag::ForceRasterMasks, true );
}
} }
else else
{ {

7
src/core/layout/qgslayoutitemmap.h
View File

@ -321,6 +321,13 @@ class CORE_EXPORT QgsLayoutItemMap : public QgsLayoutItem, public QgsTemporalRan
public: public:
/**
* Settings entry - Whether to force rasterised clipping masks, regardless of output format.
*
* \since QGIS 4.0
*/
static const QgsSettingsEntryBool *settingForceRasterMasks SIP_SKIP;
/** /**
* Scaling modes used for the serial rendering (atlas) * Scaling modes used for the serial rendering (atlas)
*/ */