Skip to content

[Backport queued_ltr_backports] [dxf] Fix erroneous handling of rendering context when exporting multiple layers #63242

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: queued_ltr_backports
Choose a base branch
from
Open

[Backport queued_ltr_backports] [dxf] Fix erroneous handling of rendering context when exporting multiple layers #63242

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c677303
[dxf] Fix erroneous handling of rendering context when exporting mult…
nirvn Sep 16, 2025
40c1cc8
Move test to regexp
nirvn Sep 17, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 6 additions & 8 deletions src/core/dxf/qgsdxfexport.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -755,7 +755,7 @@ void QgsDxfExport::writeEntities()
// iterate through the maplayers
for ( DxfLayerJob *job : std::as_const( mJobs ) )
{
QgsSymbolRenderContext sctx( mRenderContext, Qgis::RenderUnit::Millimeters, 1.0, false, Qgis::SymbolRenderHints(), nullptr );
QgsSymbolRenderContext sctx( job->renderContext, Qgis::RenderUnit::Millimeters, 1.0, false, Qgis::SymbolRenderHints(), nullptr );

if ( mSymbologyExport == Qgis::FeatureSymbologyExport::PerSymbolLayer &&
( job->renderer->capabilities() & QgsFeatureRenderer::SymbolLevels ) &&
Expand All @@ -782,12 +782,12 @@ void QgsDxfExport::writeEntities()
QgsFeature fet;
while ( featureIt.nextFeature( fet ) )
{
mRenderContext.expressionContext().setFeature( fet );
job->renderContext.expressionContext().setFeature( fet );
QString lName( dxfLayerName( job->splitLayerAttribute.isNull() ? job->layerDerivedName : fet.attribute( job->splitLayerAttribute ).toString() ) );

sctx.setFeature( &fet );

if ( !job->renderer->willRenderFeature( fet, mRenderContext ) )
if ( !job->renderer->willRenderFeature( fet, job->renderContext ) )
continue;

if ( mSymbologyExport == Qgis::FeatureSymbologyExport::NoSymbology )
Expand All @@ -796,7 +796,7 @@ void QgsDxfExport::writeEntities()
}
else
{
const QgsSymbolList symbolList = job->renderer->symbolsForFeature( fet, mRenderContext );
const QgsSymbolList symbolList = job->renderer->symbolsForFeature( fet, job->renderContext );
bool hasSymbology = symbolList.size() > 0;

if ( hasSymbology && mSymbologyExport == Qgis::FeatureSymbologyExport::PerSymbolLayer ) // symbol layer symbology, but layer does not use symbol levels
Expand Down Expand Up @@ -842,14 +842,14 @@ void QgsDxfExport::writeEntities()

if ( job->labelProvider )
{
job->labelProvider->registerFeature( fet, mRenderContext );
job->labelProvider->registerFeature( fet, job->renderContext );
Q_NOWARN_DEPRECATED_PUSH
registerDxfLayer( job->featureSource.id(), fet.id(), lName );
Q_NOWARN_DEPRECATED_POP
}
else if ( job->ruleBasedLabelProvider )
{
job->ruleBasedLabelProvider->registerFeature( fet, mRenderContext );
job->ruleBasedLabelProvider->registerFeature( fet, job->renderContext );
Q_NOWARN_DEPRECATED_PUSH
registerDxfLayer( job->featureSource.id(), fet.id(), lName );
Q_NOWARN_DEPRECATED_POP
Expand Down Expand Up @@ -2409,8 +2409,6 @@ QString QgsDxfExport::layerName( QgsVectorLayer *vl ) const

void QgsDxfExport::drawLabel( const QString &layerId, QgsRenderContext &context, pal::LabelPosition *label, const QgsPalLayerSettings &settings )
{
Q_UNUSED( context )

if ( !settings.drawLabels )
return;

Expand Down
4 changes: 2 additions & 2 deletions src/core/dxf/qgsdxfexport_p.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,8 @@
*/
struct DxfLayerJob
{
DxfLayerJob( QgsVectorLayer *vl, const QString &layerStyleOverride, QgsRenderContext &renderContext, QgsDxfExport *dxfExport, const QString &splitLayerAttribute, const QString &layerDerivedName )
: renderContext( renderContext )
DxfLayerJob( QgsVectorLayer *vl, const QString &layerStyleOverride, QgsRenderContext &context, QgsDxfExport *dxfExport, const QString &splitLayerAttribute, const QString &layerDerivedName )
: renderContext( context )
, styleOverride( vl )
, featureSource( vl )
, dxfExport( dxfExport )
Expand Down
59 changes: 59 additions & 0 deletions tests/src/core/testqgsdxfexport.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,6 +85,7 @@ class TestQgsDxfExport : public QObject
void testOutputLayerNamePrecedence();
void testMinimumLineWidthExport();
void testWritingCodepage();
void testExpressionContext();

private:
QgsVectorLayer *mPointLayer = nullptr;
Expand All @@ -101,6 +102,16 @@ class TestQgsDxfExport : public QObject
bool fileContainsText( const QString &path, const QString &text, QString *debugInfo = nullptr ) const;
};

void TestQgsDxfExport::setDefaultLabelParams( QgsPalLayerSettings &settings )
{
QgsTextFormat format;
format.setFont( QgsFontUtils::getStandardTestFont( QStringLiteral( "Bold" ) ).family() );
format.setSize( 12 );
format.setNamedStyle( QStringLiteral( "Bold" ) );
format.setColor( QColor( 200, 0, 200 ) );
settings.setFormat( format );
}

void TestQgsDxfExport::initTestCase()
{
QgsApplication::init();
Expand Down Expand Up @@ -1988,6 +1999,54 @@ void TestQgsDxfExport::testWritingCodepage()
QVERIFY( fileContainsText( file2, QStringLiteral( "ANSI_1252" ) ) );
}

void TestQgsDxfExport::testExpressionContext()
{
// This test is aimed at testing whether the right expression context is passed onto symbology and labeling while we are iterating through features.

auto vl = std::make_unique<QgsVectorLayer>( QStringLiteral( "LineString?crs=epsg:4326&field=id:string" ), QStringLiteral( "vl" ), QStringLiteral( "memory" ) );

QgsFeature f;
f.setAttributes( QgsAttributes() << QStringLiteral( "1" ) );
f.setGeometry( QgsGeometry::fromWkt( QStringLiteral( "LineString (-112.5 44.9, -88.6 44.9)" ) ) );
QVERIFY( vl->dataProvider()->addFeature( f ) );

vl->setRenderer( new QgsSingleSymbolRenderer( QgsLineSymbol::createSimple( { { QStringLiteral( "color" ), QStringLiteral( "#000000" ) }, { QStringLiteral( "outline_width" ), 0.6 } } ).release() ) );

QgsPalLayerSettings settings;
settings.fieldName = QStringLiteral( "represent_value(\"Class\")" );
settings.isExpression = true;
QgsTextFormat format;
format.setFont( QgsFontUtils::getStandardTestFont( QStringLiteral( "Bold" ) ).family() );
format.setSize( 12 );
format.setNamedStyle( QStringLiteral( "Bold" ) );
format.setColor( QColor( 200, 0, 200 ) );
settings.setFormat( format );
mPointLayerNoSymbols->setLabeling( new QgsVectorLayerSimpleLabeling( settings ) );
mPointLayerNoSymbols->setLabelsEnabled( true );

QgsDxfExport d;
d.addLayers( QList<QgsDxfExport::DxfLayer>() << QgsDxfExport::DxfLayer( mPointLayerNoSymbols ) << QgsDxfExport::DxfLayer( vl.get() ) );

QgsMapSettings mapSettings;
const QSize size( 640, 480 );
mapSettings.setOutputSize( size );
mapSettings.setExtent( mPointLayerNoSymbols->extent() );
mapSettings.setLayers( QList<QgsMapLayer *>() << mPointLayerNoSymbols << vl.get() );
mapSettings.setOutputDpi( 96 );
mapSettings.setDestinationCrs( mPointLayerNoSymbols->crs() );

d.setMapSettings( mapSettings );
d.setSymbologyScale( 1000 );
d.setSymbologyExport( Qgis::FeatureSymbologyExport::PerFeature );

const QString file = getTempFileName( "context_dxf" );
QFile dxfFile( file );
QCOMPARE( d.writeToFile( &dxfFile, QStringLiteral( "CP1252" ) ), QgsDxfExport::ExportResult::Success );
dxfFile.close();
QString debugInfo;
QVERIFY2( fileContainsText( file, "REGEX Biplane", &debugInfo ), debugInfo.toUtf8().constData() );
}

bool TestQgsDxfExport::fileContainsText( const QString &path, const QString &text, QString *debugInfo ) const
{
QStringList debugLines;
Expand Down
Loading