merged svghmi
authorEdouard Tisserant <edouard.tisserant@gmail.com>
Thu, 25 Feb 2021 11:22:10 +0100
branchsvghmi
changeset 3164 ea4a61b4a325
parent 3162 fbe1ffaa56cf (diff)
parent 3163 7cf38cd0d820 (current diff)
child 3165 2db69e2c5673
merged
--- a/svghmi/widgets_common.ysl2	Wed Feb 24 09:37:00 2021 +0100
+++ b/svghmi/widgets_common.ysl2	Thu Feb 25 11:22:10 2021 +0100
@@ -347,6 +347,7 @@
 
 const "included_ids","$parsed_widgets/widget[not(@type = $excluded_types) and not(@id = $discardable_elements/@id)]/@id";
 const "hmi_widgets","$hmi_elements[@id = $included_ids]";
+const "result_widgets","$result_svg_ns//*[@id = $hmi_widgets/@id]";
 
 emit "declarations:hmi-elements" {
     | var hmi_widgets = {
@@ -362,7 +363,7 @@
     const "widget_type","@type";
     foreach "str:split($labels)" {
         const "name",".";
-        const "elt","$result_svg_ns//*[@id = $hmi_element/@id]//*[@inkscape:label=$name][1]";
+        const "elt","$result_widgets[@id = $hmi_element/@id]//*[@inkscape:label=$name][1]";
         choose {
             when "not($elt/@id)" {
                 if "$mandatory='yes'" {