# HG changeset patch # User Edouard Tisserant # Date 1596718861 -7200 # Node ID dabad70db1bfec5b4afdeef1ee821d974f1d0163 # Parent 360300a8b995f7f6ae7be2e24f2f253c87a00726 SVGHMI: allow multiple variables and formatting in Display widget. Formatting is printf style and given as first argument. If no formating is given as widget argument, space separated. diff -r 360300a8b995 -r dabad70db1bf svghmi/gen_index_xhtml.xslt --- 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 @@ - - + + /* @@ -1096,8 +1096,8 @@ - - + + /* @@ -1125,8 +1125,8 @@ - - + + /* @@ -1426,9 +1426,13 @@ frequency = 5; - dispatch(value) { - - 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(' '); } @@ -1444,6 +1448,487 @@ " is not a svg::text element + fields: [], + + + + + + + /* + + */ + + + + /* https://github.com/alexei/sprintf.js/blob/master/src/sprintf.js */ + + /* global window, exports, define */ + + + + !function() { + + 'use strict' + + + + var re = { + + not_string: /[^s]/, + + not_bool: /[^t]/, + + not_type: /[^T]/, + + not_primitive: /[^v]/, + + number: /[diefg]/, + + numeric_arg: /[bcdiefguxX]/, + + json: /[j]/, + + not_json: /[^j]/, + + text: /^[^%]+/, + + modulo: /^%{2}/, + + placeholder: /^%(?:([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+)\]/, + + sign: /^[+-]/ + + } + + + + function sprintf(key) { + + // + + 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 + + arg = argv[cursor] + + 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])) + + } + + arg = arg[ph.keys[k]] + + } + + } + + else if (ph.param_no) { // positional argument (explicit) + + arg = argv[ph.param_no] + + } + + else { // positional argument (implicit) + + arg = argv[cursor++] + + } + + + + if (re.not_type.test(ph.type) && re.not_primitive.test(ph.type) && arg instanceof Function) { + + arg = arg() + + } + + + + 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)) { + + is_positive = arg >= 0 + + } + + + + switch (ph.type) { + + case 'b': + + arg = parseInt(arg, 10).toString(2) + + break + + case 'c': + + arg = String.fromCharCode(parseInt(arg, 10)) + + break + + case 'd': + + case 'i': + + arg = parseInt(arg, 10) + + break + + case 'j': + + arg = JSON.stringify(arg, null, ph.width ? parseInt(ph.width) : 0) + + break + + case 'e': + + arg = ph.precision ? parseFloat(arg).toExponential(ph.precision) : parseFloat(arg).toExponential() + + break + + case 'f': + + arg = ph.precision ? parseFloat(arg).toFixed(ph.precision) : parseFloat(arg) + + break + + case 'g': + + arg = ph.precision ? String(Number(arg.toPrecision(ph.precision))) : parseFloat(arg) + + break + + case 'o': + + arg = (parseInt(arg, 10) >>> 0).toString(8) + + break + + case 's': + + arg = String(arg) + + arg = (ph.precision ? arg.substring(0, ph.precision) : arg) + + break + + case 't': + + arg = String(!!arg) + + arg = (ph.precision ? arg.substring(0, ph.precision) : arg) + + break + + case 'T': + + arg = Object.prototype.toString.call(arg).slice(8, -1).toLowerCase() + + arg = (ph.precision ? arg.substring(0, ph.precision) : arg) + + break + + case 'u': + + arg = parseInt(arg, 10) >>> 0 + + break + + case 'v': + + arg = arg.valueOf() + + arg = (ph.precision ? arg.substring(0, ph.precision) : arg) + + break + + case 'x': + + arg = (parseInt(arg, 10) >>> 0).toString(16) + + break + + case 'X': + + arg = (parseInt(arg, 10) >>> 0).toString(16).toUpperCase() + + break + + } + + if (re.json.test(ph.type)) { + + output += arg + + } + + else { + + if (re.number.test(ph.type) && (!is_positive || ph.sign)) { + + sign = is_positive ? '+' : '-' + + arg = arg.toString().replace(re.sign, '') + + } + + else { + + 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) + + } + + } + + } + + return output + + } + + + + 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 + + while (_fmt) { + + if ((match = re.text.exec(_fmt)) !== null) { + + parse_tree.push(match[0]) + + } + + else if ((match = re.modulo.exec(_fmt)) !== null) { + + parse_tree.push('%') + + } + + else if ((match = re.placeholder.exec(_fmt)) !== null) { + + if (match[2]) { + + arg_names |= 1 + + 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]) + + } + + else { + + throw new SyntaxError('[sprintf] failed to parse named argument key') + + } + + } + + } + + else { + + throw new SyntaxError('[sprintf] failed to parse named argument key') + + } + + match[2] = field_list + + } + + else { + + arg_names |= 2 + + } + + if (arg_names === 3) { + + throw new Error('[sprintf] mixing positional and named placeholders is not (yet) supported') + + } + + + + parse_tree.push( + + { + + placeholder: match[0], + + param_no: match[1], + + keys: match[2], + + sign: match[3], + + pad_char: match[4], + + align: match[5], + + width: match[6], + + precision: match[7], + + type: match[8] + + } + + ) + + } + + else { + + 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']) { + + define(function() { + + return { + + 'sprintf': sprintf, + + 'vsprintf': vsprintf + + } + + }) + + } + + } + + /* eslint-enable quote-props */ + + }(); // eslint-disable-line + + + diff -r 360300a8b995 -r dabad70db1bf svghmi/widget_display.ysl2 --- 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{ frequency = 5; - dispatch(value) { - 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 @@ param "hmi_element"; if "$hmi_element[not(self::svg:text)]" error > Display Widget id="«$hmi_element/@id»" is not a svg::text element + + | fields: [], } + +emit "preamble:display" +|| +/* https://github.com/alexei/sprintf.js/blob/master/src/sprintf.js */ +/* global window, exports, define */ + +!function() { + 'use strict' + + var re = { + not_string: /[^s]/, + not_bool: /[^t]/, + not_type: /[^T]/, + not_primitive: /[^v]/, + number: /[diefg]/, + numeric_arg: /[bcdiefguxX]/, + json: /[j]/, + not_json: /[^j]/, + text: /^[^\x25]+/, + modulo: /^\x25{2}/, + 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+)\]/, + sign: /^[+-]/ + } + + 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 + arg = argv[cursor] + 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])) + } + arg = arg[ph.keys[k]] + } + } + else if (ph.param_no) { // positional argument (explicit) + arg = argv[ph.param_no] + } + else { // positional argument (implicit) + arg = argv[cursor++] + } + + if (re.not_type.test(ph.type) && re.not_primitive.test(ph.type) && arg instanceof Function) { + arg = arg() + } + + 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)) { + is_positive = arg >= 0 + } + + switch (ph.type) { + case 'b': + arg = parseInt(arg, 10).toString(2) + break + case 'c': + arg = String.fromCharCode(parseInt(arg, 10)) + break + case 'd': + case 'i': + arg = parseInt(arg, 10) + break + case 'j': + arg = JSON.stringify(arg, null, ph.width ? parseInt(ph.width) : 0) + break + case 'e': + arg = ph.precision ? parseFloat(arg).toExponential(ph.precision) : parseFloat(arg).toExponential() + break + case 'f': + arg = ph.precision ? parseFloat(arg).toFixed(ph.precision) : parseFloat(arg) + break + case 'g': + arg = ph.precision ? String(Number(arg.toPrecision(ph.precision))) : parseFloat(arg) + break + case 'o': + arg = (parseInt(arg, 10) >>> 0).toString(8) + break + case 's': + arg = String(arg) + arg = (ph.precision ? arg.substring(0, ph.precision) : arg) + break + case 't': + arg = String(!!arg) + arg = (ph.precision ? arg.substring(0, ph.precision) : arg) + break + case 'T': + arg = Object.prototype.toString.call(arg).slice(8, -1).toLowerCase() + arg = (ph.precision ? arg.substring(0, ph.precision) : arg) + break + case 'u': + arg = parseInt(arg, 10) >>> 0 + break + case 'v': + arg = arg.valueOf() + arg = (ph.precision ? arg.substring(0, ph.precision) : arg) + break + case 'x': + arg = (parseInt(arg, 10) >>> 0).toString(16) + break + case 'X': + arg = (parseInt(arg, 10) >>> 0).toString(16).toUpperCase() + break + } + if (re.json.test(ph.type)) { + output += arg + } + else { + if (re.number.test(ph.type) && (!is_positive || ph.sign)) { + sign = is_positive ? '+' : '-' + arg = arg.toString().replace(re.sign, '') + } + else { + 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) + } + } + } + return output + } + + 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 + while (_fmt) { + if ((match = re.text.exec(_fmt)) !== null) { + parse_tree.push(match[0]) + } + else if ((match = re.modulo.exec(_fmt)) !== null) { + parse_tree.push('%') + } + else if ((match = re.placeholder.exec(_fmt)) !== null) { + if (match[2]) { + arg_names |= 1 + 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]) + } + else { + throw new SyntaxError('[sprintf] failed to parse named argument key') + } + } + } + else { + throw new SyntaxError('[sprintf] failed to parse named argument key') + } + match[2] = field_list + } + else { + arg_names |= 2 + } + if (arg_names === 3) { + throw new Error('[sprintf] mixing positional and named placeholders is not (yet) supported') + } + + parse_tree.push( + { + placeholder: match[0], + param_no: match[1], + keys: match[2], + sign: match[3], + pad_char: match[4], + align: match[5], + width: match[6], + precision: match[7], + type: match[8] + } + ) + } + else { + 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']) { + define(function() { + return { + 'sprintf': sprintf, + 'vsprintf': vsprintf + } + }) + } + } + /* eslint-enable quote-props */ +}(); // eslint-disable-line +|| diff -r 360300a8b995 -r dabad70db1bf tests/svghmi/svghmi_0@svghmi/svghmi.svg --- 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:pageopacity="0" inkscape:pageshadow="2" inkscape:document-units="px" - inkscape:current-layer="g6077" + inkscape:current-layer="hmi0" showgrid="false" units="px" - inkscape:zoom="1.4142136" - inkscape:cx="1970.3359" - inkscape:cy="368.15797" + inkscape:zoom="0.7071068" + inkscape:cx="543.82641" + inkscape:cy="218.7845" inkscape:window-width="2419" inkscape:window-height="1266" - inkscape:window-x="1197" - inkscape:window-y="563" + inkscape:window-x="1405" + inkscape:window-y="37" inkscape:window-maximized="0" showguides="true" inkscape:guide-bbox="true" /> @@ -4200,4 +4200,28 @@ sodipodi:role="line">-1 + 8888 + Multiple variables