Add Symbol Legend expression (qgis#4188)

m-kuhn · Sep 14, 2019 · 44ba189 · 44ba189
1 parent 7eb37fe
commit 44ba189
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 0 deletions.
diff --git a/source/docs/documentation_guidelines/substitutions.rst b/source/docs/documentation_guidelines/substitutions.rst
@@ -205,6 +205,7 @@ Icon                            Substitution                        Icon
 |expression|                    ``|expression|``                    |dataDefineOn|                  ``|dataDefineOn|``
 |dataDefineExpressionOn|        ``|dataDefineExpressionOn|``        |dataDefineError|               ``|dataDefineError|``
 |dataDefineExpressionError|     ``|dataDefineExpressionError|``
+|addExpression|                 ``|addExpression|``
 |expressionFilter|              ``|expressionFilter|``              |filterMap|                     ``|filterMap|``
 ==============================  ==================================  ==============================  ==================================
 
@@ -482,6 +483,8 @@ Icon                            Substitution                        Icon
    :width: 1.5em
 .. |addDelimitedTextLayer| image:: /static/common/mActionAddDelimitedTextLayer.png
    :width: 1.5em
+.. |addExpression| image:: /static/common/mActionAddExpression.png
+   :width: 1.5em
 .. |addHtml| image:: /static/common/mActionAddHtml.png
    :width: 1.5em
 .. |addLayer| image:: /static/common/mActionAddLayer.png

diff --git a/source/docs/user_manual/print_composer/composer_items/composer_legend.rst b/source/docs/user_manual/print_composer/composer_items/composer_legend.rst
@@ -103,6 +103,9 @@ panel provides the following functionalities (see figure_layout_legend_items_):
     symbology), you can specify a boolean expression to remove from the legend
     tree, styles that have no feature satisfying a condition. Note that the
     features are nevertheless kept and shown in the layout map item.
+  * |addExpression| :sup:`Add symbol expression` allows you to add expressions
+    to each symbol label of a given layer. The label is represented by 
+    the variable "@symbol_label" in the expression.
 
   While the default behavior of the legend item is to mimic the
   :guilabel:`Layers panel` tree, displaying the same groups, layers and classes
@@ -184,6 +187,8 @@ column or line can be customized through this dialog.
    please add it also to the substitutions.txt file in the
    source folder.
 
+.. |addExpression| image:: /static/common/mActionAddExpression.png
+   :width: 1.5em
 .. |addGroup| image:: /static/common/mActionAddGroup.png
    :width: 1.5em
 .. |addLegend| image:: /static/common/mActionAddLegend.png

diff --git a/source/docs/user_manual/print_composer/composer_items/img/legend_items.png b/source/docs/user_manual/print_composer/composer_items/img/legend_items.png
diff --git a/source/substitutions.txt b/source/substitutions.txt
@@ -41,6 +41,8 @@
    :width: 1.5em
 .. |addDelimitedTextLayer| image:: /static/common/mActionAddDelimitedTextLayer.png
    :width: 1.5em
+.. |addExpression| image:: /static/common/mActionAddExpression.png
+   :width: 1.5em
 .. |addGCPPoint| image:: /static/common/mActionAddGCPPoint.png
    :width: 1.5em
 .. |addGroup| image:: /static/common/mActionAddGroup.png

diff --git a/static/common/mActionAddExpression.png b/static/common/mActionAddExpression.png