--- a/svghmi/gen_index_xhtml.xslt Thu Aug 06 14:59:04 2020 +0200
+++ b/svghmi/gen_index_xhtml.xslt Thu Aug 06 15:01:01 2020 +0200
@@ -569,8 +569,8 @@
- <declarations:page-desc/>- <xsl:template match="declarations:page-desc">+ <definitions:page-desc/> + <xsl:template match="definitions:page-desc"> @@ -1096,8 +1096,8 @@
- <preamble:hmi-classes/>- <xsl:template match="preamble:hmi-classes">+ <declarations:hmi-classes/> + <xsl:template match="declarations:hmi-classes"> @@ -1125,8 +1125,8 @@
<xsl:variable name="excluded_types" select="str:split('Page Lang')"/>
<xsl:variable name="excluded_ids" select="$parsed_widgets/widget[not(@type = $excluded_types)]/@id"/>
- <preamble:hmi-elements/>- <xsl:template match="preamble:hmi-elements">+ <declarations:hmi-elements/> + <xsl:template match="declarations:hmi-elements"> @@ -1426,9 +1426,13 @@
<xsl:text> frequency = 5;
- <xsl:text> dispatch(value) {- <xsl:text> this.element.textContent = String(value);+ <xsl:text> dispatch(value, oldval, index) { + <xsl:text> this.fields[index] = value; + <xsl:text> console.log(value, index); + <xsl:text> this.element.textContent = this.args.length == 1 ? vsprintf(this.args[0],this.fields) : this.fields.join(' '); @@ -1444,6 +1448,487 @@
<xsl:text>" is not a svg::text element</xsl:text>
+ <xsl:template match="preamble:display"> + <xsl:text>/* </xsl:text> + <xsl:value-of select="local-name()"/> + <xsl:text>/* https://github.com/alexei/sprintf.js/blob/master/src/sprintf.js */ + <xsl:text>/* global window, exports, define */ + <xsl:text>!function() { + <xsl:text> 'use strict' + <xsl:text> not_string: /[^s]/, + <xsl:text> not_bool: /[^t]/, + <xsl:text> not_type: /[^T]/, + <xsl:text> not_primitive: /[^v]/, + <xsl:text> number: /[diefg]/, + <xsl:text> numeric_arg: /[bcdiefguxX]/, + <xsl:text> json: /[j]/, + <xsl:text> not_json: /[^j]/, + <xsl:text> text: /^[^%]+/, + <xsl:text> modulo: /^%{2}/, + <xsl:text> placeholder: /^%(?:([1-9]\d*)\$|\(([^)]+)\))?(\+)?(0|'[^$])?(-)?(\d+)?(?:\.(\d+))?([b-gijostTuvxX])/, + <xsl:text> key: /^([a-z_][a-z_\d]*)/i, + <xsl:text> key_access: /^\.([a-z_][a-z_\d]*)/i, + <xsl:text> index_access: /^\[(\d+)\]/, + <xsl:text> sign: /^[+-]/ + <xsl:text> function sprintf(key) { + <xsl:text> // </xsl:text> + <xsl:text> is not an array, but should be fine for this call + <xsl:text> return sprintf_format(sprintf_parse(key), arguments) + <xsl:text> function vsprintf(fmt, argv) { + <xsl:text> return sprintf.apply(null, [fmt].concat(argv || [])) + <xsl:text> function sprintf_format(parse_tree, argv) { + <xsl:text> var cursor = 1, tree_length = parse_tree.length, arg, output = '', i, k, ph, pad, pad_character, pad_length, is_positive, sign + <xsl:text> for (i = 0; i < tree_length; i++) { + <xsl:text> if (typeof parse_tree[i] === 'string') { + <xsl:text> output += parse_tree[i] + <xsl:text> else if (typeof parse_tree[i] === 'object') { + <xsl:text> ph = parse_tree[i] // convenience purposes only + <xsl:text> if (ph.keys) { // keyword argument + <xsl:text> arg = argv[cursor] + <xsl:text> for (k = 0; k < ph.keys.length; k++) { + <xsl:text> if (arg == undefined) { + <xsl:text> throw new Error(sprintf('[sprintf] Cannot access property "%s" of undefined value "%s"', ph.keys[k], ph.keys[k-1])) + <xsl:text> arg = arg[ph.keys[k]] + <xsl:text> else if (ph.param_no) { // positional argument (explicit) + <xsl:text> arg = argv[ph.param_no] + <xsl:text> else { // positional argument (implicit) + <xsl:text> arg = argv[cursor++] + <xsl:text> if (re.not_type.test(ph.type) && re.not_primitive.test(ph.type) && arg instanceof Function) { + <xsl:text> if (re.numeric_arg.test(ph.type) && (typeof arg !== 'number' && isNaN(arg))) { + <xsl:text> throw new TypeError(sprintf('[sprintf] expecting number but found %T', arg)) + <xsl:text> if (re.number.test(ph.type)) { + <xsl:text> is_positive = arg >= 0 + <xsl:text> switch (ph.type) { + <xsl:text> arg = parseInt(arg, 10).toString(2) + <xsl:text> arg = String.fromCharCode(parseInt(arg, 10)) + <xsl:text> arg = parseInt(arg, 10) + <xsl:text> arg = JSON.stringify(arg, null, ph.width ? parseInt(ph.width) : 0) + <xsl:text> arg = ph.precision ? parseFloat(arg).toExponential(ph.precision) : parseFloat(arg).toExponential() + <xsl:text> arg = ph.precision ? parseFloat(arg).toFixed(ph.precision) : parseFloat(arg) + <xsl:text> arg = ph.precision ? String(Number(arg.toPrecision(ph.precision))) : parseFloat(arg) + <xsl:text> arg = (parseInt(arg, 10) >>> 0).toString(8) + <xsl:text> arg = String(arg) + <xsl:text> arg = (ph.precision ? arg.substring(0, ph.precision) : arg) + <xsl:text> arg = String(!!arg) + <xsl:text> arg = (ph.precision ? arg.substring(0, ph.precision) : arg) + <xsl:text> arg = Object.prototype.toString.call(arg).slice(8, -1).toLowerCase() + <xsl:text> arg = (ph.precision ? arg.substring(0, ph.precision) : arg) + <xsl:text> arg = parseInt(arg, 10) >>> 0 + <xsl:text> arg = arg.valueOf() + <xsl:text> arg = (ph.precision ? arg.substring(0, ph.precision) : arg) + <xsl:text> arg = (parseInt(arg, 10) >>> 0).toString(16) + <xsl:text> arg = (parseInt(arg, 10) >>> 0).toString(16).toUpperCase() + <xsl:text> if (re.json.test(ph.type)) { + <xsl:text> output += arg + <xsl:text> if (re.number.test(ph.type) && (!is_positive || ph.sign)) { + <xsl:text> sign = is_positive ? '+' : '-' + <xsl:text> arg = arg.toString().replace(re.sign, '') + <xsl:text> pad_character = ph.pad_char ? ph.pad_char === '0' ? '0' : ph.pad_char.charAt(1) : ' ' + <xsl:text> pad_length = ph.width - (sign + arg).length + <xsl:text> pad = ph.width ? (pad_length > 0 ? pad_character.repeat(pad_length) : '') : '' + <xsl:text> output += ph.align ? sign + arg + pad : (pad_character === '0' ? sign + pad + arg : pad + sign + arg) + <xsl:text> return output + <xsl:text> var sprintf_cache = Object.create(null) + <xsl:text> function sprintf_parse(fmt) { + <xsl:text> if (sprintf_cache[fmt]) { + <xsl:text> return sprintf_cache[fmt] + <xsl:text> var _fmt = fmt, match, parse_tree = [], arg_names = 0 + <xsl:text> while (_fmt) { + <xsl:text> if ((match = re.text.exec(_fmt)) !== null) { + <xsl:text> parse_tree.push(match[0]) + <xsl:text> else if ((match = re.modulo.exec(_fmt)) !== null) { + <xsl:text> parse_tree.push('%') + <xsl:text> else if ((match = re.placeholder.exec(_fmt)) !== null) { + <xsl:text> if (match[2]) { + <xsl:text> arg_names |= 1 + <xsl:text> var field_list = [], replacement_field = match[2], field_match = [] + <xsl:text> if ((field_match = re.key.exec(replacement_field)) !== null) { + <xsl:text> field_list.push(field_match[1]) + <xsl:text> while ((replacement_field = replacement_field.substring(field_match[0].length)) !== '') { + <xsl:text> if ((field_match = re.key_access.exec(replacement_field)) !== null) { + <xsl:text> field_list.push(field_match[1]) + <xsl:text> else if ((field_match = re.index_access.exec(replacement_field)) !== null) { + <xsl:text> field_list.push(field_match[1]) + <xsl:text> throw new SyntaxError('[sprintf] failed to parse named argument key') + <xsl:text> throw new SyntaxError('[sprintf] failed to parse named argument key') + <xsl:text> match[2] = field_list + <xsl:text> arg_names |= 2 + <xsl:text> if (arg_names === 3) { + <xsl:text> throw new Error('[sprintf] mixing positional and named placeholders is not (yet) supported') + <xsl:text> parse_tree.push( + <xsl:text> placeholder: match[0], + <xsl:text> param_no: match[1], + <xsl:text> keys: match[2], + <xsl:text> sign: match[3], + <xsl:text> pad_char: match[4], + <xsl:text> align: match[5], + <xsl:text> width: match[6], + <xsl:text> precision: match[7], + <xsl:text> type: match[8] + <xsl:text> throw new SyntaxError('[sprintf] unexpected placeholder') + <xsl:text> _fmt = _fmt.substring(match[0].length) + <xsl:text> return sprintf_cache[fmt] = parse_tree + <xsl:text> * export to either browser or node.js + <xsl:text> /* eslint-disable quote-props */ + <xsl:text> if (typeof exports !== 'undefined') { + <xsl:text> exports['sprintf'] = sprintf + <xsl:text> exports['vsprintf'] = vsprintf + <xsl:text> if (typeof window !== 'undefined') { + <xsl:text> window['sprintf'] = sprintf + <xsl:text> window['vsprintf'] = vsprintf + <xsl:text> if (typeof define === 'function' && define['amd']) { + <xsl:text> define(function() { + <xsl:text> 'sprintf': sprintf, + <xsl:text> 'vsprintf': vsprintf + <xsl:text> /* eslint-enable quote-props */ + <xsl:text>}(); // eslint-disable-line <xsl:template mode="widget_defs" match="widget[@type='DropDown']">
<xsl:param name="hmi_element"/>
--- a/svghmi/widget_display.ysl2 Thu Aug 06 14:59:04 2020 +0200
+++ b/svghmi/widget_display.ysl2 Thu Aug 06 15:01:01 2020 +0200
@@ -5,8 +5,10 @@
class DisplayWidget extends Widget{
- this.element.textContent = String(value);+ dispatch(value, oldval, index) { + this.fields[index] = value; + console.log(value, index); + this.element.textContent = this.args.length == 1 ? vsprintf(this.args[0],this.fields) : this.fields.join(' '); @@ -15,4 +17,242 @@
if "$hmi_element[not(self::svg:text)]"
error > Display Widget id="«$hmi_element/@id»" is not a svg::text element
+/* https://github.com/alexei/sprintf.js/blob/master/src/sprintf.js */ +/* global window, exports, define */ + numeric_arg: /[bcdiefguxX]/, + placeholder: /^\x25(?:([1-9]\d*)\$|\(([^)]+)\))?(\+)?(0|'[^$])?(-)?(\d+)?(?:\.(\d+))?([b-gijostTuvxX])/, + key: /^([a-z_][a-z_\d]*)/i, + key_access: /^\.([a-z_][a-z_\d]*)/i, + index_access: /^\[(\d+)\]/, + function sprintf(key) { + // `arguments` is not an array, but should be fine for this call + return sprintf_format(sprintf_parse(key), arguments) + function vsprintf(fmt, argv) { + return sprintf.apply(null, [fmt].concat(argv || [])) + function sprintf_format(parse_tree, argv) { + var cursor = 1, tree_length = parse_tree.length, arg, output = '', i, k, ph, pad, pad_character, pad_length, is_positive, sign + for (i = 0; i < tree_length; i++) { + if (typeof parse_tree[i] === 'string') { + output += parse_tree[i] + else if (typeof parse_tree[i] === 'object') { + ph = parse_tree[i] // convenience purposes only + if (ph.keys) { // keyword argument + for (k = 0; k < ph.keys.length; k++) { + if (arg == undefined) { + throw new Error(sprintf('[sprintf] Cannot access property "%s" of undefined value "%s"', ph.keys[k], ph.keys[k-1])) + else if (ph.param_no) { // positional argument (explicit) + arg = argv[ph.param_no] + else { // positional argument (implicit) + if (re.not_type.test(ph.type) && re.not_primitive.test(ph.type) && arg instanceof Function) { + if (re.numeric_arg.test(ph.type) && (typeof arg !== 'number' && isNaN(arg))) { + throw new TypeError(sprintf('[sprintf] expecting number but found %T', arg)) + if (re.number.test(ph.type)) { + arg = parseInt(arg, 10).toString(2) + arg = String.fromCharCode(parseInt(arg, 10)) + arg = parseInt(arg, 10) + arg = JSON.stringify(arg, null, ph.width ? parseInt(ph.width) : 0) + arg = ph.precision ? parseFloat(arg).toExponential(ph.precision) : parseFloat(arg).toExponential() + arg = ph.precision ? parseFloat(arg).toFixed(ph.precision) : parseFloat(arg) + arg = ph.precision ? String(Number(arg.toPrecision(ph.precision))) : parseFloat(arg) + arg = (parseInt(arg, 10) >>> 0).toString(8) + arg = (ph.precision ? arg.substring(0, ph.precision) : arg) + arg = (ph.precision ? arg.substring(0, ph.precision) : arg) + arg = Object.prototype.toString.call(arg).slice(8, -1).toLowerCase() + arg = (ph.precision ? arg.substring(0, ph.precision) : arg) + arg = parseInt(arg, 10) >>> 0 + arg = (ph.precision ? arg.substring(0, ph.precision) : arg) + arg = (parseInt(arg, 10) >>> 0).toString(16) + arg = (parseInt(arg, 10) >>> 0).toString(16).toUpperCase() + if (re.json.test(ph.type)) { + if (re.number.test(ph.type) && (!is_positive || ph.sign)) { + sign = is_positive ? '+' : '-' + arg = arg.toString().replace(re.sign, '') + pad_character = ph.pad_char ? ph.pad_char === '0' ? '0' : ph.pad_char.charAt(1) : ' ' + pad_length = ph.width - (sign + arg).length + pad = ph.width ? (pad_length > 0 ? pad_character.repeat(pad_length) : '') : '' + output += ph.align ? sign + arg + pad : (pad_character === '0' ? sign + pad + arg : pad + sign + arg) + var sprintf_cache = Object.create(null) + function sprintf_parse(fmt) { + if (sprintf_cache[fmt]) { + return sprintf_cache[fmt] + var _fmt = fmt, match, parse_tree = [], arg_names = 0 + if ((match = re.text.exec(_fmt)) !== null) { + parse_tree.push(match[0]) + else if ((match = re.modulo.exec(_fmt)) !== null) { + else if ((match = re.placeholder.exec(_fmt)) !== null) { + var field_list = [], replacement_field = match[2], field_match = [] + if ((field_match = re.key.exec(replacement_field)) !== null) { + field_list.push(field_match[1]) + while ((replacement_field = replacement_field.substring(field_match[0].length)) !== '') { + if ((field_match = re.key_access.exec(replacement_field)) !== null) { + field_list.push(field_match[1]) + else if ((field_match = re.index_access.exec(replacement_field)) !== null) { + field_list.push(field_match[1]) + throw new SyntaxError('[sprintf] failed to parse named argument key') + throw new SyntaxError('[sprintf] failed to parse named argument key') + throw new Error('[sprintf] mixing positional and named placeholders is not (yet) supported') + throw new SyntaxError('[sprintf] unexpected placeholder') + _fmt = _fmt.substring(match[0].length) + return sprintf_cache[fmt] = parse_tree + * export to either browser or node.js + /* eslint-disable quote-props */ + if (typeof exports !== 'undefined') { + exports['sprintf'] = sprintf + exports['vsprintf'] = vsprintf + if (typeof window !== 'undefined') { + window['sprintf'] = sprintf + window['vsprintf'] = vsprintf + if (typeof define === 'function' && define['amd']) { + /* eslint-enable quote-props */ +}(); // eslint-disable-line --- a/tests/svghmi/svghmi_0@svghmi/svghmi.svg Thu Aug 06 14:59:04 2020 +0200
+++ b/tests/svghmi/svghmi_0@svghmi/svghmi.svg Thu Aug 06 15:01:01 2020 +0200
@@ -167,16 +167,16 @@
inkscape:document-units="px"
- inkscape:current-layer="g6077"+ inkscape:current-layer="hmi0" - inkscape:zoom="1.4142136"- inkscape:cx="1970.3359"- inkscape:cy="368.15797"+ inkscape:zoom="0.7071068" + inkscape:cx="543.82641" inkscape:window-width="2419"
inkscape:window-height="1266"
- inkscape:window-x="1197"- inkscape:window-y="563"+ inkscape:window-x="1405" inkscape:window-maximized="0"
inkscape:guide-bbox="true" />
@@ -4200,4 +4200,28 @@
sodipodi:role="line">-1</tspan></text>
+ style="font-style:normal;font-weight:normal;font-size:59.01374435px;line-height:125%;font-family:sans-serif;text-align:center;letter-spacing:0px;word-spacing:0px;text-anchor:middle;fill:#82ff77;fill-opacity:1;stroke:none;stroke-width:0.3688359px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" + inkscape:label="HMI:Display:Ploc %d (%d) grmbl !@/PUMP0/PRESSURE@/PUMP0/SLOTH"><tspan + style="text-align:center;text-anchor:middle;fill:#82ff77;fill-opacity:1;stroke-width:0.3688359px">8888</tspan></text> + style="font-style:normal;font-weight:normal;font-size:25.4761734px;line-height:125%;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;display:inline;fill:#008000;fill-opacity:1;stroke:none;stroke-width:0.63690436px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" + inkscape:label="actual_label"><tspan + style="stroke-width:0.63690436px">Multiple variables</tspan></text> 