beremiz

SVGHMI: allow designating widget's sub-elements as main element child rather than descendant. Names staring with "/" in yslt call to labels() only match direct widget childs.

2022-05-05, Edouard Tisserant
a0bd2c4cb8f7
Parents 302efcf746e0
Children e5967a2ae2bb
SVGHMI: allow designating widget's sub-elements as main element child rather than descendant. Names staring with "/" in yslt call to labels() only match direct widget childs.
1 files changed, 4 insertions(+), 2 deletions(-)
  • +4 -2
    svghmi/widgets_common.ysl2
    • --- a/svghmi/widgets_common.ysl2 Thu May 05 10:24:56 2022 +0200
    +++ b/svghmi/widgets_common.ysl2 Thu May 05 10:31:16 2022 +0200
    @@ -395,8 +395,10 @@
    param "hmi_element";
    const "widget_type","@type";
    foreach "str:split($labels)" {
    - const "name",".";
    - const "elt","$result_widgets[@id = $hmi_element/@id]//*[@inkscape:label=$name][1]";
    + const "absolute", "starts-with(., '/')";
    + const "name","substring(.,number($absolute)+1)";
    + const "widget","$result_widgets[@id = $hmi_element/@id]";
    + const "elt","($widget//*[not($absolute) and @inkscape:label=$name] | $widget/*[$absolute and @inkscape:label=$name])[1]";
    choose {
    when "not($elt/@id)" {
    if "$mandatory='yes'" {