beremiz: comparison svghmi/gen_index

equal deleted inserted replaced

-:f7349ca820c9
+:6d39beb19f38
 // returns all directly or indirectly refered elements
 def "func:refered_elements" {
 param "elems";
 const "descend", "$elems/descendant-or-self::svg:*";
 const "clones", "$descend[self::svg:use]";
-// TODO optimize using Xpath' id()
 const "originals", "//svg:*[concat('#',@id) = $clones/@xlink:href]";
 choose {
 when "$originals"
 result "$descend | func:refered_elements($originals)";
 otherwise
 result "$descend";
 }
 }
 def "func:intersect_1d" {
-/* it is assumed that a1 > a0 and b1 > b0 */
+// it is assumed that a1 > a0 and b1 > b0
 param "a0";
 param "a1";
 param "b0";
 param "b1";
 //    |   |  |  |
 //    |   '-----'
 //    |a     |
 //    '------'
 //
 // 2 - overlapping
 //        .-----.
 //        |  a  |
 //    .---|-----|---.
 //    |   '-----'   |
 //    | b           |
 //    '-------------'
 //
 // 3 - overlapping
 //        .-----.
 //        |  b  |
 //    .---|-----|---.
 //    |   '-----'   |
 //    | a           |
 //    '-------------'
 //
 //    |   |  a  |   |
 //    |b  '-----'   |
 //    '-------------'
 //
 // 6 - overlapping
 //        .----.
 //        |   b|
 //    .---|----|---.
 //    |a  |    |   |
 //    '---|----|---'
 //        '----'
 //
 }
 // return overlapping geometry for a given element
 // all intersercting element are returned
 // except groups, that must be contained to be counted in
-const "groups", "/svg:svg | //svg:g";
 def "func:overlapping_geometry" {
 param "elt";
+const "groups", "/svg:svg | //svg:g";
 const "g", "$geometry[@Id = $elt/@id]";
 const "candidates", "$geometry[@Id != $elt/@id]";
 result """$candidates[(@Id = $groups/@id and (func:intersect($g, .) = 9)) or
 (not(@Id = $groups/@id) and (func:intersect($g, .) > 0 ))]""";
 }
 result "/..";
 }
 }
 }
 const "required_elements",
 """//svg:defs/descendant-or-self::svg:*
 | func:required_elements($hmi_pages)/ancestor-or-self::svg:*""";
 const "discardable_elements", "//svg:*[not(@id = $required_elements/@id)]";
 def "func:sumarized_elements" {
 param "elements";
 const "short_list", "$elements[not(ancestor::*/@id = $elements/@id)]";
 const "filled_groups", """$short_list/parent::svg:*[
 not(descendant::*[
 not(self::svg:g) and
 not(@id = $discardable_elements/@id) and
 not(@id = $short_list/descendant-or-self::*[not(self::svg:g)]/@id)
 ])]""";
 const "groups_to_add", "$filled_groups[not(ancestor::*/@id = $filled_groups/@id)]";
 result "$groups_to_add | $short_list[not(ancestor::svg:g/@id = $filled_groups/@id)]";
 }
 def "func:detachable_elements" {
 param "pages";
 choose{
 when "$pages"{
 result """func:sumarized_elements(func:all_related_elements($pages[1]))
 | func:detachable_elements($pages[position()!=1])""";
 }otherwise{
 result "/..";
 }
 }
 }
 const "detachable_elements", "func:detachable_elements($hmi_pages)";
-// const "essential_elements", "$detachable_elements | /svg:svg/svg:defs";
-// const "required_elements", "$essential_elements//svg:* | $essential_elements/ancestor-or-self::svg:*";
+//////////////// HMI Tree Index
 template "*", mode="index" {
 param "index", "0";
 param "parentpath", "''";
 const "content" {
 with "index", "$index + count(exsl:node-set($content)/*)";
 with "parentpath" > «$parentpath»
 }
 }
-/* Identity template :
-*  - copy every attributes
-*  - copy every sub-elements
+//////////////// Inline SVG
-*/
+// Identity template :
+//  - copy every attributes
+//  - copy every sub-elements
 template "@* | node()", mode="inline_svg" {
-/* use real xsl:copy instead copy-of alias from yslt.yml2 */
+// use real xsl:copy instead copy-of alias from yslt.yml2
 if "not(@id = $discardable_elements/@id)"
 xsl:copy apply "@* | node()", mode="inline_svg";
 }
-/* replaces inkscape's height and width hints. forces fit */
+// replaces inkscape's height and width hints. forces fit
 template "svg:svg/@width", mode="inline_svg";
 template "svg:svg/@height", mode="inline_svg";
 svgtmpl "svg:svg", mode="inline_svg" svg {
 attrib "preserveAspectRatio" > none
 attrib "height" > 100vh
 attrib "width" > 100vw
 apply "@* | node()", mode="inline_svg";
 }
-/* ensure that coordinate in CSV file generated by inkscape are in default reference frame */
+// ensure that coordinate in CSV file generated by inkscape are in default reference frame
 template "svg:svg[@viewBox!=concat('0 0 ', @width, ' ', @height)]", mode="inline_svg" {
 error > ViewBox settings other than X=0, Y=0 and Scale=1 are not supported
 }
-/* ensure that coordinate in CSV file generated by inkscape match svg default unit */
+// ensure that coordinate in CSV file generated by inkscape match svg default unit
 template "sodipodi:namedview[@units!='px' or @inkscape:document-units!='px']", mode="inline_svg" {
 error > All units must be set to "px" in Inkscape's document properties
 }
 // }
 /*const "mark" > =HMI=\n*/
 /* copy root node and add geometry as comment for a test */
 template "/" {
 comment > Made with SVGHMI. https://beremiz.org
 /* DEBUG DATA */
 comment {
 apply "$hmi_geometry", mode="testgeo";
 }
 when "not($elt_id)" {
 if "$mandatory='yes'" {
 // TODO FIXME error > «$widget_type» widget must have a «$name» element
 warning > «$widget_type» widget must have a «$name» element
 }
 // otherwise produce nothing
 }
 otherwise {
 |     «$name»_elt: id("«$elt_id»"),
 }
 }

branch	svghmi
changeset 2853	6d39beb19f38
parent 2852	f7349ca820c9
child 2854	c7d5f46cc306