Fix building of legend node tree if embedded widgets are used in the layer

wonder-sk · wonder-sk · commit 10cab93c3652 · 2016-10-20T23:20:57.000+08:00
diff --git a/src/core/layertree/qgslayertreemodel.cpp b/src/core/layertree/qgslayertreemodel.cpp
@@ -44,13 +44,20 @@ class EmbeddedWidgetLegendNode : public QgsLayerTreeModelLegendNode
     EmbeddedWidgetLegendNode( QgsLayerTreeLayer* nodeL )
         : QgsLayerTreeModelLegendNode( nodeL )
     {
+      // we need a valid rule key to allow the model to build a tree out of legend nodes
+      // if that's possible (if there is a node without a rule key, building of tree is cancelled)
+      mRuleKey = "embedded-widget-" + QUuid::createUuid().toString();
     }
 
     virtual QVariant data( int role ) const override
     {
-      Q_UNUSED( role );
+      if ( role == RuleKeyRole )
+        return mRuleKey;
       return QVariant();
     }
+
+  private:
+    QString mRuleKey;
 };
 
 ///@endcond

Original file line number	Diff line number	Diff line change
`@@ -44,13 +44,20 @@ class EmbeddedWidgetLegendNode : public QgsLayerTreeModelLegendNode`
`44`	`44`	`EmbeddedWidgetLegendNode( QgsLayerTreeLayer* nodeL )`
`45`	`45`	`: QgsLayerTreeModelLegendNode( nodeL )`
`46`	`46`	`{`
	`47`	`+ // we need a valid rule key to allow the model to build a tree out of legend nodes`
	`48`	`+ // if that's possible (if there is a node without a rule key, building of tree is cancelled)`
	`49`	`+ mRuleKey = "embedded-widget-" + QUuid::createUuid().toString();`
`47`	`50`	`}`
`48`	`51`
`49`	`52`	`virtual QVariant data( int role ) const override`
`50`	`53`	`{`
`51`		`- Q_UNUSED( role );`
	`54`	`+ if ( role == RuleKeyRole )`
	`55`	`+ return mRuleKey;`
`52`	`56`	`return QVariant();`
`53`	`57`	`}`
	`58`	`+`
	`59`	`+ private:`
	`60`	`+ QString mRuleKey;`
`54`	`61`	`};`
`55`	`62`
`56`	`63`	`///@endcond`