# HG changeset patch
# User Edouard Tisserant
# Date 1612261254 -3600
# Node ID f8cba959553f1ca6d776ec0f50e7df076bed32b8
# Parent 229795c03e11ed2c63cd38015a9d27ed69d51910# Parent 7ecaefe38f6ffd35752e08880a8edcd695e4a160
Merged
diff -r 7ecaefe38f6f -r f8cba959553f svghmi/detachable_pages.ysl2
--- a/svghmi/detachable_pages.ysl2 Tue Feb 02 10:43:43 2021 +0100
+++ b/svghmi/detachable_pages.ysl2 Tue Feb 02 11:20:54 2021 +0100
@@ -109,7 +109,7 @@
}
const "forEach_widgets_ids", "$parsed_widgets/widget[@type = 'ForEach']/@id";
-const "forEach_widgets", "$hmi_elements[@id = $forEach_widgets_ids]";
+const "forEach_widgets", "$hmi_widgets[@id = $forEach_widgets_ids]";
const "in_forEach_widget_ids", "func:refered_elements($forEach_widgets)[not(@id = $forEach_widgets_ids)]/@id";
template "svg:*", mode="page_desc" {
@@ -121,7 +121,7 @@
const "page_all_elements", "func:all_related_elements($page)";
- const "all_page_widgets","$hmi_elements[@id = $page_all_elements/@id and @id != $page/@id]";
+ const "all_page_widgets","$hmi_widgets[@id = $page_all_elements/@id and @id != $page/@id]";
const "page_managed_widgets","$all_page_widgets[not(@id=$in_forEach_widget_ids)]";
const "page_relative_widgets",
"$page_managed_widgets[func:is_descendant_path(func:widget(@id)/path/@value, $desc/path/@value)]";
diff -r 7ecaefe38f6f -r f8cba959553f svghmi/widgets_common.ysl2
--- a/svghmi/widgets_common.ysl2 Tue Feb 02 10:43:43 2021 +0100
+++ b/svghmi/widgets_common.ysl2 Tue Feb 02 11:20:54 2021 +0100
@@ -255,7 +255,7 @@
||
}
-const "excluded_types", "str:split('Page Lang VarInit')";
+const "excluded_types", "str:split('Page VarInit')";
// Key to filter unique types
key "TypesKey", "widget", "@type";
@@ -275,10 +275,11 @@
||
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]";
emit "declarations:hmi-elements" {
| var hmi_widgets = {
- apply "$hmi_elements[@id = $included_ids]", mode="hmi_widgets";
+ apply "$hmi_widgets", mode="hmi_widgets";
| }
}
diff -r 7ecaefe38f6f -r f8cba959553f tests/svghmi/svghmi_0@svghmi/svghmi.svg
--- a/tests/svghmi/svghmi_0@svghmi/svghmi.svg Tue Feb 02 10:43:43 2021 +0100
+++ b/tests/svghmi/svghmi_0@svghmi/svghmi.svg Tue Feb 02 11:20:54 2021 +0100
@@ -33,48 +33,6 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -240,631 +49,6 @@
id="stop20535" />
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -961,41 +91,6 @@
id="stop960" />
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+ inkscape:bbox-nodes="true" />