beremiz: comparison svghmi/gen_index

equal deleted inserted replaced

-:ea4a61b4a325
+:2db69e2c5673
 <xsl:apply-templates mode="index" select="$hmitree"/>
 </xsl:variable>
 <xsl:variable name="indexed_hmitree" select="exsl:node-set($_indexed_hmitree)"/>
 <preamble:hmi-tree/>
 <xsl:template match="preamble:hmi-tree">
-<xsl:variable name="_unused" select="ns:ProgressStart(name())"/>
 <xsl:text>
 </xsl:text>
 <xsl:text>/* </xsl:text>
 <xsl:value-of select="local-name()"/>
 <xsl:text> */
 </xsl:text>
 <xsl:text>
 </xsl:text>
 <xsl:text>
 </xsl:text>
-<xsl:variable name="__unused" select="ns:ProgressEnd(name())"/>
 </xsl:template>
 <xsl:template mode="index" match="*">
 <xsl:param name="index" select="0"/>
 <xsl:param name="parentpath" select="''"/>
 <xsl:variable name="content">
 </xsl:with-param>
 </xsl:apply-templates>
 </xsl:template>
 <debug:hmi-tree/>
 <xsl:template match="debug:hmi-tree">
-<xsl:variable name="_unused" select="ns:ProgressStart(name())"/>
 <xsl:text>
 </xsl:text>
 <xsl:text>/* </xsl:text>
 <xsl:value-of select="local-name()"/>
 <xsl:text> */
 </xsl:text>
 <xsl:copy-of select="_parsed_widgets"/>
 <xsl:apply-templates mode="testtree" select="$parsed_widgets"/>
 <xsl:text>
 </xsl:text>
-<xsl:variable name="__unused" select="ns:ProgressEnd(name())"/>
 </xsl:template>
 <xsl:variable name="geometry" select="ns:GetSVGGeometry()"/>
 <debug:geometry/>
 <xsl:template match="debug:geometry">
-<xsl:variable name="_unused" select="ns:ProgressStart(name())"/>
 <xsl:text>
 </xsl:text>
 <xsl:text>/* </xsl:text>
 <xsl:value-of select="local-name()"/>
 <xsl:text> */
 <xsl:text>
 </xsl:text>
 </xsl:for-each>
 <xsl:text>
 </xsl:text>
-<xsl:variable name="__unused" select="ns:ProgressEnd(name())"/>
 </xsl:template>
 <func:function name="func:intersect_1d">
 <xsl:param name="a0"/>
 <xsl:param name="a1"/>
 <xsl:param name="b0"/>
 <xsl:otherwise>
 <func:result select="0"/>
 </xsl:otherwise>
 </xsl:choose>
 </func:function>
+<xsl:variable name="groups" select="/svg:svg | //svg:g"/>
 <func:function name="func:overlapping_geometry">
 <xsl:param name="elt"/>
-<xsl:variable name="groups" select="/svg:svg | //svg:g"/>
 <xsl:variable name="g" select="$geometry[@Id = $elt/@id]"/>
 <xsl:variable name="candidates" select="$geometry[@Id != $elt/@id]"/>
 <func:result select="$candidates[(@Id = $groups/@id and (func:intersect($g, .) = 9)) or &#10;                          (not(@Id = $groups/@id) and (func:intersect($g, .) &gt; 0 ))]"/>
 </func:function>
 <xsl:variable name="hmi_pages_descs" select="$parsed_widgets/widget[@type = 'Page']"/>
 </xsl:otherwise>
 </xsl:choose>
 </xsl:variable>
 <preamble:default-page/>
 <xsl:template match="preamble:default-page">
-<xsl:variable name="_unused" select="ns:ProgressStart(name())"/>
 <xsl:text>
 </xsl:text>
 <xsl:text>/* </xsl:text>
 <xsl:value-of select="local-name()"/>
 <xsl:text> */
 <xsl:value-of select="$default_page"/>
 <xsl:text>";
 </xsl:text>
 <xsl:text>
 </xsl:text>
-<xsl:variable name="__unused" select="ns:ProgressEnd(name())"/>
 </xsl:template>
 <xsl:variable name="keypads_descs" select="$parsed_widgets/widget[@type = 'Keypad']"/>
 <xsl:variable name="keypads" select="$hmi_elements[@id = $keypads_descs/@id]"/>
 <func:function name="func:refered_elements">
 <xsl:param name="elems"/>
 <xsl:otherwise>
 <func:result select="$descend"/>
 </xsl:otherwise>
 </xsl:choose>
 </func:function>
+<xsl:variable name="_overlapping_geometry">
+<xsl:variable name="k" select="'overlapping'"/>
+<xsl:variable name="m" select="'computing belonging of widgets to pages'"/>
+<xsl:value-of select="ns:ProgressStart($k, $m)"/>
+<xsl:for-each select="$hmi_pages | $keypads">
+<xsl:variable name="k2" select="concat('overlapping:', @id)"/>
+<xsl:variable name="m2" select="concat('collecting membership of ', @inkscape:label)"/>
+<xsl:value-of select="ns:ProgressStart($k2, $m2)"/>
+<elt>
+<xsl:attribute name="id">
+<xsl:value-of select="@id"/>
+</xsl:attribute>
+<xsl:copy-of select="func:overlapping_geometry(.)"/>
+</elt>
+<xsl:value-of select="ns:ProgressEnd($k2, $m2)"/>
+</xsl:for-each>
+<xsl:value-of select="ns:ProgressEnd($k, $m)"/>
+</xsl:variable>
+<xsl:variable name="overlapping_geometry" select="exsl:node-set($_overlapping_geometry)"/>
 <func:function name="func:all_related_elements">
 <xsl:param name="page"/>
-<xsl:variable name="page_overlapping_geometry" select="func:overlapping_geometry($page)"/>
+<xsl:variable name="page_overlapping_geometry" select="$overlapping_geometry/elt[@id = $page/@id]/*"/>
 <xsl:variable name="page_overlapping_elements" select="//svg:*[@id = $page_overlapping_geometry/@Id]"/>
 <xsl:variable name="page_sub_elements" select="func:refered_elements($page | $page_overlapping_elements)"/>
 <func:result select="$page_sub_elements"/>
 </func:function>
 <func:function name="func:required_elements">
 </func:function>
 <xsl:variable name="_detachable_elements" select="func:detachable_elements($hmi_pages | $keypads)"/>
 <xsl:variable name="detachable_elements" select="$_detachable_elements[not(ancestor::*/@id = $_detachable_elements/@id)]"/>
 <declarations:detachable-elements/>
 <xsl:template match="declarations:detachable-elements">
-<xsl:variable name="_unused" select="ns:ProgressStart(name())"/>
 <xsl:text>
 </xsl:text>
 <xsl:text>/* </xsl:text>
 <xsl:value-of select="local-name()"/>
 <xsl:text> */
 </xsl:for-each>
 <xsl:text>}
 </xsl:text>
 <xsl:text>
 </xsl:text>
-<xsl:variable name="__unused" select="ns:ProgressEnd(name())"/>
 </xsl:template>
 <xsl:variable name="forEach_widgets_ids" select="$parsed_widgets/widget[@type = 'ForEach']/@id"/>
 <xsl:variable name="forEach_widgets" select="$hmi_widgets[@id = $forEach_widgets_ids]"/>
 <xsl:variable name="in_forEach_widget_ids" select="func:refered_elements($forEach_widgets)[not(@id = $forEach_widgets_ids)]/@id"/>
 <xsl:template mode="page_desc" match="svg:*">
 <xsl:value-of select="@id"/>
 <xsl:text> is nested in another HMI:Page</xsl:text>
 </xsl:message>
 </xsl:if>
 <xsl:variable name="desc" select="func:widget(@id)"/>
+<xsl:variable name="msg" select="concat('generating page description ', $desc/arg[1]/@value)"/>
+<xsl:value-of select="ns:ProgressStart($msg)"/>
 <xsl:variable name="page" select="."/>
 <xsl:variable name="p" select="$geometry[@Id = $page/@id]"/>
 <xsl:variable name="page_all_elements" select="func:all_related_elements($page)"/>
 <xsl:variable name="all_page_widgets" select="$hmi_widgets[@id = $page_all_elements/@id and @id != $page/@id]"/>
 <xsl:variable name="page_managed_widgets" select="$all_page_widgets[not(@id=$in_forEach_widget_ids)]"/>
 <xsl:variable name="page_relative_widgets" select="$page_managed_widgets[func:is_descendant_path(func:widget(@id)/path/@value, $desc/path/@value)]"/>
-<xsl:variable name="required_detachables" select="func:sumarized_elements($page_all_elements)/&#10;           ancestor-or-self::*[@id = $detachable_elements/@id]"/>
+<xsl:variable name="sumarized_page" select="func:sumarized_elements($page_all_elements)"/>
+<xsl:variable name="required_detachables" select="$sumarized_page/&#10;           ancestor-or-self::*[@id = $detachable_elements/@id]"/>
 <xsl:text>  "</xsl:text>
 <xsl:value-of select="$desc/arg[1]/@value"/>
 <xsl:text>": {
 </xsl:text>
 <xsl:text>    bbox: [</xsl:text>
 <xsl:if test="position()!=last()">
 <xsl:text>,</xsl:text>
 </xsl:if>
 <xsl:text>
 </xsl:text>
+<xsl:value-of select="ns:ProgressEnd($msg)"/>
 </xsl:template>
 <definitions:page-desc/>
 <xsl:template match="definitions:page-desc">
-<xsl:variable name="_unused" select="ns:ProgressStart(name())"/>
 <xsl:text>
 </xsl:text>
 <xsl:text>/* </xsl:text>
 <xsl:value-of select="local-name()"/>
 <xsl:text> */
 <xsl:apply-templates mode="page_desc" select="$hmi_pages"/>
 <xsl:text>}
 </xsl:text>
 <xsl:text>
 </xsl:text>
-<xsl:variable name="__unused" select="ns:ProgressEnd(name())"/>
 </xsl:template>
 <xsl:template mode="per_page_widget_template" match="*"/>
 <debug:detachable-pages/>
 <xsl:template match="debug:detachable-pages">
-<xsl:variable name="_unused" select="ns:ProgressStart(name())"/>
 <xsl:text>
 </xsl:text>
 <xsl:text>/* </xsl:text>
 <xsl:value-of select="local-name()"/>
 <xsl:text> */
 <xsl:text> </xsl:text>
 <xsl:value-of select="."/>
 <xsl:text>
 </xsl:text>
 </xsl:for-each>
-<xsl:text>
+<xsl:text>Overlapping
 </xsl:text>
-<xsl:variable name="__unused" select="ns:ProgressEnd(name())"/>
+<xsl:apply-templates mode="testtree" select="$overlapping_geometry"/>
+<xsl:text>
+</xsl:text>
 </xsl:template>
 <xsl:template xmlns="http://www.w3.org/2000/svg" mode="inline_svg" match="@*">
 <xsl:copy/>
 </xsl:template>
 <xsl:template mode="inline_svg" match="node()">
 <xsl:apply-templates mode="inline_svg" select="/"/>
 </xsl:variable>
 <xsl:variable name="result_svg_ns" select="exsl:node-set($result_svg)"/>
 <preamble:inline-svg/>
 <xsl:template match="preamble:inline-svg">
-<xsl:variable name="_unused" select="ns:ProgressStart(name())"/>
 <xsl:text>
 </xsl:text>
 <xsl:text>/* </xsl:text>
 <xsl:value-of select="local-name()"/>
 <xsl:text> */
 <xsl:value-of select="$svg/@id"/>
 <xsl:text>");
 </xsl:text>
 <xsl:text>
 </xsl:text>
-<xsl:variable name="__unused" select="ns:ProgressEnd(name())"/>
 </xsl:template>
 <debug:clone-unlinking/>
 <xsl:template match="debug:clone-unlinking">
-<xsl:variable name="_unused" select="ns:ProgressStart(name())"/>
 <xsl:text>
 </xsl:text>
 <xsl:text>/* </xsl:text>
 <xsl:value-of select="local-name()"/>
 <xsl:text> */
 <xsl:text>
 </xsl:text>
 </xsl:for-each>
 <xsl:text>
 </xsl:text>
-<xsl:variable name="__unused" select="ns:ProgressEnd(name())"/>
 </xsl:template>
 <xsl:template mode="extract_i18n" match="svg:tspan">
 <xsl:if test="string-length(.) &gt; 0">
 <line>
 <xsl:value-of select="."/>
 <xsl:variable name="translatable_strings">
 <xsl:apply-templates mode="extract_i18n" select="$translatable_texts"/>
 </xsl:variable>
 <preamble:i18n/>
 <xsl:template match="preamble:i18n">
-<xsl:variable name="_unused" select="ns:ProgressStart(name())"/>
 <xsl:text>
 </xsl:text>
 <xsl:text>/* </xsl:text>
 <xsl:value-of select="local-name()"/>
 <xsl:text> */
 </xsl:for-each>
 <xsl:text>]
 </xsl:text>
 <xsl:text>
 </xsl:text>
-<xsl:variable name="__unused" select="ns:ProgressEnd(name())"/>
 </xsl:template>
 <xsl:template mode="hmi_widgets" match="svg:*">
 <xsl:variable name="widget" select="func:widget(@id)"/>
 <xsl:variable name="eltid" select="@id"/>
 <xsl:variable name="args">
 <xsl:text>
 </xsl:text>
 </xsl:template>
 <preamble:local-variable-indexes/>
 <xsl:template match="preamble:local-variable-indexes">
-<xsl:variable name="_unused" select="ns:ProgressStart(name())"/>
 <xsl:text>
 </xsl:text>
 <xsl:text>/* </xsl:text>
 <xsl:value-of select="local-name()"/>
 <xsl:text> */
 </xsl:text>
 <xsl:text>}
 </xsl:text>
 <xsl:text>
 </xsl:text>
-<xsl:variable name="__unused" select="ns:ProgressEnd(name())"/>
 </xsl:template>
 <preamble:widget-base-class/>
 <xsl:template match="preamble:widget-base-class">
-<xsl:variable name="_unused" select="ns:ProgressStart(name())"/>
 <xsl:text>
 </xsl:text>
 <xsl:text>/* </xsl:text>
 <xsl:value-of select="local-name()"/>
 <xsl:text> */
 </xsl:text>
 <xsl:text>}
 </xsl:text>
 <xsl:text>
 </xsl:text>
-<xsl:variable name="__unused" select="ns:ProgressEnd(name())"/>
 </xsl:template>
 <xsl:variable name="excluded_types" select="str:split('Page VarInit VarInitPersistent')"/>
 <xsl:key name="TypesKey" match="widget" use="@type"/>
 <declarations:hmi-classes/>
 <xsl:template match="declarations:hmi-classes">
-<xsl:variable name="_unused" select="ns:ProgressStart(name())"/>
 <xsl:text>
 </xsl:text>
 <xsl:text>/* </xsl:text>
 <xsl:value-of select="local-name()"/>
 <xsl:text> */
 </xsl:text>
 <xsl:variable name="used_widget_types" select="$parsed_widgets/widget[&#10;                                    generate-id() = generate-id(key('TypesKey', @type)) and &#10;                                    not(@type = $excluded_types)]"/>
 <xsl:apply-templates mode="widget_class" select="$used_widget_types"/>
 <xsl:text>
 </xsl:text>
-<xsl:variable name="__unused" select="ns:ProgressEnd(name())"/>
 </xsl:template>
 <xsl:template mode="widget_class" match="widget">
 <xsl:text>class </xsl:text>
 <xsl:value-of select="@type"/>
 <xsl:text>Widget extends Widget{
 <xsl:text>}
 </xsl:text>
 </xsl:template>
 <xsl:variable name="included_ids" select="$parsed_widgets/widget[not(@type = $excluded_types) and not(@id = $discardable_elements/@id)]/@id"/>
 <xsl:variable name="hmi_widgets" select="$hmi_elements[@id = $included_ids]"/>
+<xsl:variable name="result_widgets" select="$result_svg_ns//*[@id = $hmi_widgets/@id]"/>
 <declarations:hmi-elements/>
 <xsl:template match="declarations:hmi-elements">
-<xsl:variable name="_unused" select="ns:ProgressStart(name())"/>
 <xsl:text>
 </xsl:text>
 <xsl:text>/* </xsl:text>
 <xsl:value-of select="local-name()"/>
 <xsl:text> */
 <xsl:apply-templates mode="hmi_widgets" select="$hmi_widgets"/>
 <xsl:text>}
 </xsl:text>
 <xsl:text>
 </xsl:text>
-<xsl:variable name="__unused" select="ns:ProgressEnd(name())"/>
 </xsl:template>
 <xsl:template name="defs_by_labels">
 <xsl:param name="labels" select="''"/>
 <xsl:param name="mandatory" select="'yes'"/>
 <xsl:param name="subelements" select="/.."/>
 <xsl:param name="hmi_element"/>
 <xsl:variable name="widget_type" select="@type"/>
 <xsl:for-each select="str:split($labels)">
 <xsl:variable name="name" select="."/>
-<xsl:variable name="elt" select="$result_svg_ns//*[@id = $hmi_element/@id]//*[@inkscape:label=$name][1]"/>
+<xsl:variable name="elt" select="$result_widgets[@id = $hmi_element/@id]//*[@inkscape:label=$name][1]"/>
 <xsl:choose>
 <xsl:when test="not($elt/@id)">
 <xsl:if test="$mandatory='yes'">
 <xsl:message terminate="yes">
 <xsl:value-of select="$widget_type"/>
 </xsl:text>
 </xsl:if>
 </xsl:template>
 <preamble:display/>
 <xsl:template match="preamble:display">
-<xsl:variable name="_unused" select="ns:ProgressStart(name())"/>
 <xsl:text>
 </xsl:text>
 <xsl:text>/* </xsl:text>
 <xsl:value-of select="local-name()"/>
 <xsl:text> */
 </xsl:text>
 <xsl:text>}(); // eslint-disable-line
 </xsl:text>
 <xsl:text>
 </xsl:text>
-<xsl:variable name="__unused" select="ns:ProgressEnd(name())"/>
 </xsl:template>
 <xsl:template mode="widget_class" match="widget[@type='DropDown']">
 <xsl:text>    function numb_event(e) {
 </xsl:text>
 <xsl:text>        e.stopPropagation();
 </xsl:if>
 </xsl:if>
 </xsl:template>
 <declarations:jump/>
 <xsl:template match="declarations:jump">
-<xsl:variable name="_unused" select="ns:ProgressStart(name())"/>
 <xsl:text>
 </xsl:text>
 <xsl:text>/* </xsl:text>
 <xsl:value-of select="local-name()"/>
 <xsl:text> */
 </xsl:text>
 <xsl:text>
 </xsl:text>
 <xsl:text>
 </xsl:text>
-<xsl:variable name="__unused" select="ns:ProgressEnd(name())"/>
 </xsl:template>
 <declarations:keypad/>
 <xsl:template match="declarations:keypad">
-<xsl:variable name="_unused" select="ns:ProgressStart(name())"/>
 <xsl:text>
 </xsl:text>
 <xsl:text>/* </xsl:text>
 <xsl:value-of select="local-name()"/>
 <xsl:text> */
 </xsl:for-each>
 <xsl:text>}
 </xsl:text>
 <xsl:text>
 </xsl:text>
-<xsl:variable name="__unused" select="ns:ProgressEnd(name())"/>
 </xsl:template>
 <xsl:template mode="widget_class" match="widget[@type='Keypad']">
 <xsl:text>class KeypadWidget extends Widget{
 </xsl:text>
 <xsl:text>

branch	svghmi
changeset 3165	2db69e2c5673
parent 3161	edd558965f58
child 3170	aaa203270ab0