Skip to content

Commit 7f9de72

Browse files
nyalldawsonnyalldawson
committed
Remove DataDefinedSizeScale symbol RenderHint
This flag is no longer set anywhere in QGIS itself
1 parent 8301ba2 commit 7f9de72

File tree

8 files changed

+11
-49
lines changed

8 files changed

+11
-49
lines changed

‎doc/api_break.dox

+1
Original file line numberDiff line numberDiff line change
@@ -950,6 +950,7 @@ and renamed to RenderUnit. QgsSymbol::OutputUnitList was renamed to QgsUnitTypes
950950
parameters or QgsSymbol::OutputUnitList parameters now take QgsUnitTypes::RenderUnit or QgsUnitTypes::RenderUnitList parameters respectively.</li>
951951
<li>startRender() now accepts a QgsFields reference, not a pointer.</li>
952952
<li>isSymbolLayerCompatible() was removed. Use QgsSymbolLayer::isCompatibleWithSymbol() instead.</li>
953+
<li>The DataDefinedSizeScale flag has been removed. This is no longer used and data defined scaling on a symbol layer level should be used instead.</li>
953954
</ul>
954955

955956
\subsection qgis_api_break_3_0_QgsSymbolLayer QgsSymbolLayer (renamed from QgsSymbolLayerV2)

‎python/core/symbology-ng/qgssymbol.sip

-1
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,6 @@ class QgsSymbol
4141

4242
enum RenderHint
4343
{
44-
DataDefinedSizeScale,
4544
DataDefinedRotation
4645
};
4746

‎src/core/dxf/qgsdxfexport.cpp

+1-2
Original file line numberDiff line numberDiff line change
@@ -4168,8 +4168,7 @@ bool QgsDxfExport::hasDataDefinedProperties( const QgsSymbolLayer* sl, const Qgs
41684168
return false;
41694169
}
41704170

4171-
if ( symbol->renderHints() & QgsSymbol::DataDefinedSizeScale ||
4172-
symbol->renderHints() & QgsSymbol::DataDefinedRotation )
4171+
if ( symbol->renderHints() & QgsSymbol::DataDefinedRotation )
41734172
{
41744173
return true;
41754174
}

‎src/core/symbology-ng/qgsellipsesymbollayer.cpp

+2-18
Original file line numberDiff line numberDiff line change
@@ -550,11 +550,7 @@ QSizeF QgsEllipseSymbolLayer::calculateSize( QgsSymbolRenderContext& context, do
550550
context.setOriginalValueVariable( mSymbolWidth );
551551
width = evaluateDataDefinedProperty( QgsSymbolLayer::EXPR_WIDTH, context, mSymbolWidth ).toDouble();
552552
}
553-
else if ( context.renderHints() & QgsSymbol::DataDefinedSizeScale ) //2. priority: is data defined size on symbol level
554-
{
555-
width = mSize;
556-
}
557-
else //3. priority: global width setting
553+
else //2. priority: global width setting
558554
{
559555
width = mSymbolWidth;
560556
}
@@ -570,11 +566,7 @@ QSizeF QgsEllipseSymbolLayer::calculateSize( QgsSymbolRenderContext& context, do
570566
context.setOriginalValueVariable( mSymbolHeight );
571567
height = evaluateDataDefinedProperty( QgsSymbolLayer::EXPR_HEIGHT, context, mSymbolHeight ).toDouble();
572568
}
573-
else if ( context.renderHints() & QgsSymbol::DataDefinedSizeScale ) //2. priority: is data defined size on symbol level
574-
{
575-
height = mSize;
576-
}
577-
else //3. priority: global height setting
569+
else //2. priority: global height setting
578570
{
579571
height = mSymbolHeight;
580572
}
@@ -745,10 +737,6 @@ bool QgsEllipseSymbolLayer::writeDxf( QgsDxfExport& e, double mmMapUnitScaleFact
745737
context.setOriginalValueVariable( mSymbolWidth );
746738
symbolWidth = evaluateDataDefinedProperty( QgsSymbolLayer::EXPR_WIDTH, context, mSymbolWidth ).toDouble();
747739
}
748-
else if ( context.renderHints() & QgsSymbol::DataDefinedSizeScale ) //2. priority: is data defined size on symbol level
749-
{
750-
symbolWidth = mSize;
751-
}
752740
if ( mSymbolWidthUnit == QgsUnitTypes::RenderMillimeters )
753741
{
754742
symbolWidth *= mmMapUnitScaleFactor;
@@ -761,10 +749,6 @@ bool QgsEllipseSymbolLayer::writeDxf( QgsDxfExport& e, double mmMapUnitScaleFact
761749
context.setOriginalValueVariable( mSymbolHeight );
762750
symbolHeight = evaluateDataDefinedProperty( QgsSymbolLayer::EXPR_HEIGHT, context, mSymbolHeight ).toDouble();
763751
}
764-
else if ( context.renderHints() & QgsSymbol::DataDefinedSizeScale ) //2. priority: is data defined size on symbol level
765-
{
766-
symbolHeight = mSize;
767-
}
768752
if ( mSymbolHeightUnit == QgsUnitTypes::RenderMillimeters )
769753
{
770754
symbolHeight *= mmMapUnitScaleFactor;

‎src/core/symbology-ng/qgslinesymbollayer.cpp

-19
Original file line numberDiff line numberDiff line change
@@ -293,12 +293,6 @@ void QgsSimpleLineSymbolLayer::renderPolyline( const QPolygonF& points, QgsSymbo
293293
return;
294294
}
295295

296-
//size scaling by field
297-
if ( context.renderHints() & QgsSymbol::DataDefinedSizeScale )
298-
{
299-
applySizeScale( context, mPen, mSelPen );
300-
}
301-
302296
double offset = mOffset;
303297
applyDataDefinedSymbology( context, mPen, mSelPen, offset );
304298

@@ -480,13 +474,6 @@ QgsSymbolLayer* QgsSimpleLineSymbolLayer::createFromSld( QDomElement &element )
480474
return l;
481475
}
482476

483-
void QgsSimpleLineSymbolLayer::applySizeScale( QgsSymbolRenderContext& context, QPen& pen, QPen& selPen )
484-
{
485-
double scaledWidth = QgsSymbolLayerUtils::convertToPainterUnits( context.renderContext(), mWidth, mWidthUnit, mWidthMapUnitScale );
486-
pen.setWidthF( scaledWidth );
487-
selPen.setWidthF( scaledWidth );
488-
}
489-
490477
void QgsSimpleLineSymbolLayer::applyDataDefinedSymbology( QgsSymbolRenderContext& context, QPen& pen, QPen& selPen, double& offset )
491478
{
492479
if ( !hasDataDefinedProperties() )
@@ -617,10 +604,6 @@ double QgsSimpleLineSymbolLayer::dxfWidth( const QgsDxfExport& e, QgsSymbolRende
617604
context.setOriginalValueVariable( mWidth );
618605
width = evaluateDataDefinedProperty( QgsSymbolLayer::EXPR_WIDTH, context, mWidth ).toDouble() * e.mapUnitScaleFactor( e.symbologyScaleDenominator(), widthUnit(), e.mapUnits() );
619606
}
620-
else if ( context.renderHints() & QgsSymbol::DataDefinedSizeScale )
621-
{
622-
width = QgsSymbolLayerUtils::convertToPainterUnits( context.renderContext(), mWidth, mWidthUnit, mWidthMapUnitScale );
623-
}
624607

625608
return width * e.mapUnitScaleFactor( e.symbologyScaleDenominator(), widthUnit(), e.mapUnits() );
626609
}
@@ -829,8 +812,6 @@ void QgsMarkerLineSymbolLayer::startRender( QgsSymbolRenderContext& context )
829812
int hints = 0;
830813
if ( mRotateMarker )
831814
hints |= QgsSymbol::DataDefinedRotation;
832-
if ( context.renderHints() & QgsSymbol::DataDefinedSizeScale )
833-
hints |= QgsSymbol::DataDefinedSizeScale;
834815
mMarker->setRenderHints( hints );
835816

836817
mMarker->startRender( context.renderContext(), context.fields() );

‎src/core/symbology-ng/qgslinesymbollayer.h

-1
Original file line numberDiff line numberDiff line change
@@ -136,7 +136,6 @@ class CORE_EXPORT QgsSimpleLineSymbolLayer : public QgsLineSymbolLayer
136136
private:
137137
//helper functions for data defined symbology
138138
void applyDataDefinedSymbology( QgsSymbolRenderContext& context, QPen& pen, QPen& selPen, double& offset );
139-
void applySizeScale( QgsSymbolRenderContext& context, QPen& pen, QPen& selPen );
140139
};
141140

142141
/////////

‎src/core/symbology-ng/qgsmarkersymbollayer.cpp

+7-7
Original file line numberDiff line numberDiff line change
@@ -131,7 +131,7 @@ bool QgsSimpleMarkerSymbolLayerBase::shapeIsFilled( QgsSimpleMarkerSymbolLayerBa
131131
void QgsSimpleMarkerSymbolLayerBase::startRender( QgsSymbolRenderContext &context )
132132
{
133133
bool hasDataDefinedRotation = context.renderHints() & QgsSymbol::DataDefinedRotation || hasDataDefinedProperty( QgsSymbolLayer::EXPR_ANGLE );
134-
bool hasDataDefinedSize = context.renderHints() & QgsSymbol::DataDefinedSizeScale || hasDataDefinedProperty( QgsSymbolLayer::EXPR_SIZE );
134+
bool hasDataDefinedSize = hasDataDefinedProperty( QgsSymbolLayer::EXPR_SIZE );
135135

136136
// use either QPolygonF or QPainterPath for drawing
137137
if ( !prepareMarkerShape( mShape ) ) // drawing as a polygon
@@ -612,7 +612,7 @@ double QgsSimpleMarkerSymbolLayerBase::calculateSize( QgsSymbolRenderContext &co
612612
{
613613
double scaledSize = mSize;
614614

615-
hasDataDefinedSize = context.renderHints() & QgsSymbol::DataDefinedSizeScale || hasDataDefinedProperty( QgsSymbolLayer::EXPR_SIZE );
615+
hasDataDefinedSize = hasDataDefinedProperty( QgsSymbolLayer::EXPR_SIZE );
616616
bool ok = true;
617617
if ( hasDataDefinedProperty( QgsSymbolLayer::EXPR_SIZE ) )
618618
{
@@ -825,7 +825,7 @@ void QgsSimpleMarkerSymbolLayer::startRender( QgsSymbolRenderContext& context )
825825
mSelPen.setWidthF( QgsSymbolLayerUtils::convertToPainterUnits( context.renderContext(), mOutlineWidth, mOutlineWidthUnit, mOutlineWidthMapUnitScale ) );
826826

827827
bool hasDataDefinedRotation = context.renderHints() & QgsSymbol::DataDefinedRotation || hasDataDefinedProperty( QgsSymbolLayer::EXPR_ANGLE );
828-
bool hasDataDefinedSize = context.renderHints() & QgsSymbol::DataDefinedSizeScale || hasDataDefinedProperty( QgsSymbolLayer::EXPR_SIZE );
828+
bool hasDataDefinedSize = hasDataDefinedProperty( QgsSymbolLayer::EXPR_SIZE );
829829

830830
// use caching only when:
831831
// - size, rotation, shape, color, border color is not data-defined
@@ -1237,7 +1237,7 @@ bool QgsSimpleMarkerSymbolLayer::writeDxf( QgsDxfExport& e, double mmMapUnitScal
12371237
//data defined size?
12381238
double size = mSize;
12391239

1240-
bool hasDataDefinedSize = context.renderHints() & QgsSymbol::DataDefinedSizeScale || hasDataDefinedProperty( QgsSymbolLayer::EXPR_SIZE );
1240+
bool hasDataDefinedSize = hasDataDefinedProperty( QgsSymbolLayer::EXPR_SIZE );
12411241

12421242
//data defined size
12431243
bool ok = true;
@@ -2053,7 +2053,7 @@ void QgsSvgMarkerSymbolLayer::renderPoint( QPointF point, QgsSymbolRenderContext
20532053
double QgsSvgMarkerSymbolLayer::calculateSize( QgsSymbolRenderContext& context, bool& hasDataDefinedSize ) const
20542054
{
20552055
double scaledSize = mSize;
2056-
hasDataDefinedSize = context.renderHints() & QgsSymbol::DataDefinedSizeScale || hasDataDefinedProperty( QgsSymbolLayer::EXPR_SIZE );
2056+
hasDataDefinedSize = hasDataDefinedProperty( QgsSymbolLayer::EXPR_SIZE );
20572057

20582058
bool ok = true;
20592059
if ( hasDataDefinedProperty( QgsSymbolLayer::EXPR_SIZE ) )
@@ -2268,7 +2268,7 @@ bool QgsSvgMarkerSymbolLayer::writeDxf( QgsDxfExport& e, double mmMapUnitScaleFa
22682268
//size
22692269
double size = mSize;
22702270

2271-
bool hasDataDefinedSize = context.renderHints() & QgsSymbol::DataDefinedSizeScale || hasDataDefinedProperty( QgsSymbolLayer::EXPR_SIZE );
2271+
bool hasDataDefinedSize = hasDataDefinedProperty( QgsSymbolLayer::EXPR_SIZE );
22722272

22732273
bool ok = true;
22742274
if ( hasDataDefinedProperty( QgsSymbolLayer::EXPR_SIZE ) )
@@ -2649,7 +2649,7 @@ void QgsFontMarkerSymbolLayer::calculateOffsetAndRotation( QgsSymbolRenderContex
26492649
double QgsFontMarkerSymbolLayer::calculateSize( QgsSymbolRenderContext& context )
26502650
{
26512651
double scaledSize = mSize;
2652-
bool hasDataDefinedSize = context.renderHints() & QgsSymbol::DataDefinedSizeScale || hasDataDefinedProperty( QgsSymbolLayer::EXPR_SIZE );
2652+
bool hasDataDefinedSize = hasDataDefinedProperty( QgsSymbolLayer::EXPR_SIZE );
26532653

26542654
bool ok = true;
26552655
if ( hasDataDefinedProperty( QgsSymbolLayer::EXPR_SIZE ) )

‎src/core/symbology-ng/qgssymbol.h

-1
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,6 @@ class CORE_EXPORT QgsSymbol
8282

8383
enum RenderHint
8484
{
85-
DataDefinedSizeScale = 1,
8685
DataDefinedRotation = 2
8786
};
8887

0 commit comments

Comments
 (0)