HGKeeper

beremiz

SVGHMI: Optimized overlapping geometry (widget ot page belonging) computation. Added human readable messages for progress. Includes updated XSLT.
svghmi
2021-02-26, Edouard Tisserant

2db69e2c5673

Parents ea4a61b4a325
Children 001f63ff3aaa 275eadf598e8

SVGHMI: Optimized overlapping geometry (widget ot page belonging) computation. Added human readable messages for progress. Includes updated XSLT.

6 files changed, 111 insertions(+), 60 deletions(-)

+2 -2

XSLTransform.py

+37 -2

svghmi/detachable_pages.ysl2

+33 -40

svghmi/gen_index_xhtml.xslt

+2 -2

svghmi/gen_index_xhtml.ysl2

+2 -1

svghmi/geometry.ysl2

+35 -13

svghmi/svghmi.py

~~--- a/XSLTransform.py Thu Feb 25 11:22:10 2021 +0100~~

+++ b/XSLTransform.py Fri Feb 26 10:00:14 2021 +0100

@@ -17,8 +17,8 @@

etree.XMLParser()),

extensions={("beremiz", name): call for name, call in xsltext})

~~- def transform(self, root, **kwargs):~~

~~- res = self.xslt(root, **{k: etree.XSLT.strparam(v) for k, v in kwargs.iteritems()})~~

+ def transform(self, root, profile_run=False, **kwargs):

+ res = self.xslt(root, profile_run=profile_run, **{k: etree.XSLT.strparam(v) for k, v in kwargs.iteritems()})

# print(self.xslt.error_log)

return res

~~--- a/svghmi/detachable_pages.ysl2 Thu Feb 25 11:22:10 2021 +0100~~

+++ b/svghmi/detachable_pages.ysl2 Fri Feb 26 10:00:14 2021 +0100

@@ -44,14 +44,40 @@

}

+// variable "overlapping_geometry" was added for optimization.

+// It avoids calling func:overlapping_geometry 3 times for each page

+// (apparently libxml doesn't cache exslt function results)

+// in order to optimize further, func:overlapping_geometry

+// should be implemented in python or even C,

+// as this is still the main bottleneck here

+const "_overlapping_geometry" {

+ const "k", "'overlapping'";

+ const "m", "'computing belonging of widgets to pages'";

+ value "ns:ProgressStart($k, $m)";

+ foreach "$hmi_pages | $keypads" {

+ const "k2", "concat('overlapping:', @id)";

+ const "m2", "concat('collecting membership of ', @inkscape:label)";

+ value "ns:ProgressStart($k2, $m2)";

+ elt {

+ attrib "id" > «@id»

+ copy "func:overlapping_geometry(.)";

+ }

+ value "ns:ProgressEnd($k2, $m2)";

+ }

+ value "ns:ProgressEnd($k, $m)";

+const "overlapping_geometry", "exsl:node-set($_overlapping_geometry)";

def "func:all_related_elements" {

param "page";

~~- const "page_overlapping_geometry", "func:overlapping_geometry($page)";~~

+ const "page_overlapping_geometry", "$overlapping_geometry/elt[@id = $page/@id]/*";

const "page_overlapping_elements", "//svg:*[@id = $page_overlapping_geometry/@Id]";

const "page_sub_elements", "func:refered_elements($page | $page_overlapping_elements)";

result "$page_sub_elements";

}

def "func:required_elements" {

param "pages";

choose{

@@ -114,7 +140,10 @@

template "svg:*", mode="page_desc" {

if "ancestor::*[@id = $hmi_pages/@id]" error > HMI:Page «@id» is nested in another HMI:Page

const "desc", "func:widget(@id)";

+ const "msg", "concat('generating page description ', $desc/arg[1]/@value)";

+ value "ns:ProgressStart($msg)";

const "page", ".";

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

@@ -127,8 +156,11 @@

// Take closest ancestor in detachable_elements

// since nested detachable elements are filtered out

+ const "sumarized_page",

+ """func:sumarized_elements($page_all_elements)""";

const "required_detachables",

~~- """func:sumarized_elements($page_all_elements)/~~

+ """$sumarized_page/

ancestor-or-self::*[@id = $detachable_elements/@id]""";

| "«$desc/arg[1]/@value»": {

@@ -164,6 +196,7 @@

with "page_desc", "$desc";

}

| }`if "position()!=last()" > ,`

+ value "ns:ProgressEnd($msg)";

}

emit "definitions:page-desc" {

@@ -186,4 +219,6 @@

foreach "$in_forEach_widget_ids"{

| «.»

}

+ | Overlapping

+ apply "$overlapping_geometry", mode="testtree";

}

~~--- a/svghmi/gen_index_xhtml.xslt Thu Feb 25 11:22:10 2021 +0100~~

+++ b/svghmi/gen_index_xhtml.xslt Fri Feb 26 10:00:14 2021 +0100

@@ -19,7 +19,6 @@

<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>

@@ -62,7 +61,6 @@

</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"/>

@@ -280,7 +278,6 @@

</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>

@@ -305,12 +302,10 @@

<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>

@@ -337,7 +332,6 @@

</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"/>

@@ -378,9 +372,9 @@

</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 
 (not(@Id = $groups/@id) and (func:intersect($g, .) > 0 ))]"/>

@@ -413,7 +407,6 @@

</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>

@@ -430,7 +423,6 @@

</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]"/>

@@ -448,9 +440,28 @@

</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"/>

@@ -490,7 +501,6 @@

<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>

@@ -521,7 +531,6 @@

</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]"/>

@@ -535,13 +544,16 @@

</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)/
 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/
 ancestor-or-self::*[@id = $detachable_elements/@id]"/>

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

<xsl:value-of select="$desc/arg[1]/@value"/>

<xsl:text>": {

@@ -634,10 +646,10 @@

</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>

@@ -655,12 +667,10 @@

</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>

@@ -687,9 +697,11 @@

<xsl:text>

</xsl:text>

</xsl:for-each>

~~- <xsl:text>~~

~~-</xsl:text>~~

~~- <xsl:variable name="__unused" select="ns:ProgressEnd(name())"/>~~

+ <xsl:text>Overlapping

+</xsl:text>

+ <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/>

@@ -909,7 +921,6 @@

<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>

@@ -926,11 +937,9 @@

</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>

@@ -957,7 +966,6 @@

</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(.) > 0">

@@ -983,7 +991,6 @@

</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>

@@ -1046,7 +1053,6 @@

</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)"/>

@@ -1149,7 +1155,6 @@

</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>

@@ -1293,11 +1298,9 @@

</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>

@@ -1692,13 +1695,11 @@

</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>

@@ -1711,7 +1712,6 @@

<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>

@@ -1727,9 +1727,9 @@

</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>

@@ -1745,7 +1745,6 @@

</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="''"/>

@@ -1755,7 +1754,7 @@

<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'">

@@ -2995,7 +2994,6 @@

</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>

@@ -3472,7 +3470,6 @@

</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) {

@@ -5183,7 +5180,6 @@

</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>

@@ -5210,11 +5206,9 @@

</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>

@@ -5247,7 +5241,6 @@

</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{

~~--- a/svghmi/gen_index_xhtml.ysl2 Thu Feb 25 11:22:10 2021 +0100~~

+++ b/svghmi/gen_index_xhtml.ysl2 Fri Feb 26 10:00:14 2021 +0100

@@ -7,13 +7,13 @@

decl emit(*name) alias - {

*name;

template *name {

~~- const "_unused", "ns:ProgressStart(name())";~~

+ // value "ns:ProgressStart(name())";

| /* «local-name()» */

content;

~~- const "__unused", "ns:ProgressEnd(name())";~~

+ // value "ns:ProgressEnd(name())";

}

};

~~--- a/svghmi/geometry.ysl2 Thu Feb 25 11:22:10 2021 +0100~~

+++ b/svghmi/geometry.ysl2 Fri Feb 26 10:00:14 2021 +0100

@@ -131,12 +131,13 @@

}

+const "groups", "/svg:svg | //svg:g";

// return overlapping geometry for a given element

// all intersercting element are returned

// except groups, that must be contained to be counted in

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

~~--- a/svghmi/svghmi.py Thu Feb 25 11:22:10 2021 +0100~~

+++ b/svghmi/svghmi.py Fri Feb 26 10:00:14 2021 +0100

@@ -430,6 +430,13 @@

#self.HMITreeView = HMITreeView(self)

return HMITreeSelector(parent)

+def _ProgressArgs(args):

+ if len(args) == 2:

+ key, message = args

+ else:

+ key, = args

+ message = key

+ return str(key), str(message), time.time()

class SVGHMI(object):

XSD = """<?xml version="1.0" encoding="utf-8" ?>

@@ -499,6 +506,7 @@

return True

def GetSVGGeometry(self):

+ t = time.time()

# invoke inskscape -S, csv-parse output, produce elements

InkscapeGeomColumns = ["Id", "x", "y", "w", "h"]

@@ -523,14 +531,20 @@

res.append(etree.Element("bbox", **attrs))

+ self.GetCTRoot().logger.write(" Start collecting SVG geometry (Inkscape)\n")

+ self.GetCTRoot().logger.write(" Finished collecting SVG geometry (Inkscape) in %.3fs\n"%(time.time()-t))

return res

def GetHMITree(self):

global hmi_tree_root

+ t = time.time()

res = [hmi_tree_root.etree(add_hash=True)]

+ self.GetCTRoot().logger.write(" Start getting HMI tree\n")

+ self.GetCTRoot().logger.write(" Fnished getting HMI tree in %.3fs\n"%(time.time()-t))

return res

def GetTranslations(self, _context, msgs):

+ t = time.time()

messages = EtreeToMessages(msgs)

if len(messages) == 0:

@@ -543,19 +557,25 @@

langs,translated_messages = MatchTranslations(translations, messages,

errcallback=self.GetCTRoot().logger.write_warning)

~~- return TranslationToEtree(langs,translated_messages)~~

+ ret = TranslationToEtree(langs,translated_messages)

+ self.GetCTRoot().logger.write(" Start getting Translations\n")

+ self.GetCTRoot().logger.write(" Finished getting Translations in %.3fs\n"%(time.time()-t))

+ return ret

times = {}

~~- def ProgressStart(self, _context, message):~~

~~- t = time.time()~~

~~- s = str(message)~~

~~- self.times[s] = t~~

~~- def ProgressEnd(self, _context, message):~~

~~- t = time.time()~~

~~- s = str(message)~~

~~- self.GetCTRoot().logger.write(" %s: %.3f\n"%(message, t - self.times[s]))~~

~~- self.times[s] = t~~

+ def ProgressStart(self, _context, *args):

+ k,m,t = _ProgressArgs(args)

+ self.times[k] = t

+ # self.GetCTRoot().logger.write(" Start %s: %.3f\n"%(m, t - self.transform_begin))

+ self.GetCTRoot().logger.write(" Start %s\n"%m)

+ def ProgressEnd(self, _context, *args):

+ k,m,t = _ProgressArgs(args)

+ self.times[k] = t

+ self.GetCTRoot().logger.write(" Finished %s in %.3f\n"%(m, t - self.times[k]))

def CTNGenerate_C(self, buildpath, locations):

@@ -583,17 +603,18 @@

("ProgressStart", self.ProgressStart),

("ProgressEnd", self.ProgressEnd)])

t = time.time()

# load svg as a DOM with Etree

svgdom = etree.parse(svgfile)

~~- self.GetCTRoot().logger.write(" Source SVG parsing: %.3f\n"%(time.time()-t))~~

+ self.GetCTRoot().logger.write(" Source SVG parsing: %.3f\n"%(time.time()-t))

# call xslt transform on Inkscape's SVG to generate XHTML

try:

~~- result = transform.transform(svgdom)~~

+ self.transform_begin = time.time()

+ result = transform.transform(svgdom) # , profile_run=True)

+ self.GetCTRoot().logger.write(" XSLT transform: %.3f\n"%(time.time()-self.transform_begin))

except XSLTApplyError as e:

self.FatalError("SVGHMI " + view_name + ": " + e.message)

finally:

@@ -604,6 +625,7 @@

result.write(target_file, encoding="utf-8")

# print(str(result))

# print(transform.xslt.error_log)

+ # print(etree.tostring(result.xslt_profile,pretty_print=True))

# TODO

# - Errors on HMI semantics