# HG changeset patch # User Edouard Tisserant # Date 1584448447 -3600 # Node ID 58e6a91dc37f0365900bb8edb899647d9dd32c59 # Parent bec552270ad11c71c1a5c8ea7c896d20d6e734b8 SVGHMI: Cosmetic changes diff -r bec552270ad1 -r 58e6a91dc37f svghmi/gen_index_xhtml.xslt --- a/svghmi/gen_index_xhtml.xslt Tue Mar 17 13:16:01 2020 +0100 +++ b/svghmi/gen_index_xhtml.xslt Tue Mar 17 13:34:07 2020 +0100 @@ -1,6 +1,7 @@ + @@ -166,7 +167,7 @@ ID, x, y, w, h - +

@@ -227,8 +228,6 @@ - - @@ -568,15 +567,6 @@ - - Unlinked : - - - - - - - @@ -731,7 +721,7 @@ "; var svg_root = id(" - + "); // svghmi.js diff -r bec552270ad1 -r 58e6a91dc37f svghmi/gen_index_xhtml.ysl2 --- a/svghmi/gen_index_xhtml.ysl2 Tue Mar 17 13:16:01 2020 +0100 +++ b/svghmi/gen_index_xhtml.ysl2 Tue Mar 17 13:34:07 2020 +0100 @@ -36,13 +36,12 @@ exclude-result-prefixes="ns str regexp exsl func dyn" { + const "hmi_elements", "//svg:*[starts-with(@inkscape:label, 'HMI:')]"; + include hmi_tree.ysl2 include geometry.ysl2 - const "svg_root_id", "/svg:svg/@id"; - const "hmi_elements", "//svg:*[starts-with(@inkscape:label, 'HMI:')]"; - include detachable_pages.ysl2 include inline_svg.ysl2 @@ -159,7 +158,7 @@ | | var default_page = "«$default_page»"; - | var svg_root = id("«$svg_root_id»"); + | var svg_root = id("«/svg:svg/@id»"); include text svghmi.js | //})(); } diff -r bec552270ad1 -r 58e6a91dc37f svghmi/geometry.ysl2 --- a/svghmi/geometry.ysl2 Tue Mar 17 13:16:01 2020 +0100 +++ b/svghmi/geometry.ysl2 Tue Mar 17 13:34:07 2020 +0100 @@ -10,7 +10,7 @@ // Debug data function "debug_geometry" { | ID, x, y, w, h - foreach "$geometry[@Id = $hmi_elements/@id]" + foreach "$geometry" | «@Id» «@x» «@y» «@w» «@h» } !debug_output_calls.append("debug_geometry")