Fix attributes from some symbols were not available for data defined

nyalldawson · nyalldawson · commit c5b04efadb4b · 2015-05-19T17:01:40.000+10:00
symbology (line marker, line pattern)
diff --git a/python/core/symbology-ng/qgsfillsymbollayerv2.sip b/python/core/symbology-ng/qgsfillsymbollayerv2.sip
@@ -759,6 +759,8 @@ class QgsLinePatternFillSymbolLayer: QgsImageFillSymbolLayer
     bool setSubSymbol( QgsSymbolV2* symbol );
     QgsSymbolV2* subSymbol();
 
+    QSet<QString> usedAttributes() const;
+
 };
 
 class QgsPointPatternFillSymbolLayer : QgsImageFillSymbolLayer
diff --git a/python/core/symbology-ng/qgslinesymbollayerv2.sip b/python/core/symbology-ng/qgslinesymbollayerv2.sip
@@ -207,6 +207,8 @@ class QgsMarkerLineSymbolLayerV2 : QgsLineSymbolLayerV2
     void setMapUnitScale( const QgsMapUnitScale& scale );
     QgsMapUnitScale mapUnitScale() const;
 
+    QSet<QString> usedAttributes() const;
+
   protected:
 
     void renderPolylineInterval( const QPolygonF& points, QgsSymbolV2RenderContext& context );
diff --git a/src/core/symbology-ng/qgsfillsymbollayerv2.cpp b/src/core/symbology-ng/qgsfillsymbollayerv2.cpp
@@ -2284,6 +2284,14 @@ QgsSymbolV2* QgsLinePatternFillSymbolLayer::subSymbol()
   return mFillLineSymbol;
 }
 
+QSet<QString> QgsLinePatternFillSymbolLayer::usedAttributes() const
+{
+  QSet<QString> attr = QgsFillSymbolLayerV2::usedAttributes();
+  if ( mFillLineSymbol )
+    attr.unite( mFillLineSymbol->usedAttributes() );
+  return attr;
+}
+
 double QgsLinePatternFillSymbolLayer::estimateMaxBleed() const
 {
   return 0;
diff --git a/src/core/symbology-ng/qgsfillsymbollayerv2.h b/src/core/symbology-ng/qgsfillsymbollayerv2.h
@@ -925,6 +925,8 @@ class CORE_EXPORT QgsLinePatternFillSymbolLayer: public QgsImageFillSymbolLayer
     bool setSubSymbol( QgsSymbolV2* symbol ) override;
     QgsSymbolV2* subSymbol() override;
 
+    QSet<QString> usedAttributes() const override;
+
   protected:
     /**Distance (in mm or map units) between lines*/
     double mDistance;
diff --git a/src/core/symbology-ng/qgslinesymbollayerv2.cpp b/src/core/symbology-ng/qgslinesymbollayerv2.cpp
@@ -1469,6 +1469,14 @@ QgsMapUnitScale QgsMarkerLineSymbolLayerV2::mapUnitScale() const
   return QgsMapUnitScale();
 }
 
+QSet<QString> QgsMarkerLineSymbolLayerV2::usedAttributes() const
+{
+  QSet<QString> attr = QgsLineSymbolLayerV2::usedAttributes();
+  if ( mMarker )
+    attr.unite( mMarker->usedAttributes() );
+  return attr;
+}
+
 double QgsMarkerLineSymbolLayerV2::estimateMaxBleed() const
 {
   return ( mMarker->size() / 2.0 ) + mOffset;
diff --git a/src/core/symbology-ng/qgslinesymbollayerv2.h b/src/core/symbology-ng/qgslinesymbollayerv2.h
@@ -256,6 +256,8 @@ class CORE_EXPORT QgsMarkerLineSymbolLayerV2 : public QgsLineSymbolLayerV2
     void setMapUnitScale( const QgsMapUnitScale& scale ) override;
     QgsMapUnitScale mapUnitScale() const override;
 
+    QSet<QString> usedAttributes() const override;
+
   protected:
 
     void renderPolylineInterval( const QPolygonF& points, QgsSymbolV2RenderContext& context );

Original file line number	Diff line number	Diff line change
`@@ -2284,6 +2284,14 @@ QgsSymbolV2* QgsLinePatternFillSymbolLayer::subSymbol()`
`2284`	`2284`	`return mFillLineSymbol;`
`2285`	`2285`	`}`
`2286`	`2286`
	`2287`	`+QSet<QString> QgsLinePatternFillSymbolLayer::usedAttributes() const`
	`2288`	`+{`
	`2289`	`+ QSet<QString> attr = QgsFillSymbolLayerV2::usedAttributes();`
	`2290`	`+ if ( mFillLineSymbol )`
	`2291`	`+ attr.unite( mFillLineSymbol->usedAttributes() );`
	`2292`	`+ return attr;`
	`2293`	`+}`
	`2294`	`+`
`2287`	`2295`	`double QgsLinePatternFillSymbolLayer::estimateMaxBleed() const`
`2288`	`2296`	`{`
`2289`	`2297`	`return 0;`
Original file line number	Diff line number	Diff line change
`@@ -1469,6 +1469,14 @@ QgsMapUnitScale QgsMarkerLineSymbolLayerV2::mapUnitScale() const`
`1469`	`1469`	`return QgsMapUnitScale();`
`1470`	`1470`	`}`
`1471`	`1471`
	`1472`	`+QSet<QString> QgsMarkerLineSymbolLayerV2::usedAttributes() const`
	`1473`	`+{`
	`1474`	`+ QSet<QString> attr = QgsLineSymbolLayerV2::usedAttributes();`
	`1475`	`+ if ( mMarker )`
	`1476`	`+ attr.unite( mMarker->usedAttributes() );`
	`1477`	`+ return attr;`
	`1478`	`+}`
	`1479`	`+`
`1472`	`1480`	`double QgsMarkerLineSymbolLayerV2::estimateMaxBleed() const`
`1473`	`1481`	`{`
`1474`	`1482`	`return ( mMarker->size() / 2.0 ) + mOffset;`