Consider scale for data defined symbology properties

mhugent · mhugent · commit b1444bbcd541 · 2013-09-16T12:49:46.000+02:00
diff --git a/src/core/symbology-ng/qgsellipsesymbollayerv2.cpp b/src/core/symbology-ng/qgsellipsesymbollayerv2.cpp
@@ -247,7 +247,7 @@ void QgsEllipseSymbolLayerV2::startRender( QgsSymbolV2RenderContext& context )
   mPen.setColor( mOutlineColor );
   mPen.setWidthF( mOutlineWidth * QgsSymbolLayerV2Utils::lineWidthScaleFactor( context.renderContext(), mOutlineWidthUnit ) );
   mBrush.setColor( mFillColor );
-  prepareExpressions( context.layer() );
+  prepareExpressions( context.layer(), context.renderContext().rendererScale() );
 }
 
 void QgsEllipseSymbolLayerV2::stopRender( QgsSymbolV2RenderContext & )
diff --git a/src/core/symbology-ng/qgsfillsymbollayerv2.cpp b/src/core/symbology-ng/qgsfillsymbollayerv2.cpp
@@ -152,7 +152,7 @@ void QgsSimpleFillSymbolLayerV2::startRender( QgsSymbolV2RenderContext& context
   mSelPen = QPen( selPenColor );
   mPen.setStyle( mBorderStyle );
   mPen.setWidthF( mBorderWidth * QgsSymbolLayerV2Utils::lineWidthScaleFactor( context.renderContext(), mBorderWidthUnit ) );
-  prepareExpressions( context.layer() );
+  prepareExpressions( context.layer(), context.renderContext().rendererScale() );
 }
 
 void QgsSimpleFillSymbolLayerV2::stopRender( QgsSymbolV2RenderContext& context )
@@ -576,7 +576,7 @@ void QgsSVGFillSymbolLayer::startRender( QgsSymbolV2RenderContext& context )
     mOutline->startRender( context.renderContext() );
   }
 
-  prepareExpressions( context.layer() );
+  prepareExpressions( context.layer(), context.renderContext().rendererScale() );
 }
 
 void QgsSVGFillSymbolLayer::stopRender( QgsSymbolV2RenderContext& context )
@@ -1096,7 +1096,7 @@ void QgsLinePatternFillSymbolLayer::startRender( QgsSymbolV2RenderContext& conte
     mOutline->startRender( context.renderContext() );
   }
 
-  prepareExpressions( context.layer() );
+  prepareExpressions( context.layer(), context.renderContext().rendererScale() );
 }
 
 void QgsLinePatternFillSymbolLayer::stopRender( QgsSymbolV2RenderContext & )
@@ -1467,7 +1467,7 @@ void QgsPointPatternFillSymbolLayer::startRender( QgsSymbolV2RenderContext& cont
   {
     mOutline->startRender( context.renderContext() );
   }
-  prepareExpressions( context.layer() );
+  prepareExpressions( context.layer(), context.renderContext().rendererScale() );
 }
 
 void QgsPointPatternFillSymbolLayer::stopRender( QgsSymbolV2RenderContext& context )
diff --git a/src/core/symbology-ng/qgslinesymbollayerv2.cpp b/src/core/symbology-ng/qgslinesymbollayerv2.cpp
@@ -159,7 +159,7 @@ void QgsSimpleLineSymbolLayerV2::startRender( QgsSymbolV2RenderContext& context
   mSelPen.setColor( selColor );
 
   //prepare expressions for data defined properties
-  prepareExpressions( context.layer() );
+  prepareExpressions( context.layer(), context.renderContext().rendererScale() );
 }
 
 void QgsSimpleLineSymbolLayerV2::stopRender( QgsSymbolV2RenderContext& context )
@@ -538,7 +538,7 @@ void QgsMarkerLineSymbolLayerV2::startRender( QgsSymbolV2RenderContext& context
   mMarker->startRender( context.renderContext(), context.layer() );
 
   //prepare expressions for data defined properties
-  prepareExpressions( context.layer() );
+  prepareExpressions( context.layer(), context.renderContext().rendererScale() );
 }
 
 void QgsMarkerLineSymbolLayerV2::stopRender( QgsSymbolV2RenderContext& context )
diff --git a/src/core/symbology-ng/qgsmarkersymbollayerv2.cpp b/src/core/symbology-ng/qgsmarkersymbollayerv2.cpp
@@ -211,7 +211,7 @@ void QgsSimpleMarkerSymbolLayerV2::startRender( QgsSymbolV2RenderContext& contex
     mSelCache = QImage();
   }
 
-  prepareExpressions( context.layer() );
+  prepareExpressions( context.layer(), context.renderContext().rendererScale() );
 }
 
 
@@ -830,7 +830,7 @@ void QgsSvgMarkerSymbolLayerV2::startRender( QgsSymbolV2RenderContext& context )
 {
   mOrigSize = mSize; // save in case the size would be data defined
   Q_UNUSED( context );
-  prepareExpressions( context.layer() );
+  prepareExpressions( context.layer(), context.renderContext().rendererScale() );
 }
 
 void QgsSvgMarkerSymbolLayerV2::stopRender( QgsSymbolV2RenderContext& context )
diff --git a/src/core/symbology-ng/qgssymbollayerv2.cpp b/src/core/symbology-ng/qgssymbollayerv2.cpp
@@ -76,7 +76,7 @@ void QgsSymbolLayerV2::removeDataDefinedProperties()
   mDataDefinedProperties.clear();
 }
 
-void QgsSymbolLayerV2::prepareExpressions( const QgsVectorLayer* vl )
+void QgsSymbolLayerV2::prepareExpressions( const QgsVectorLayer* vl, double scale )
 {
   if ( !vl )
   {
@@ -90,6 +90,10 @@ void QgsSymbolLayerV2::prepareExpressions( const QgsVectorLayer* vl )
     if ( it.value() )
     {
       it.value()->prepare( fields );
+      if ( scale > 0 )
+      {
+        it.value()->setScale( scale );
+      }
     }
   }
 }
diff --git a/src/core/symbology-ng/qgssymbollayerv2.h b/src/core/symbology-ng/qgssymbollayerv2.h
@@ -108,7 +108,7 @@ class CORE_EXPORT QgsSymbolLayerV2
     static const bool selectFillBorder = false;  // Fill symbol layer also selects border symbology
     static const bool selectFillStyle = false;   // Fill symbol uses symbol layer style..
 
-    virtual void prepareExpressions( const QgsVectorLayer* vl );
+    virtual void prepareExpressions( const QgsVectorLayer* vl, double scale = -1 );
     virtual QgsExpression* expression( const QString& property );
     /**Saves data defined properties to string map*/
     void saveDataDefinedProperties( QgsStringMap& stringMap ) const;

Original file line number	Diff line number	Diff line change
`@@ -247,7 +247,7 @@ void QgsEllipseSymbolLayerV2::startRender( QgsSymbolV2RenderContext& context )`
`247`	`247`	`mPen.setColor( mOutlineColor );`
`248`	`248`	`mPen.setWidthF( mOutlineWidth * QgsSymbolLayerV2Utils::lineWidthScaleFactor( context.renderContext(), mOutlineWidthUnit ) );`
`249`	`249`	`mBrush.setColor( mFillColor );`
`250`		`- prepareExpressions( context.layer() );`
	`250`	`+ prepareExpressions( context.layer(), context.renderContext().rendererScale() );`
`251`	`251`	`}`
`252`	`252`
`253`	`253`	`void QgsEllipseSymbolLayerV2::stopRender( QgsSymbolV2RenderContext & )`
Original file line number	Diff line number	Diff line change
`@@ -152,7 +152,7 @@ void QgsSimpleFillSymbolLayerV2::startRender( QgsSymbolV2RenderContext& context`
`152`	`152`	`mSelPen = QPen( selPenColor );`
`153`	`153`	`mPen.setStyle( mBorderStyle );`
`154`	`154`	`mPen.setWidthF( mBorderWidth * QgsSymbolLayerV2Utils::lineWidthScaleFactor( context.renderContext(), mBorderWidthUnit ) );`
`155`		`- prepareExpressions( context.layer() );`
	`155`	`+ prepareExpressions( context.layer(), context.renderContext().rendererScale() );`
`156`	`156`	`}`
`157`	`157`
`158`	`158`	`void QgsSimpleFillSymbolLayerV2::stopRender( QgsSymbolV2RenderContext& context )`
`@@ -576,7 +576,7 @@ void QgsSVGFillSymbolLayer::startRender( QgsSymbolV2RenderContext& context )`
`576`	`576`	`mOutline->startRender( context.renderContext() );`
`577`	`577`	`}`
`578`	`578`
`579`		`- prepareExpressions( context.layer() );`
	`579`	`+ prepareExpressions( context.layer(), context.renderContext().rendererScale() );`
`580`	`580`	`}`
`581`	`581`
`582`	`582`	`void QgsSVGFillSymbolLayer::stopRender( QgsSymbolV2RenderContext& context )`
`@@ -1096,7 +1096,7 @@ void QgsLinePatternFillSymbolLayer::startRender( QgsSymbolV2RenderContext& conte`
`1096`	`1096`	`mOutline->startRender( context.renderContext() );`
`1097`	`1097`	`}`
`1098`	`1098`
`1099`		`- prepareExpressions( context.layer() );`
	`1099`	`+ prepareExpressions( context.layer(), context.renderContext().rendererScale() );`
`1100`	`1100`	`}`
`1101`	`1101`
`1102`	`1102`	`void QgsLinePatternFillSymbolLayer::stopRender( QgsSymbolV2RenderContext & )`
`@@ -1467,7 +1467,7 @@ void QgsPointPatternFillSymbolLayer::startRender( QgsSymbolV2RenderContext& cont`
`1467`	`1467`	`{`
`1468`	`1468`	`mOutline->startRender( context.renderContext() );`
`1469`	`1469`	`}`
`1470`		`- prepareExpressions( context.layer() );`
	`1470`	`+ prepareExpressions( context.layer(), context.renderContext().rendererScale() );`
`1471`	`1471`	`}`
`1472`	`1472`
`1473`	`1473`	`void QgsPointPatternFillSymbolLayer::stopRender( QgsSymbolV2RenderContext& context )`
Original file line number	Diff line number	Diff line change
`@@ -159,7 +159,7 @@ void QgsSimpleLineSymbolLayerV2::startRender( QgsSymbolV2RenderContext& context`
`159`	`159`	`mSelPen.setColor( selColor );`
`160`	`160`
`161`	`161`	`//prepare expressions for data defined properties`
`162`		`- prepareExpressions( context.layer() );`
	`162`	`+ prepareExpressions( context.layer(), context.renderContext().rendererScale() );`
`163`	`163`	`}`
`164`	`164`
`165`	`165`	`void QgsSimpleLineSymbolLayerV2::stopRender( QgsSymbolV2RenderContext& context )`
`@@ -538,7 +538,7 @@ void QgsMarkerLineSymbolLayerV2::startRender( QgsSymbolV2RenderContext& context`
`538`	`538`	`mMarker->startRender( context.renderContext(), context.layer() );`
`539`	`539`
`540`	`540`	`//prepare expressions for data defined properties`
`541`		`- prepareExpressions( context.layer() );`
	`541`	`+ prepareExpressions( context.layer(), context.renderContext().rendererScale() );`
`542`	`542`	`}`
`543`	`543`
`544`	`544`	`void QgsMarkerLineSymbolLayerV2::stopRender( QgsSymbolV2RenderContext& context )`
Original file line number	Diff line number	Diff line change
`@@ -211,7 +211,7 @@ void QgsSimpleMarkerSymbolLayerV2::startRender( QgsSymbolV2RenderContext& contex`
`211`	`211`	`mSelCache = QImage();`
`212`	`212`	`}`
`213`	`213`
`214`		`- prepareExpressions( context.layer() );`
	`214`	`+ prepareExpressions( context.layer(), context.renderContext().rendererScale() );`
`215`	`215`	`}`
`216`	`216`
`217`	`217`
`@@ -830,7 +830,7 @@ void QgsSvgMarkerSymbolLayerV2::startRender( QgsSymbolV2RenderContext& context )`
`830`	`830`	`{`
`831`	`831`	`mOrigSize = mSize; // save in case the size would be data defined`
`832`	`832`	`Q_UNUSED( context );`
`833`		`- prepareExpressions( context.layer() );`
	`833`	`+ prepareExpressions( context.layer(), context.renderContext().rendererScale() );`
`834`	`834`	`}`
`835`	`835`
`836`	`836`	`void QgsSvgMarkerSymbolLayerV2::stopRender( QgsSymbolV2RenderContext& context )`
Original file line number	Diff line number	Diff line change
`@@ -76,7 +76,7 @@ void QgsSymbolLayerV2::removeDataDefinedProperties()`
`76`	`76`	`mDataDefinedProperties.clear();`
`77`	`77`	`}`
`78`	`78`
`79`		`-void QgsSymbolLayerV2::prepareExpressions( const QgsVectorLayer* vl )`
	`79`	`+void QgsSymbolLayerV2::prepareExpressions( const QgsVectorLayer* vl, double scale )`
`80`	`80`	`{`
`81`	`81`	`if ( !vl )`
`82`	`82`	`{`
`@@ -90,6 +90,10 @@ void QgsSymbolLayerV2::prepareExpressions( const QgsVectorLayer* vl )`
`90`	`90`	`if ( it.value() )`
`91`	`91`	`{`
`92`	`92`	`it.value()->prepare( fields );`
	`93`	`+ if ( scale > 0 )`
	`94`	`+ {`
	`95`	`+ it.value()->setScale( scale );`
	`96`	`+ }`
`93`	`97`	`}`
`94`	`98`	`}`
`95`	`99`	`}`