HGKeeper

SVGHMI fix logic for page membership detection
svghmi
2019-10-10, Edouard Tisserant

c7a22ce8c156

SVGHMI fix logic for page membership detection

+1 -1

+1 -1

~~--- a/svghmi/gen_index_xhtml.xslt Thu Oct 10 09:54:44 2019 +0200~~

+++ b/svghmi/gen_index_xhtml.xslt Thu Oct 10 10:03:47 2019 +0200

@@ -236,7 +236,7 @@

</xsl:text>

<xsl:variable name="page" select="."/>

<xsl:variable name="p" select="$hmi_geometry[@Id = $page/@id]"/>

~~- <xsl:for-each select="$hmi_geometry[@Id != $page/@id and 
 @x >= $p/@x and @y >= $p/@y and 
 @w <= $p/@w and @h <= $p/@h]">~~

+ <xsl:for-each select="$hmi_geometry[@Id != $page/@id and 
 @x >= $p/@x and @y >= $p/@y and 
 @x+@w <= $p/@x+$p/@w and @y+@h <= $p/@y+$p/@h]">

<xsl:text> "</xsl:text>

<xsl:value-of select="@Id"/>

<xsl:text>"</xsl:text>

~~--- a/svghmi/gen_index_xhtml.ysl2 Thu Oct 10 09:54:44 2019 +0200~~

+++ b/svghmi/gen_index_xhtml.ysl2 Thu Oct 10 10:03:47 2019 +0200

@@ -218,7 +218,7 @@

const "p", "$hmi_geometry[@Id = $page/@id]";

foreach """$hmi_geometry[@Id != $page/@id and

@x >= $p/@x and @y >= $p/@y and

~~- @w <= $p/@w and @h <= $p/@h]""" {~~

+ @x+@w <= $p/@x+$p/@w and @y+@h <= $p/@y+$p/@h]""" {

| "«@Id»"`if "position()!=last()" > ,`

}

| ]