# HG changeset patch # User Edouard Tisserant # Date 1572255020 -3600 # Node ID 7fa21b3b5f9fd0684f62040c0e97d33582ffaa4d # Parent 7d0e81cdedb0d2352a8c38528bf4daa5f13208fb SVGHMI - added simple Meter widget. diff -r 7d0e81cdedb0 -r 7fa21b3b5f9f svghmi/gen_index_xhtml.xslt --- a/svghmi/gen_index_xhtml.xslt Sun Oct 27 22:28:51 2019 +0100 +++ b/svghmi/gen_index_xhtml.xslt Mon Oct 28 10:30:20 2019 +0100 @@ -850,8 +850,51 @@ + frequency: 10, + + + + + + Meter widget must have a + + element + + + + _elt: document.getElementById(" + + "), + + + dispatch: function(value) { + + this.value_elt.textContent = String(value); + + let [min,max,totallength] = this.range; + + let length = Math.max(0,Math.min(totallength,(Number(value)-min)*totallength/(max-min))); + + let tip = this.range_elt.getPointAtLength(length); + + this.needle_elt.setAttribute('d', "M "+this.origin.x+","+this.origin.y+" "+tip.x+","+tip.y); + + }, + + origin: undefined, + + range: undefined, + + init: function() { + + this.range = [Number(this.min_elt.textContent), Number(this.max_elt.textContent), this.range_elt.getTotalLength()] + + this.origin = this.needle_elt.getPointAtLength(0); + + }, + diff -r 7d0e81cdedb0 -r 7fa21b3b5f9f svghmi/gen_index_xhtml.ysl2 --- a/svghmi/gen_index_xhtml.ysl2 Sun Oct 27 22:28:51 2019 +0100 +++ b/svghmi/gen_index_xhtml.ysl2 Mon Oct 28 10:30:20 2019 +0100 @@ -324,8 +324,29 @@ } template "widget[@type='Meter']", mode="widget_defs" { + param "hmi_element"; | frequency: 10, - } + foreach "str:split('value min max needle range')" { + const "name","."; + const "elt_id","$hmi_element//*[@inkscape:label=$name][1]/@id"; + if "not($elt_id)" error > Meter widget must have a «$name» element + | «$name»_elt: document.getElementById("«$elt_id»"), + } + | dispatch: function(value) { + | this.value_elt.textContent = String(value); + | let [min,max,totallength] = this.range; + | let length = Math.max(0,Math.min(totallength,(Number(value)-min)*totallength/(max-min))); + | let tip = this.range_elt.getPointAtLength(length); + | this.needle_elt.setAttribute('d', "M "+this.origin.x+","+this.origin.y+" "+tip.x+","+tip.y); + | }, + | origin: undefined, + | range: undefined, + | init: function() { + | this.range = [Number(this.min_elt.textContent), Number(this.max_elt.textContent), this.range_elt.getTotalLength()] + | this.origin = this.needle_elt.getPointAtLength(0); + | }, + } + template "widget[@type='Input']", mode="widget_defs" { param "hmi_element"; | frequency: 5, diff -r 7d0e81cdedb0 -r 7fa21b3b5f9f tests/svghmi/svghmi_0@svghmi/svghmi.svg --- a/tests/svghmi/svghmi_0@svghmi/svghmi.svg Sun Oct 27 22:28:51 2019 +0100 +++ b/tests/svghmi/svghmi_0@svghmi/svghmi.svg Mon Oct 28 10:30:20 2019 +0100 @@ -80,8 +80,8 @@ showgrid="false" units="px" inkscape:zoom="0.84375" - inkscape:cx="-391.07334" - inkscape:cy="346.23071" + inkscape:cx="197.3711" + inkscape:cy="361.63812" inkscape:window-width="1600" inkscape:window-height="886" inkscape:window-x="0" @@ -323,7 +323,7 @@ sodipodi:nodetypes="cc" inkscape:label="needle" /> 0 10 + style="text-align:center;text-anchor:middle;fill:#ff6600;stroke-width:0.26458332px">10000