--- a/svghmi/gen_index_xhtml.xslt Wed Aug 05 15:16:43 2020 +0200
+++ b/svghmi/gen_index_xhtml.xslt Wed Aug 05 15:18:00 2020 +0200
@@ -1,5 +1,5 @@
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:exsl="http://exslt.org/common" xmlns:regexp="http://exslt.org/regular-expressions" xmlns:str="http://exslt.org/strings" xmlns:func="http://exslt.org/functions" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:cc="http://creativecommons.org/ns#" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:svg="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" xmlns:xhtml="http://www.w3.org/1999/xhtml" xmlns:debug="debug" xmlns:preamble="preamble" xmlns:declarations="declarations" xmlns:definitions="definitions" xmlns:epilogue="epilogue" xmlns:ns="beremiz" version="1.0" extension-element-prefixes="ns func exsl regexp str dyn" exclude-result-prefixes="ns func exsl regexp str dyn debug preamble epilogue declarations definitions">+<xsl:stylesheet xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:regexp="http://exslt.org/regular-expressions" xmlns:definitions="definitions" xmlns:ns="beremiz" xmlns:xhtml="http://www.w3.org/1999/xhtml" xmlns:exsl="http://exslt.org/common" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:preamble="preamble" xmlns:func="http://exslt.org/functions" xmlns:epilogue="epilogue" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" xmlns:str="http://exslt.org/strings" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:debug="debug" xmlns:svg="http://www.w3.org/2000/svg" xmlns:declarations="declarations" xmlns:cc="http://creativecommons.org/ns#" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" version="1.0" extension-element-prefixes="ns func exsl regexp str dyn" exclude-result-prefixes="ns func exsl regexp str dyn debug preamble epilogue declarations definitions"> <xsl:output cdata-section-elements="xhtml:script" method="xml"/>
<xsl:variable name="svg" select="/svg:svg"/>
<xsl:variable name="hmi_elements" select="//svg:*[starts-with(@inkscape:label, 'HMI:')]"/>
@@ -14,7 +14,7 @@
<xsl:variable name="categories" select="exsl:node-set($_categories)"/>
<xsl:variable name="_indexed_hmitree">
- <xsl:apply-templates mode="index" select="$hmitree"/>+ <xsl:apply-templates select="$hmitree" mode="index"/> <xsl:variable name="indexed_hmitree" select="exsl:node-set($_indexed_hmitree)"/>
@@ -62,7 +62,7 @@
- <xsl:template mode="index" match="*">+ <xsl:template match="*" mode="index"> <xsl:param name="index" select="0"/>
<xsl:param name="parentpath" select="''"/>
<xsl:variable name="content">
@@ -95,7 +95,7 @@
- <xsl:apply-templates mode="index" select="*[1]">+ <xsl:apply-templates select="*[1]" mode="index"> <xsl:with-param name="index" select="$index + 1"/>
<xsl:with-param name="parentpath">
<xsl:value-of select="$path"/>
@@ -103,7 +103,7 @@
- <xsl:apply-templates mode="index" select="*[1]">+ <xsl:apply-templates select="*[1]" mode="index"> <xsl:with-param name="index" select="$index"/>
<xsl:with-param name="parentpath">
<xsl:value-of select="$path"/>
@@ -113,14 +113,14 @@
<xsl:copy-of select="$content"/>
- <xsl:apply-templates mode="index" select="following-sibling::*[1]">+ <xsl:apply-templates select="following-sibling::*[1]" mode="index"> <xsl:with-param name="index" select="$index + count(exsl:node-set($content)/*)"/>
<xsl:with-param name="parentpath">
<xsl:value-of select="$parentpath"/>
- <xsl:template mode="parselabel" match="*">+ <xsl:template match="*" mode="parselabel"> <xsl:variable name="label" select="@inkscape:label"/>
<xsl:variable name="description" select="substring-after($label,'HMI:')"/>
<xsl:variable name="_args" select="substring-before($description,'@')"/>
@@ -184,7 +184,7 @@
<xsl:variable name="_parsed_widgets">
- <xsl:apply-templates mode="parselabel" select="$hmi_elements"/>+ <xsl:apply-templates select="$hmi_elements" mode="parselabel"/> <xsl:variable name="parsed_widgets" select="exsl:node-set($_parsed_widgets)"/>
<func:function name="func:widget">
@@ -203,7 +203,7 @@
<xsl:variable name="class_b" select="$indexed_hmitree/*[@hmipath = $b]/@class"/>
<func:result select="$class_a and $class_b and $class_a = $class_b"/>
- <xsl:template mode="testtree" match="*">+ <xsl:template match="*" mode="testtree"> <xsl:param name="indent" select="''"/>
<xsl:value-of select="$indent"/>
@@ -217,7 +217,7 @@
- <xsl:apply-templates mode="testtree" select="*">+ <xsl:apply-templates select="*" mode="testtree"> <xsl:with-param name="indent">
<xsl:value-of select="concat($indent,'>')"/>
@@ -235,18 +235,18 @@
- <xsl:apply-templates mode="testtree" select="$hmitree"/>+ <xsl:apply-templates select="$hmitree" mode="testtree"/> <xsl:text>Indexed HMI tree
- <xsl:apply-templates mode="testtree" select="$indexed_hmitree"/>+ <xsl:apply-templates select="$indexed_hmitree" mode="testtree"/> <xsl:copy-of select="_parsed_widgets"/>
- <xsl:apply-templates mode="testtree" select="$parsed_widgets"/>+ <xsl:apply-templates select="$parsed_widgets" mode="testtree"/> @@ -459,7 +459,7 @@
<xsl:variable name="forEach_widgets_ids" select="$parsed_widgets/widget[@type = 'ForEach']/@id"/>
<xsl:variable name="forEach_widgets" select="$hmi_elements[@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:template match="svg:*" mode="page_desc"> <xsl:variable name="desc" select="func:widget(@id)"/>
<xsl:variable name="page" select="."/>
<xsl:variable name="p" select="$geometry[@Id = $page/@id]"/>
@@ -563,7 +563,7 @@
- <xsl:apply-templates mode="per_page_widget_template" select="$parsed_widgets/widget[@id = $all_page_widgets/@id]">+ <xsl:apply-templates select="$parsed_widgets/widget[@id = $all_page_widgets/@id]" mode="per_page_widget_template"> <xsl:with-param name="page_desc" select="$desc"/>
@@ -587,13 +587,13 @@
<xsl:text>var page_desc = {
- <xsl:apply-templates mode="page_desc" select="$hmi_pages"/>+ <xsl:apply-templates select="$hmi_pages" mode="page_desc"/> - <xsl:template mode="per_page_widget_template" match="*"/>+ <xsl:template match="*" mode="per_page_widget_template"/> <debug:detachable-pages/>
<xsl:template match="debug:detachable-pages">
@@ -625,16 +625,16 @@
- <xsl:template mode="inline_svg" match="@* | node()">+ <xsl:template match="@* | node()" mode="inline_svg"> <xsl:if test="not(@id = $discardable_elements/@id)">
- <xsl:apply-templates mode="inline_svg" select="@* | node()"/>+ <xsl:apply-templates select="@* | node()" mode="inline_svg"/> - <xsl:template mode="inline_svg" match="svg:svg/@width"/>- <xsl:template mode="inline_svg" match="svg:svg/@height"/>- <xsl:template xmlns="http://www.w3.org/2000/svg" mode="inline_svg" match="svg:svg">+ <xsl:template match="svg:svg/@width" mode="inline_svg"/> + <xsl:template match="svg:svg/@height" mode="inline_svg"/> + <xsl:template xmlns="http://www.w3.org/2000/svg" match="svg:svg" mode="inline_svg"> <xsl:attribute name="preserveAspectRatio">
<xsl:text>none</xsl:text>
@@ -645,15 +645,15 @@
<xsl:attribute name="width">
<xsl:text>100vw</xsl:text>
- <xsl:apply-templates mode="inline_svg" select="@* | node()"/>+ <xsl:apply-templates select="@* | node()" mode="inline_svg"/> - <xsl:template mode="inline_svg" match="svg:svg[@viewBox!=concat('0 0 ', @width, ' ', @height)]">+ <xsl:template match="svg:svg[@viewBox!=concat('0 0 ', @width, ' ', @height)]" mode="inline_svg"> <xsl:message terminate="yes">
<xsl:text>ViewBox settings other than X=0, Y=0 and Scale=1 are not supported</xsl:text>
- <xsl:template mode="inline_svg" match="sodipodi:namedview[@units!='px' or @inkscape:document-units!='px']">+ <xsl:template match="sodipodi:namedview[@units!='px' or @inkscape:document-units!='px']" mode="inline_svg"> <xsl:message terminate="yes">
<xsl:text>All units must be set to "px" in Inkscape's document properties</xsl:text>
@@ -662,7 +662,7 @@
<xsl:variable name="hmi_lists" select="$hmi_elements[@id = $hmi_lists_descs/@id]"/>
<xsl:variable name="targets_not_to_unlink" select="$hmi_elements[@id = $hmi_lists/@id]/descendant::svg:*"/>
<xsl:variable name="to_unlink" select="$hmi_elements[not(@id = $hmi_pages/@id)]/descendant-or-self::svg:use"/>
- <xsl:template xmlns="http://www.w3.org/2000/svg" mode="inline_svg" match="svg:use">+ <xsl:template xmlns="http://www.w3.org/2000/svg" match="svg:use" mode="inline_svg"> <xsl:variable name="targetid" select="substring-after(@xlink:href,'#')"/>
<xsl:when test="@id = $to_unlink/@id and not($targetid = $targets_not_to_unlink/@id)">
@@ -672,7 +672,7 @@
- <xsl:apply-templates mode="inline_svg" select="@* | node()"/>+ <xsl:apply-templates select="@* | node()" mode="inline_svg"/> @@ -733,7 +733,7 @@
<xsl:value-of select="$target/@transform"/>
- <xsl:apply-templates mode="unlink_clone" select="$target/*">+ <xsl:apply-templates select="$target/*" mode="unlink_clone"> <xsl:with-param name="seed" select="@id"/>
@@ -743,14 +743,14 @@
<xsl:value-of select="."/>
- <xsl:apply-templates mode="unlink_clone" select="$target">+ <xsl:apply-templates select="$target" mode="unlink_clone"> <xsl:with-param name="seed" select="@id"/>
- <xsl:template xmlns="http://www.w3.org/2000/svg" mode="unlink_clone" match="@id">+ <xsl:template xmlns="http://www.w3.org/2000/svg" match="@id" mode="unlink_clone"> <xsl:attribute name="id">
<xsl:value-of select="$seed"/>
@@ -758,10 +758,10 @@
<xsl:value-of select="."/>
- <xsl:template xmlns="http://www.w3.org/2000/svg" mode="unlink_clone" match="@*">+ <xsl:template xmlns="http://www.w3.org/2000/svg" match="@*" mode="unlink_clone"> - <xsl:template xmlns="http://www.w3.org/2000/svg" mode="unlink_clone" match="svg:*">+ <xsl:template xmlns="http://www.w3.org/2000/svg" match="svg:*" mode="unlink_clone"> <xsl:when test="@id = $hmi_elements/@id">
@@ -773,7 +773,7 @@
- <xsl:apply-templates mode="unlink_clone" select="@* | node()">+ <xsl:apply-templates select="@* | node()" mode="unlink_clone"> <xsl:with-param name="seed" select="$seed"/>
@@ -781,7 +781,7 @@
<xsl:variable name="result_svg">
- <xsl:apply-templates mode="inline_svg" select="/"/>+ <xsl:apply-templates select="/" mode="inline_svg"/> <xsl:variable name="result_svg_ns" select="exsl:node-set($result_svg)"/>
@@ -832,7 +832,7 @@
- <xsl:template mode="hmi_widgets" match="svg:*">+ <xsl:template match="svg:*" mode="hmi_widgets"> <xsl:variable name="widget" select="func:widget(@id)"/>
<xsl:variable name="eltid" select="@id"/>
<xsl:variable name="args">
@@ -880,7 +880,7 @@
<xsl:value-of select="$indexes"/>
- <xsl:apply-templates mode="widget_defs" select="$widget">+ <xsl:apply-templates select="$widget" mode="widget_defs"> <xsl:with-param name="hmi_element" select="."/>
@@ -1039,11 +1039,11 @@
<xsl:variable name="used_widget_types" select="func:unique_types($parsed_widgets/widget)"/>
- <xsl:apply-templates mode="widget_class" select="$used_widget_types"/>+ <xsl:apply-templates select="$used_widget_types" mode="widget_class"/> - <xsl:template mode="widget_class" match="widget">+ <xsl:template match="widget" mode="widget_class"> <xsl:text>class </xsl:text>
<xsl:value-of select="@type"/>
<xsl:text>Widget extends Widget{
@@ -1069,7 +1069,7 @@
<xsl:text>var hmi_widgets = {
- <xsl:apply-templates mode="hmi_widgets" select="$hmi_elements[@id = $excluded_ids]"/>+ <xsl:apply-templates select="$hmi_elements[@id = $excluded_ids]" mode="hmi_widgets"/> @@ -1163,7 +1163,7 @@
- <xsl:template mode="widget_class" match="widget[@type='Back']">+ <xsl:template match="widget[@type='Back']" mode="widget_class"> <xsl:text>class BackWidget extends Widget{
<xsl:text> on_click(evt) {
@@ -1189,7 +1189,81 @@
- <xsl:template mode="widget_defs" match="widget[@type='Button']">+ <xsl:template match="widget[@type='Button']" mode="widget_class"> + <xsl:template match="widget[@type='Button']" mode="widget_defs"> <xsl:param name="hmi_element"/>
<xsl:call-template name="defs_by_labels">
<xsl:with-param name="hmi_element" select="$hmi_element"/>
@@ -1198,66 +1272,10 @@
<xsl:with-param name="mandatory" select="'no'"/>
- <xsl:text>frequency: 5,- <xsl:text>on_mouse_down: function(evt) {- <xsl:text> if (this.active_style && this.inactive_style) {- <xsl:text> this.active_elt.setAttribute("style", this.active_style);- <xsl:text> this.inactive_elt.setAttribute("style", "display:none");- <xsl:text> this.apply_hmi_value(0, 1);- <xsl:text>on_mouse_up: function(evt) {- <xsl:text> if (this.active_style && this.inactive_style) {- <xsl:text> this.active_elt.setAttribute("style", "display:none");- <xsl:text> this.inactive_elt.setAttribute("style", this.inactive_style);- <xsl:text> this.apply_hmi_value(0, 0);- <xsl:text>active_style: undefined,- <xsl:text>inactive_style: undefined,- <xsl:text>init: function() {- <xsl:text> this.active_style = this.active_elt ? this.active_elt.style.cssText : undefined;- <xsl:text> this.inactive_style = this.inactive_elt ? this.inactive_elt.style.cssText : undefined;- <xsl:text> if (this.active_style && this.inactive_style) {- <xsl:text> this.active_elt.setAttribute("style", "display:none");- <xsl:text> this.inactive_elt.setAttribute("style", this.inactive_style);- <xsl:text> this.element.setAttribute("onmousedown", "hmi_widgets['</xsl:text>- <xsl:value-of select="$hmi_element/@id"/>- <xsl:text>'].on_mouse_down(evt)");- <xsl:text> this.element.setAttribute("onmouseup", "hmi_widgets['</xsl:text>- <xsl:value-of select="$hmi_element/@id"/>- <xsl:text>'].on_mouse_up(evt)");- <xsl:template mode="widget_defs" match="widget[@type='CircularBar']">+ <xsl:template match="widget[@type='CircularBar']" mode="widget_defs"> <xsl:param name="hmi_element"/>
@@ -1353,7 +1371,321 @@
- <xsl:template mode="widget_class" match="widget[@type='Display']">+ <xsl:template match="widget[@type='CircularSlider']" mode="widget_class"> + <xsl:text>class CircularSliderWidget extends Widget{ + <xsl:text> frequency = 5; + <xsl:text> range = undefined; + <xsl:text> circle = undefined; + <xsl:text> handle_pos = undefined; + <xsl:text> drag = false; + <xsl:text> enTimer = false; + <xsl:text> dispatch(value) { + <xsl:text> if(!this.drag){ + <xsl:text> if(this.value_elt) + <xsl:text> this.value_elt.textContent = String(value); + <xsl:text> this.handle_position(value); + <xsl:text> handle_position(value){ + <xsl:text> let [min,max,totalDistance] = this.range; + <xsl:text> let length = Math.max(0,Math.min((totalDistance),(Number(value)-min)/(max-min)*(totalDistance))); + <xsl:text> let tip = this.range_elt.getPointAtLength(length); + <xsl:text> this.handle_elt.setAttribute('transform',"translate("+(tip.x-this.handle_pos.x)+","+(tip.y-this.handle_pos.y)+")"); + <xsl:text> on_release(evt) { + <xsl:text> if(this.drag){ + <xsl:text> this.drag = false; + <xsl:text> update_position(evt){ + <xsl:text> if(this.drag && this.enTimer){ + <xsl:text> var svg_dist = 0; + <xsl:text> //calculate center of widget in html + <xsl:text> // --TODO maybe it would be better to bind this part to window change size event ??? + <xsl:text> let [xdest,ydest,svgWidth,svgHeight] = page_desc[current_visible_page].bbox; + <xsl:text> let [cX, cY,fiStart,fiEnd,minMax,x1,y1,width,height] = this.circle; + <xsl:text> let htmlCirc = this.range_elt.getBoundingClientRect(); + <xsl:text> let cxHtml = ((htmlCirc.right-htmlCirc.left)/(width)*(cX-x1))+htmlCirc.left; + <xsl:text> let cyHtml = ((htmlCirc.bottom-htmlCirc.top)/(height)*(cY-y1))+htmlCirc.top; + <xsl:text> //get mouse coordinates + <xsl:text> let mouseX = undefined; + <xsl:text> let mouseY = undefined; + <xsl:text> if (evt.type.startsWith("touch")){ + <xsl:text> mouseX = Math.ceil(evt.touches[0].clientX); + <xsl:text> mouseY = Math.ceil(evt.touches[0].clientY); + <xsl:text> mouseX = evt.pageX; + <xsl:text> mouseY = evt.pageY; + <xsl:text> //calculate angle + <xsl:text> let fi = Math.atan2(cyHtml-mouseY, mouseX-cxHtml); + <xsl:text> // transform from 0 to 2PI + <xsl:text> if (fi > 0){ + <xsl:text> fi = 2*Math.PI-fi; + <xsl:text> //offset it to 0 + <xsl:text> fi = fi - fiStart; + <xsl:text> if (fi < 0){ + <xsl:text> fi = fi + 2*Math.PI; + <xsl:text> //get handle distance from mouse position + <xsl:text> if(fi<fiEnd){ + <xsl:text> svg_dist=(fi)/(fiEnd)*(this.range[1]-this.range[0]); + <xsl:text> else if(fiEnd<fi && fi<fiEnd+minMax){ + <xsl:text> svg_dist = this.range[1]; + <xsl:text> svg_dist = this.range[0]; + <xsl:text> //redraw handle --TODO is it fast enough if I just call change_hmi_value??? + <xsl:text> this.handle_position(svg_dist); + <xsl:text> if(this.value_elt) + <xsl:text> this.value_elt.textContent = String(Math.ceil(svg_dist)); + <xsl:text> change_hmi_value(this.indexes[0], "="+Math.ceil(svg_dist)); + <xsl:text> //reset timer + <xsl:text> this.enTimer = false; + <xsl:text> setTimeout("{hmi_widgets['"+this.element_id+"'].enTimer = true;}", 100); + <xsl:text> on_select(evt){ + <xsl:text> this.drag = true; + <xsl:text> this.enTimer = true; + <xsl:text> this.update_position(evt); + <xsl:text> //get min max + <xsl:text> let min = this.min_elt ? + <xsl:text> Number(this.min_elt.textContent) : + <xsl:text> this.args.length >= 1 ? this.args[0] : 0; + <xsl:text> let max = this.max_elt ? + <xsl:text> Number(this.max_elt.textContent) : + <xsl:text> this.args.length >= 2 ? this.args[1] : 100; + <xsl:text> //fiStart ==> offset + <xsl:text> let fiStart = Number(this.range_elt.getAttribute('sodipodi:start')); + <xsl:text> let fiEnd = Number(this.range_elt.getAttribute('sodipodi:end')); + <xsl:text> fiEnd = fiEnd - fiStart; + <xsl:text> //fiEnd ==> size of angle + <xsl:text> if (fiEnd < 0){ + <xsl:text> fiEnd = 2*Math.PI + fiEnd; + <xsl:text> //min max barrier angle + <xsl:text> let minMax = (2*Math.PI - fiEnd)/2; + <xsl:text> //get parameters from svg + <xsl:text> let cX = Number(this.range_elt.getAttribute('sodipodi:cx')); + <xsl:text> let cY = Number(this.range_elt.getAttribute('sodipodi:cy')); + <xsl:text> this.range_elt.style.strokeMiterlimit="0"; //eliminates some weird border around html object + <xsl:text> this.range = [min, max,this.range_elt.getTotalLength()]; + <xsl:text> let cPos = this.range_elt.getBBox(); + <xsl:text> this.handle_pos = this.range_elt.getPointAtLength(0); + <xsl:text> this.circle = [cX, cY,fiStart,fiEnd,minMax,cPos.x,cPos.y,cPos.width,cPos.height]; + <xsl:text> //init events + <xsl:text> this.handle_elt.addEventListener("touchstart", hmi_widgets[this.element_id].on_select.bind(this)); + <xsl:text> this.handle_elt.addEventListener("mousedown", hmi_widgets[this.element_id].on_select.bind(this)); + <xsl:text> this.element.addEventListener("mousedown", hmi_widgets[this.element_id].on_select.bind(this)); + <xsl:text> window.addEventListener("touchmove", hmi_widgets[this.element_id].update_position.bind(this)); + <xsl:text> window.addEventListener("mousemove", hmi_widgets[this.element_id].update_position.bind(this)); + <xsl:text> window.addEventListener("mouseup", hmi_widgets[this.element_id].on_release.bind(this)) + <xsl:text> window.addEventListener("touchend", hmi_widgets[this.element_id].on_release.bind(this)); + <xsl:text> window.addEventListener("touchcancel", hmi_widgets[this.element_id].on_release.bind(this)); + <xsl:template match="widget[@type='CircularSlider']" mode="widget_defs"> + <xsl:param name="hmi_element"/> + <xsl:call-template name="defs_by_labels"> + <xsl:with-param name="hmi_element" select="$hmi_element"/> + <xsl:with-param name="labels"> + <xsl:text>handle range</xsl:text> + <xsl:call-template name="defs_by_labels"> + <xsl:with-param name="hmi_element" select="$hmi_element"/> + <xsl:with-param name="labels"> + <xsl:text>value min max</xsl:text> + <xsl:with-param name="mandatory" select="'no'"/> + <xsl:template match="widget[@type='Display']" mode="widget_class"> <xsl:text>class DisplayWidget extends Widget{
<xsl:text> frequency = 5;
@@ -1367,7 +1699,7 @@
- <xsl:template mode="widget_defs" match="widget[@type='Display']">+ <xsl:template match="widget[@type='Display']" mode="widget_defs"> <xsl:param name="hmi_element"/>
<xsl:if test="$hmi_element[not(self::svg:text)]">
<xsl:message terminate="yes">
@@ -1377,7 +1709,7 @@
- <xsl:template mode="widget_defs" match="widget[@type='DropDown']">+ <xsl:template match="widget[@type='DropDown']" mode="widget_defs"> <xsl:param name="hmi_element"/>
<xsl:call-template name="defs_by_labels">
<xsl:with-param name="hmi_element" select="$hmi_element"/>
@@ -1890,7 +2222,7 @@
- <xsl:template mode="widget_defs" match="widget[@type='ForEach']">+ <xsl:template match="widget[@type='ForEach']" mode="widget_defs"> <xsl:param name="hmi_element"/>
<xsl:variable name="class" select="arg[1]/@value"/>
<xsl:variable name="base_path" select="path/@value"/>
@@ -1990,7 +2322,7 @@
<xsl:text> item_offset: 0,
- <xsl:template mode="widget_class" match="widget[@type='ForEach']">+ <xsl:template match="widget[@type='ForEach']" mode="widget_class"> <xsl:text>class ForEachWidget extends Widget{
@@ -2098,8 +2430,15 @@
- <xsl:template mode="widget_defs" match="widget[@type='Input']">+ <xsl:template match="widget[@type='Input']" mode="widget_defs"> <xsl:param name="hmi_element"/>
+ <xsl:call-template name="defs_by_labels"> + <xsl:with-param name="hmi_element" select="$hmi_element"/> + <xsl:with-param name="labels"> + <xsl:text>key_pos</xsl:text> + <xsl:with-param name="mandatory" select="'no'"/> <xsl:variable name="value_elt">
<xsl:call-template name="defs_by_labels">
<xsl:with-param name="hmi_element" select="$hmi_element"/>
@@ -2158,11 +2497,13 @@
<xsl:text> on_edit_click: function(opstr) {
+ <xsl:text> var size = (typeof this.key_pos_elt !== 'undefined') ? this.key_pos_elt.getBBox() : undefined <xsl:text> edit_value("</xsl:text>
<xsl:value-of select="path/@value"/>
<xsl:text>", "</xsl:text>
<xsl:value-of select="path/@type"/>
- <xsl:text>", this, this.last_val);+ <xsl:text>", this, this.last_val,size); @@ -2173,7 +2514,7 @@
- <xsl:template mode="widget_class" match="widget[@type='JsonTable']">+ <xsl:template match="widget[@type='JsonTable']" mode="widget_class"> <xsl:text>class JsonTableWidget extends Widget{
<xsl:text> do_http_request() {
@@ -2233,14 +2574,14 @@
- <xsl:template mode="json_table_elt_render" match="svg:*">+ <xsl:template match="svg:*" mode="json_table_elt_render"> <xsl:message terminate="yes">
<xsl:text>JsonTable Widget can't contain element of type </xsl:text>
<xsl:value-of select="local-name()"/>
- <xsl:template mode="json_table_elt_render" match="svg:use">+ <xsl:template match="svg:use" mode="json_table_elt_render"> <xsl:param name="value_expr"/>
<xsl:variable name="targetid" select="substring-after(@xlink:href,'#')"/>
<xsl:variable name="from_list" select="$hmi_lists[(@id | */@id) = $targetid]"/>
@@ -2251,14 +2592,6 @@
<xsl:text>" is not valid.</xsl:text>
- <xsl:text> console.log("</xsl:text>- <xsl:value-of select="@id"/>- <xsl:text>", "</xsl:text>- <xsl:value-of select="$value_expr"/>- <xsl:text>", </xsl:text>- <xsl:value-of select="$value_expr"/> <xsl:text> id("</xsl:text>
<xsl:value-of select="@id"/>
<xsl:text>").setAttribute("xlink:href",
@@ -2270,16 +2603,8 @@
- <xsl:template mode="json_table_elt_render" match="svg:text">+ <xsl:template match="svg:text" mode="json_table_elt_render"> <xsl:param name="value_expr"/>
- <xsl:text> console.log("</xsl:text>- <xsl:value-of select="@id"/>- <xsl:text>", "</xsl:text>- <xsl:value-of select="$value_expr"/>- <xsl:text>", </xsl:text>- <xsl:value-of select="$value_expr"/> <xsl:text> id("</xsl:text>
<xsl:value-of select="@id"/>
<xsl:text>").textContent = String(</xsl:text>
@@ -2287,16 +2612,16 @@
- <xsl:template mode="json_table_render" match="svg:*">+ <xsl:template match="svg:*" mode="json_table_render"> <xsl:param name="objname"/>
- <xsl:apply-templates mode="json_table_elt_render" select=".">+ <xsl:apply-templates select="." mode="json_table_elt_render"> <xsl:with-param name="value_expr">
<xsl:value-of select="$objname"/>
<xsl:value-of select="@inkscape:label"/>
- <xsl:template mode="json_table_render" match="svg:g">+ <xsl:template match="svg:g" mode="json_table_render"> <xsl:param name="objname"/>
<xsl:text> let obj_</xsl:text>
<xsl:value-of select="@id"/>
@@ -2305,14 +2630,14 @@
<xsl:value-of select="@inkscape:label"/>
- <xsl:apply-templates mode="json_table_render" select="*[@inkscape:label]">+ <xsl:apply-templates select="*[@inkscape:label]" mode="json_table_render"> <xsl:with-param name="objname">
<xsl:text>obj_</xsl:text>
<xsl:value-of select="@id"/>
- <xsl:template mode="widget_defs" match="widget[@type='JsonTable']">+ <xsl:template match="widget[@type='JsonTable']" mode="widget_defs"> <xsl:param name="hmi_element"/>
<xsl:call-template name="defs_by_labels">
<xsl:with-param name="hmi_element" select="$hmi_element"/>
@@ -2330,9 +2655,7 @@
<xsl:variable name="data_elt" select="$result_svg_ns//*[@id = $hmi_element/@id]/*[@inkscape:label = 'data']"/>
<xsl:text> spread_json_data: function(jdata) {
- <xsl:text> console.log(jdata);- <xsl:apply-templates mode="json_table_render" select="$data_elt/*">+ <xsl:apply-templates select="$data_elt/*" mode="json_table_render"> <xsl:with-param name="objname" select="'jdata'"/>
@@ -2358,7 +2681,7 @@
<xsl:with-param name="mandatory" select="'no'"/>
- <xsl:template mode="widget_defs" match="widget[@type='Jump']">+ <xsl:template match="widget[@type='Jump']" mode="widget_defs"> <xsl:param name="hmi_element"/>
<xsl:variable name="activity">
<xsl:call-template name="jump_widget_activity">
@@ -2493,7 +2816,7 @@
- <xsl:template mode="per_page_widget_template" match="widget[@type='Jump']">+ <xsl:template match="widget[@type='Jump']" mode="per_page_widget_template"> <xsl:param name="page_desc"/>
<xsl:variable name="target_page_name">
@@ -2595,7 +2918,299 @@
- <xsl:template mode="widget_defs" match="widget[@type='Keypad']">+ <xsl:template match="widget[@type='Keypad']" mode="widget_class"> + <xsl:text>class KeypadWidget extends Widget{ + <xsl:text> moving = undefined; + <xsl:text> enTimer = undefined; + <xsl:text> offset = undefined; + <xsl:text> on_position_click(evt) { + <xsl:text> this.moving = true; + <xsl:text> this.enTimer = true; + <xsl:text> // get click position offset from widget x,y and save it to variable + <xsl:text> var keypad_borders = this.position_elt.getBoundingClientRect(); + <xsl:text> var clickX = undefined; + <xsl:text> var clickY = undefined; + <xsl:text> if (evt.type == "touchstart"){ + <xsl:text> clickX = Math.ceil(evt.touches[0].clientX); + <xsl:text> clickY = Math.ceil(evt.touches[0].clientY); + <xsl:text> clickX = evt.pageX; + <xsl:text> clickY = evt.pageY; + <xsl:text> this.offset=[clickX-keypad_borders.left,clickY-keypad_borders.top] + <xsl:text> off_position_click(evt) { + <xsl:text> if(this.moving) + <xsl:text> this.moving = false; + <xsl:text> on_move(evt) { + <xsl:text> if(this.moving && this.enTimer){ + <xsl:text> //get keyboard pos in html + <xsl:text> let [eltid, tmpgrp] = current_modal; + <xsl:text> let [xcoord,ycoord] = this.coordinates; + <xsl:text> let [xdest,ydest,svgWidth,svgHeight] = page_desc[current_visible_page].bbox; + <xsl:text> //get mouse coordinates + <xsl:text> var clickX = undefined; + <xsl:text> var clickY = undefined; + <xsl:text> if (evt.type == "touchmove"){ + <xsl:text> clickX = Math.ceil(evt.touches[0].clientX); + <xsl:text> clickY = Math.ceil(evt.touches[0].clientY); + <xsl:text> clickX = evt.pageX; + <xsl:text> clickY = evt.pageY; + <xsl:text> //translate keyboard position + <xsl:text> let mouseX = ((clickX-this.offset[0])/window.innerWidth)*svgWidth; + <xsl:text> let mouseY = ((clickY-this.offset[1])/window.innerHeight)*svgHeight; + <xsl:text> tmpgrp.setAttribute("transform","translate("+String(xdest-xcoord+mouseX)+","+String(ydest-ycoord+mouseY)+")"); + <xsl:text> //reset timer + <xsl:text> this.enTimer = false; + <xsl:text> setTimeout("{hmi_widgets['"+this.element_id+"'].enTimer = true;}", 100); + <xsl:text> on_key_click(symbols) { + <xsl:text> var syms = symbols.split(" "); + <xsl:text> this.shift |= this.caps; + <xsl:text> this.editstr += syms[this.shift?syms.length-1:0]; + <xsl:text> this.shift = false; + <xsl:text> this.update(); + <xsl:text> on_Esc_click() { + <xsl:text> end_modal.call(this); + <xsl:text> on_Enter_click() { + <xsl:text> end_modal.call(this); + <xsl:text> let callback_obj = this.result_callback_obj; + <xsl:text> callback_obj.edit_callback(this.editstr); + <xsl:text> on_BackSpace_click() { + <xsl:text> this.editstr = this.editstr.slice(0,this.editstr.length-1); + <xsl:text> this.update(); + <xsl:text> on_Sign_click() { + <xsl:text> if(this.editstr[0] == "-") + <xsl:text> this.editstr = this.editstr.slice(1,this.editstr.length); + <xsl:text> this.editstr = "-" + this.editstr; + <xsl:text> this.update(); + <xsl:text> on_NumDot_click() { + <xsl:text> if(this.editstr.indexOf(".") == "-1"){ + <xsl:text> this.editstr += "."; + <xsl:text> this.update(); + <xsl:text> on_Space_click() { + <xsl:text> this.editstr += " "; + <xsl:text> this.update(); + <xsl:text> caps = false; + <xsl:text> _caps = undefined; + <xsl:text> on_CapsLock_click() { + <xsl:text> this.caps = !this.caps; + <xsl:text> this.update(); + <xsl:text> shift = false; + <xsl:text> _shift = undefined; + <xsl:text> on_Shift_click() { + <xsl:text> this.shift = !this.shift; + <xsl:text> this.caps = false; + <xsl:text> this.update(); + <xsl:text> editstr = ""; + <xsl:text> _editstr = undefined; + <xsl:text> result_callback_obj = undefined; + <xsl:text> start_edit(info, valuetype, callback_obj, initial,size) { + <xsl:text> show_modal.call(this,size); + <xsl:text> this.editstr = initial; + <xsl:text> this.result_callback_obj = callback_obj; + <xsl:text> this.Info_elt.textContent = info; + <xsl:text> this.shift = false; + <xsl:text> this.caps = false; + <xsl:text> this.update(); + <xsl:text> if(this.editstr != this._editstr){ + <xsl:text> this._editstr = this.editstr; + <xsl:text> this.Value_elt.textContent = this.editstr; + <xsl:text> if(this.shift != this._shift){ + <xsl:text> this._shift = this.shift; + <xsl:text> (this.shift?widget_active_activable:widget_inactive_activable)(this.Shift_sub); + <xsl:text> if(this.caps != this._caps){ + <xsl:text> this._caps = this.caps; + <xsl:text> (this.caps?widget_active_activable:widget_inactive_activable)(this.CapsLock_sub); + <xsl:template match="widget[@type='Keypad']" mode="widget_defs"> <xsl:param name="hmi_element"/>
<xsl:call-template name="defs_by_labels">
<xsl:with-param name="hmi_element" select="$hmi_element"/>
@@ -2606,7 +3221,7 @@
<xsl:call-template name="defs_by_labels">
<xsl:with-param name="hmi_element" select="$hmi_element"/>
<xsl:with-param name="labels">
- <xsl:text>Sign Space NumDot</xsl:text>+ <xsl:text>Sign Space NumDot position</xsl:text> <xsl:with-param name="mandatory" select="'no'"/>
@@ -2644,105 +3259,27 @@
- <xsl:text> on_key_click: function(symbols) {- <xsl:text> var syms = symbols.split(" ");- <xsl:text> this.shift |= this.caps;- <xsl:text> this.editstr += syms[this.shift?syms.length-1:0];- <xsl:text> this.shift = false;- <xsl:text> this.update();- <xsl:text> on_Esc_click: function() {- <xsl:text> end_modal.call(this);- <xsl:text> on_Enter_click: function() {- <xsl:text> end_modal.call(this);- <xsl:text> callback_obj = this.result_callback_obj;- <xsl:text> callback_obj.edit_callback(this.editstr);- <xsl:text> on_BackSpace_click: function() {- <xsl:text> this.editstr = this.editstr.slice(0,this.editstr.length-1);- <xsl:text> this.update();+ <xsl:text> if(this.position_elt){ + <xsl:text> this.position_elt.setAttribute("onmousedown", "hmi_widgets['"+this.element_id+"'].on_position_click(evt)"); + <xsl:text> this.position_elt.setAttribute("ontouchstart", "hmi_widgets['"+this.element_id+"'].on_position_click(evt)"); + <xsl:text> window.addEventListener("mouseup", hmi_widgets[this.element_id].off_position_click.bind(this)); + <xsl:text> window.addEventListener("touchend", hmi_widgets[this.element_id].off_position_click.bind(this)); + <xsl:text> window.addEventListener("touchcancel", hmi_widgets[this.element_id].off_position_click.bind(this)); + <xsl:text> window.addEventListener("mousemove", hmi_widgets[this.element_id].on_move.bind(this)); + <xsl:text> window.addEventListener("touchmove", hmi_widgets[this.element_id].on_move.bind(this)); - <xsl:text> on_Sign_click: function() {- <xsl:text> if(this.editstr[0] == "-")- <xsl:text> this.editstr = this.editstr.slice(1,this.editstr.length);- <xsl:text> this.editstr = "-" + this.editstr;- <xsl:text> this.update();- <xsl:text> on_NumDot_click: function() {- <xsl:text> if(this.editstr.indexOf(".") == "-1"){- <xsl:text> this.editstr += ".";- <xsl:text> this.update();- <xsl:text> on_Space_click: function() {- <xsl:text> this.editstr += " ";- <xsl:text> this.update();- <xsl:text> caps: false,- <xsl:text> _caps: undefined,- <xsl:text> on_CapsLock_click: function() {- <xsl:text> this.caps = !this.caps;- <xsl:text> this.update();- <xsl:text> shift: false,- <xsl:text> _shift: undefined,- <xsl:text> on_Shift_click: function() {- <xsl:text> this.shift = !this.shift;- <xsl:text> this.caps = false;- <xsl:text> this.update(); <xsl:variable name="g" select="$geometry[@Id = $hmi_element/@id]"/>
<xsl:text> coordinates: [</xsl:text>
@@ -2751,60 +3288,8 @@
<xsl:value-of select="$g/@y"/>
- <xsl:text> editstr: "",- <xsl:text> _editstr: undefined,- <xsl:text> result_callback_obj: undefined,- <xsl:text> start_edit: function(info, valuetype, callback_obj, initial) {- <xsl:text> show_modal.call(this);- <xsl:text> this.editstr = initial;- <xsl:text> this.result_callback_obj = callback_obj;- <xsl:text> this.Info_elt.textContent = info;- <xsl:text> this.shift = false;- <xsl:text> this.caps = false;- <xsl:text> this.update();- <xsl:text> update: function() {- <xsl:text> if(this.editstr != this._editstr){- <xsl:text> this._editstr = this.editstr;- <xsl:text> this.Value_elt.textContent = this.editstr;- <xsl:text> if(this.shift != this._shift){- <xsl:text> this._shift = this.shift;- <xsl:text> (this.shift?widget_active_activable:widget_inactive_activable)(this.Shift_sub);- <xsl:text> if(this.caps != this._caps){- <xsl:text> this._caps = this.caps;- <xsl:text> (this.caps?widget_active_activable:widget_inactive_activable)(this.CapsLock_sub);- <xsl:template mode="widget_defs" match="widget[@type='List']">+ <xsl:template match="widget[@type='List']" mode="widget_defs"> <xsl:param name="hmi_element"/>
@@ -2819,7 +3304,7 @@
- <xsl:template mode="widget_defs" match="widget[@type='Meter']">+ <xsl:template match="widget[@type='Meter']" mode="widget_defs"> <xsl:param name="hmi_element"/>
<xsl:text> frequency: 10,
@@ -2877,16 +3362,20 @@
- <xsl:template mode="widget_class" match="widget[@type='Switch']">- <xsl:text>class SwitchWidget extends Widget{+ <xsl:template match="widget[@type='MultiState']" mode="widget_class"> + <xsl:text>class MultiStateWidget extends Widget{ <xsl:text> frequency = 5;
<xsl:text> dispatch(value) {
+ <xsl:text> this.state = value; <xsl:text> for(let choice of this.choices){
- <xsl:text> if(value != choice.value){+ <xsl:text> if(this.state != choice.value){ <xsl:text> choice.elt.setAttribute("style", "display:none");
@@ -2900,10 +3389,62 @@
+ <xsl:text> on_click(evt) { + <xsl:text> //get current selected value + <xsl:text> let next_ind; + <xsl:text> for(next_ind=0; next_ind<this.choices.length; next_ind++){ + <xsl:text> if(this.state == this.choices[next_ind].value){ + <xsl:text> next_ind = next_ind + 1; + <xsl:text> //get next selected value + <xsl:text> if(this.choices.length > next_ind){ + <xsl:text> this.state = this.choices[next_ind].value; + <xsl:text> this.state = this.choices[0].value; + <xsl:text> //post value to plc + <xsl:text> change_hmi_value(this.indexes[0], "="+this.state); + <xsl:text> this.element.setAttribute("onclick", "hmi_widgets['"+this.element_id+"'].on_click(evt)"); - <xsl:template mode="widget_defs" match="widget[@type='Switch']">+ <xsl:template match="widget[@type='MultiState']" mode="widget_defs"> <xsl:param name="hmi_element"/>
@@ -2934,19 +3475,335 @@
- <xsl:template mode="widget_defs" match="widget[@type='ToggleButton']">+ <xsl:template match="widget[@type='Slider']" mode="widget_class"> + <xsl:text>class SliderWidget extends Widget{ + <xsl:text> frequency = 5; + <xsl:text> range = undefined; + <xsl:text> fi = undefined; + <xsl:text> drag = false; + <xsl:text> enTimer = false; + <xsl:text> dispatch(value) { + <xsl:text> if(!this.drag){ + <xsl:text> if(this.value_elt) + <xsl:text> this.value_elt.textContent = String(value); + <xsl:text> this.handle_position(value); + <xsl:text> handle_position(value){ + <xsl:text> let [min,max,start,totallength] = this.range; + <xsl:text> let length = Math.max(0,Math.min(totallength,(Number(value)-min)*totallength/(max-min))); + <xsl:text> let tip = this.range_elt.getPointAtLength(length); + <xsl:text> this.handle_elt.setAttribute('transform',"translate("+(tip.x-start.x)+","+(tip.y-start.y)+")"); + <xsl:text> on_release(evt) { + <xsl:text> if(this.drag){ + <xsl:text> this.drag = false; + <xsl:text> update_position(evt){ + <xsl:text> if(this.drag && this.enTimer){ + <xsl:text> var html_dist = 0; + <xsl:text> var svg_dist = 0; + <xsl:text> //calculate size of widget in html + <xsl:text> var range_borders = this.range_elt.getBoundingClientRect(); + <xsl:text> var range_length = Math.sqrt( range_borders.height*range_borders.height + range_borders.width*range_borders.width ); + <xsl:text> var [minX,minY,maxX,maxY] = [range_borders.left,range_borders.bottom,range_borders.right,range_borders.top]; + <xsl:text> //get range and mouse coordinates + <xsl:text> var mouseX = undefined; + <xsl:text> var mouseY = undefined; + <xsl:text> if (evt.type.startsWith("touch")){ + <xsl:text> mouseX = Math.ceil(evt.touches[0].clientX); + <xsl:text> mouseY = Math.ceil(evt.touches[0].clientY); + <xsl:text> mouseX = evt.pageX; + <xsl:text> mouseY = evt.pageY; + <xsl:text> //get handle distance from mouse position + <xsl:text> if (minX > mouseX && minY < mouseY){ + <xsl:text> html_dist = 0; + <xsl:text> else if (maxX < mouseX && maxY > mouseY){ + <xsl:text> html_dist = range_length; + <xsl:text> // calculate distace + <xsl:text> if(this.fi > 0.7){ + <xsl:text> html_dist = (minY - mouseY)/Math.sin(this.fi); + <xsl:text> html_dist = (mouseX - minX)/Math.cos(this.fi); + <xsl:text> //check if in range + <xsl:text> if (html_dist > range_length){ + <xsl:text> html_dist = range_length; + <xsl:text> else if (html_dist < 0){ + <xsl:text> html_dist = 0; + <xsl:text> //redraw handle + <xsl:text> this.handle_position(svg_dist=(html_dist/range_length)*this.range[1]); + <xsl:text> this.value_elt.textContent = String(Math.ceil(svg_dist)); + <xsl:text> change_hmi_value(this.indexes[0], "="+Math.ceil(svg_dist)); + <xsl:text> //reset timer + <xsl:text> this.enTimer = false; + <xsl:text> setTimeout("{hmi_widgets['"+this.element_id+"'].enTimer = true;}", 100); + <xsl:text> on_select(evt){ + <xsl:text> this.drag = true; + <xsl:text> this.enTimer = true; + <xsl:text> this.update_position(evt); + <xsl:text> let min = this.min_elt ? + <xsl:text> Number(this.min_elt.textContent) : + <xsl:text> this.args.length >= 1 ? this.args[0] : 0; + <xsl:text> let max = this.max_elt ? + <xsl:text> Number(this.max_elt.textContent) : + <xsl:text> this.args.length >= 2 ? this.args[1] : 100; + <xsl:text> this.range = [min, max, this.range_elt.getPointAtLength(0),this.range_elt.getTotalLength()]; + <xsl:text> let start = this.range_elt.getPointAtLength(0); + <xsl:text> let end = this.range_elt.getPointAtLength(this.range_elt.getTotalLength()); + <xsl:text> this.fi = Math.atan2(start.y-end.y, end.x-start.x); + <xsl:text> this.handle_elt.addEventListener("touchstart", hmi_widgets[this.element_id].on_select.bind(this)); + <xsl:text> this.handle_elt.addEventListener("mousedown", hmi_widgets[this.element_id].on_select.bind(this)); + <xsl:text> this.element.addEventListener("mousedown", hmi_widgets[this.element_id].on_select.bind(this)); + <xsl:text> window.addEventListener("touchmove", hmi_widgets[this.element_id].update_position.bind(this)); + <xsl:text> window.addEventListener("mousemove", hmi_widgets[this.element_id].update_position.bind(this)); + <xsl:text> window.addEventListener("mouseup", hmi_widgets[this.element_id].on_release.bind(this)) + <xsl:text> window.addEventListener("touchend", hmi_widgets[this.element_id].on_release.bind(this)); + <xsl:text> window.addEventListener("touchcancel", hmi_widgets[this.element_id].on_release.bind(this)); + <xsl:template match="widget[@type='Slider']" mode="widget_defs"> <xsl:param name="hmi_element"/>
<xsl:call-template name="defs_by_labels">
<xsl:with-param name="hmi_element" select="$hmi_element"/>
<xsl:with-param name="labels">
- <xsl:text>active inactive</xsl:text>+ <xsl:text>handle range</xsl:text> - <xsl:text> frequency: 5,- <xsl:text> dispatch: function(value) {+ <xsl:call-template name="defs_by_labels"> + <xsl:with-param name="hmi_element" select="$hmi_element"/> + <xsl:with-param name="labels"> + <xsl:text>value min max</xsl:text> + <xsl:with-param name="mandatory" select="'no'"/> + <xsl:template match="widget[@type='Switch']" mode="widget_class"> + <xsl:text>class SwitchWidget extends Widget{ + <xsl:text> frequency = 5; + <xsl:text> dispatch(value) { + <xsl:text> for(let choice of this.choices){ + <xsl:text> if(value != choice.value){ + <xsl:text> choice.elt.setAttribute("style", "display:none"); + <xsl:text> choice.elt.setAttribute("style", choice.style); + <xsl:template match="widget[@type='Switch']" mode="widget_defs"> + <xsl:param name="hmi_element"/> + <xsl:variable name="regex" select="'^("[^"].*"|\-?[0-9]+|false|true)(#.*)?$'"/> + <xsl:for-each select="$result_svg_ns//*[@id = $hmi_element/@id]//*[regexp:test(@inkscape:label,$regex)]"> + <xsl:variable name="literal" select="regexp:match(@inkscape:label,$regex)[2]"/> + <xsl:text> elt:id("</xsl:text> + <xsl:value-of select="@id"/> + <xsl:text> style:"</xsl:text> + <xsl:value-of select="@style"/> + <xsl:text> value:</xsl:text> + <xsl:value-of select="$literal"/> + <xsl:text> }</xsl:text> + <xsl:if test="position()!=last()"> + <xsl:template match="widget[@type='ToggleButton']" mode="widget_class"> + <xsl:text>class ToggleButtonWidget extends Widget{ + <xsl:text> frequency = 5; + <xsl:text> active_style = undefined; + <xsl:text> inactive_style = undefined; + <xsl:text> dispatch(value) { <xsl:text> this.state = value;
@@ -2968,29 +3825,40 @@
- <xsl:text> on_click: function(evt) {- <xsl:text> this.apply_hmi_value(0, this.state);- <xsl:text> active_style: undefined,- <xsl:text> inactive_style: undefined,- <xsl:text> init: function() {+ <xsl:text> on_click(evt) { + <xsl:text> change_hmi_value(this.indexes[0], "="+this.state); <xsl:text> this.active_style = this.active_elt.style.cssText;
<xsl:text> this.inactive_style = this.inactive_elt.style.cssText;
- <xsl:text> this.element.setAttribute("onclick", "hmi_widgets['</xsl:text>- <xsl:value-of select="$hmi_element/@id"/>- <xsl:text>'].on_click(evt)");+ <xsl:text> this.element.setAttribute("onclick", "hmi_widgets['"+this.element_id+"'].on_click(evt)"); + <xsl:template match="widget[@type='ToggleButton']" mode="widget_defs"> + <xsl:param name="hmi_element"/> + <xsl:call-template name="defs_by_labels"> + <xsl:with-param name="hmi_element" select="$hmi_element"/> + <xsl:with-param name="labels"> + <xsl:text>active inactive</xsl:text> @@ -3000,7 +3868,7 @@
<xsl:apply-templates select="document('')/*/debug:*"/>
- <html xmlns="http://www.w3.org/1999/xhtml" xmlns:svg="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">+ <html xmlns:svg="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/1999/xhtml"> <body style="margin:0;overflow:hidden;">
<xsl:copy-of select="$result_svg"/>
@@ -3831,7 +4699,7 @@
<xsl:text>var edit_callback;
- <xsl:text>function edit_value(path, valuetype, callback, initial) {+ <xsl:text>function edit_value(path, valuetype, callback, initial,size) { @@ -3843,7 +4711,7 @@
<xsl:text> let widget = hmi_widgets[keypadid];
- <xsl:text> widget.start_edit(path, valuetype, callback, initial);+ <xsl:text> widget.start_edit(path, valuetype, callback, initial,size); @@ -3853,7 +4721,7 @@
- <xsl:text>function show_modal() {+ <xsl:text>function show_modal(size) { <xsl:text> let [element, parent] = detachable_elements[this.element.id];
@@ -3863,13 +4731,23 @@
<xsl:text> tmpgrpattr = document.createAttribute("transform");
<xsl:text> let [xcoord,ycoord] = this.coordinates;
<xsl:text> let [xdest,ydest] = page_desc[current_visible_page].bbox;
- <xsl:text> tmpgrpattr.value = "translate("+String(xdest-xcoord)+","+String(ydest-ycoord)+")";+ <xsl:text> if (typeof size === 'undefined'){ + <xsl:text> tmpgrpattr.value = "translate("+String(xdest-xcoord)+","+String(ydest-ycoord)+")"; + <xsl:text> tmpgrpattr.value = "translate("+String(xdest-xcoord+size.x)+","+String(ydest-ycoord+size.y)+")"; <xsl:text> tmpgrp.setAttributeNode(tmpgrpattr);
