Fix attributes from some symbols were not available for data defined

nyalldawson · nyalldawson · commit e94a8cc453d0 · 2015-05-19T22:03:35.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
@@ -2314,6 +2314,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
@@ -1495,6 +1495,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
`@@ -2314,6 +2314,14 @@ QgsSymbolV2* QgsLinePatternFillSymbolLayer::subSymbol()`
`2314`	`2314`	`return mFillLineSymbol;`
`2315`	`2315`	`}`
`2316`	`2316`
	`2317`	`+QSet<QString> QgsLinePatternFillSymbolLayer::usedAttributes() const`
	`2318`	`+{`
	`2319`	`+ QSet<QString> attr = QgsFillSymbolLayerV2::usedAttributes();`
	`2320`	`+ if ( mFillLineSymbol )`
	`2321`	`+ attr.unite( mFillLineSymbol->usedAttributes() );`
	`2322`	`+ return attr;`
	`2323`	`+}`
	`2324`	`+`
`2317`	`2325`	`double QgsLinePatternFillSymbolLayer::estimateMaxBleed() const`
`2318`	`2326`	`{`
`2319`	`2327`	`return 0;`
Original file line number	Diff line number	Diff line change
`@@ -1495,6 +1495,14 @@ QgsMapUnitScale QgsMarkerLineSymbolLayerV2::mapUnitScale() const`
`1495`	`1495`	`return QgsMapUnitScale();`
`1496`	`1496`	`}`
`1497`	`1497`
	`1498`	`+QSet<QString> QgsMarkerLineSymbolLayerV2::usedAttributes() const`
	`1499`	`+{`
	`1500`	`+ QSet<QString> attr = QgsLineSymbolLayerV2::usedAttributes();`
	`1501`	`+ if ( mMarker )`
	`1502`	`+ attr.unite( mMarker->usedAttributes() );`
	`1503`	`+ return attr;`
	`1504`	`+}`
	`1505`	`+`
`1498`	`1506`	`double QgsMarkerLineSymbolLayerV2::estimateMaxBleed() const`
`1499`	`1507`	`{`
`1500`	`1508`	`return ( mMarker->size() / 2.0 ) + mOffset;`