beremiz: svghmi/widgets_common.ysl2@15e2df3e5610 (annotated)

2884 50b9832c51fc SVGHMI: update Makefile to pick all changes to any dependency Edouard Tisserant <edouard.tisserant@gmail.com> parents: 2883 diff changeset	1	// widgets_common.ysl2
50b9832c51fc SVGHMI: update Makefile to pick all changes to any dependency Edouard Tisserant <edouard.tisserant@gmail.com> parents: 2883 diff changeset	2
2808 dc78ffa5253d SVGHMI: SVG viewport now defined so that HMI take scales and fit to the view. Implemented page switch through viewport change, no hiding of widget for now. Edouard Tisserant parents: 2807 diff changeset	3	in xsl decl labels(*ptr, name="defs_by_labels") alias call-template {
dc78ffa5253d SVGHMI: SVG viewport now defined so that HMI take scales and fit to the view. Implemented page switch through viewport change, no hiding of widget for now. Edouard Tisserant parents: 2807 diff changeset	4	with "hmi_element", "$hmi_element";
2810 63b9a37b73c7 SVGHMI: various insignificant code moves, commenting and typos fixes. Edouard Tisserant parents: 2808 diff changeset	5	with "labels"{text *ptr};
2937 9226a830fbc3 SVGHMI: moving code wher it belongs, and reformulate some declarations for better readability. Edouard Tisserant <edouard.tisserant@gmail.com> parents: 2920 diff changeset	6	content;
2808 dc78ffa5253d SVGHMI: SVG viewport now defined so that HMI take scales and fit to the view. Implemented page switch through viewport change, no hiding of widget for now. Edouard Tisserant parents: 2807 diff changeset	7	};
dc78ffa5253d SVGHMI: SVG viewport now defined so that HMI take scales and fit to the view. Implemented page switch through viewport change, no hiding of widget for now. Edouard Tisserant parents: 2807 diff changeset	8
2937 9226a830fbc3 SVGHMI: moving code wher it belongs, and reformulate some declarations for better readability. Edouard Tisserant <edouard.tisserant@gmail.com> parents: 2920 diff changeset	9	decl optional_labels(*ptr) alias - {
9226a830fbc3 SVGHMI: moving code wher it belongs, and reformulate some declarations for better readability. Edouard Tisserant <edouard.tisserant@gmail.com> parents: 2920 diff changeset	10	/* TODO add some per label xslt variable to check if exist */
9226a830fbc3 SVGHMI: moving code wher it belongs, and reformulate some declarations for better readability. Edouard Tisserant <edouard.tisserant@gmail.com> parents: 2920 diff changeset	11	labels(*ptr){
9226a830fbc3 SVGHMI: moving code wher it belongs, and reformulate some declarations for better readability. Edouard Tisserant <edouard.tisserant@gmail.com> parents: 2920 diff changeset	12	with "mandatory","'no'";
9226a830fbc3 SVGHMI: moving code wher it belongs, and reformulate some declarations for better readability. Edouard Tisserant <edouard.tisserant@gmail.com> parents: 2920 diff changeset	13	content;
9226a830fbc3 SVGHMI: moving code wher it belongs, and reformulate some declarations for better readability. Edouard Tisserant <edouard.tisserant@gmail.com> parents: 2920 diff changeset	14	}
2836 ce6cecdb7320 SVGHMI : still behave, even if important things are missing in SVG widget definitions (ex: needle missing for Meter widget) Edouard Tisserant parents: 2834 diff changeset	15	};
ce6cecdb7320 SVGHMI : still behave, even if important things are missing in SVG widget definitions (ex: needle missing for Meter widget) Edouard Tisserant parents: 2834 diff changeset	16
2937 9226a830fbc3 SVGHMI: moving code wher it belongs, and reformulate some declarations for better readability. Edouard Tisserant <edouard.tisserant@gmail.com> parents: 2920 diff changeset	17	decl activable_labels(*ptr) alias - {
9226a830fbc3 SVGHMI: moving code wher it belongs, and reformulate some declarations for better readability. Edouard Tisserant <edouard.tisserant@gmail.com> parents: 2920 diff changeset	18	optional_labels(*ptr) {
9226a830fbc3 SVGHMI: moving code wher it belongs, and reformulate some declarations for better readability. Edouard Tisserant <edouard.tisserant@gmail.com> parents: 2920 diff changeset	19	with "subelements","'active inactive'";
9226a830fbc3 SVGHMI: moving code wher it belongs, and reformulate some declarations for better readability. Edouard Tisserant <edouard.tisserant@gmail.com> parents: 2920 diff changeset	20	content;
9226a830fbc3 SVGHMI: moving code wher it belongs, and reformulate some declarations for better readability. Edouard Tisserant <edouard.tisserant@gmail.com> parents: 2920 diff changeset	21	}
2920 3ee337c8c769 SVGHMI: finished shift and capslock support n keypad widget. Added a helper in widgets_common to collect subelements likle active/inactive/disabled... Edouard Tisserant <edouard.tisserant@gmail.com> parents: 2897 diff changeset	22	};
3ee337c8c769 SVGHMI: finished shift and capslock support n keypad widget. Added a helper in widgets_common to collect subelements likle active/inactive/disabled... Edouard Tisserant <edouard.tisserant@gmail.com> parents: 2897 diff changeset	23
2955 64e603b84aa3 SVGHMI: Exclude non-widget HMI:* labeled elements from hmi_widget. Namely : HMI:Page HMI:Lang and HMI:List have been excluded. Edouard Tisserant <edouard.tisserant@gmail.com> parents: 2954 diff changeset	24	template "svg:*", mode="hmi_widgets" {
2886 6c82fad8be65 SVGHMI: Simplification and optimization. func:parselabel becomes a template. Edouard Tisserant <edouard.tisserant@gmail.com> parents: 2884 diff changeset	25	const "widget", "func:widget(@id)";
2881 3bb49f93d48c SVGHMI: added widget_common.ysl2 Edouard Tisserant parents: 2880 diff changeset	26	const "eltid","@id";
2950 1e53d8b60ee9 SVGHMI: Parameters common to all widget constructors now passed as ordered parameters. Edouard Tisserant <edouard.tisserant@gmail.com> parents: 2949 diff changeset	27	const "args" foreach "$widget/arg" > "«@value»"`if "position()!=last()" > ,`
1e53d8b60ee9 SVGHMI: Parameters common to all widget constructors now passed as ordered parameters. Edouard Tisserant <edouard.tisserant@gmail.com> parents: 2949 diff changeset	28	const "indexes" foreach "$widget/path" {
2881 3bb49f93d48c SVGHMI: added widget_common.ysl2 Edouard Tisserant parents: 2880 diff changeset	29	choose {
3bb49f93d48c SVGHMI: added widget_common.ysl2 Edouard Tisserant parents: 2880 diff changeset	30	when "not(@index)" {
3017 15e2df3e5610 SVGHMI: Intermediate state while implementing local HMI variables. Now write to cache only (no send), still need to implement dispatch on change. Edouard Tisserant <edouard.tisserant@gmail.com> parents: 3007 diff changeset	31	choose {
15e2df3e5610 SVGHMI: Intermediate state while implementing local HMI variables. Now write to cache only (no send), still need to implement dispatch on change. Edouard Tisserant <edouard.tisserant@gmail.com> parents: 3007 diff changeset	32	when "not(@type)"
15e2df3e5610 SVGHMI: Intermediate state while implementing local HMI variables. Now write to cache only (no send), still need to implement dispatch on change. Edouard Tisserant <edouard.tisserant@gmail.com> parents: 3007 diff changeset	33	error > Widget «$widget/@type» id="«$eltid»" : No match for path "«@value»" in HMI tree
15e2df3e5610 SVGHMI: Intermediate state while implementing local HMI variables. Now write to cache only (no send), still need to implement dispatch on change. Edouard Tisserant <edouard.tisserant@gmail.com> parents: 3007 diff changeset	34	when "@type = 'PAGE_LOCAL'"
15e2df3e5610 SVGHMI: Intermediate state while implementing local HMI variables. Now write to cache only (no send), still need to implement dispatch on change. Edouard Tisserant <edouard.tisserant@gmail.com> parents: 3007 diff changeset	35	> "«substring(1,@value)»"`if "position()!=last()" > ,`
15e2df3e5610 SVGHMI: Intermediate state while implementing local HMI variables. Now write to cache only (no send), still need to implement dispatch on change. Edouard Tisserant <edouard.tisserant@gmail.com> parents: 3007 diff changeset	36	when "@type = 'HMI_LOCAL'"
15e2df3e5610 SVGHMI: Intermediate state while implementing local HMI variables. Now write to cache only (no send), still need to implement dispatch on change. Edouard Tisserant <edouard.tisserant@gmail.com> parents: 3007 diff changeset	37	> hmi_local_index("«@value»")`if "position()!=last()" > ,`
15e2df3e5610 SVGHMI: Intermediate state while implementing local HMI variables. Now write to cache only (no send), still need to implement dispatch on change. Edouard Tisserant <edouard.tisserant@gmail.com> parents: 3007 diff changeset	38	}
2881 3bb49f93d48c SVGHMI: added widget_common.ysl2 Edouard Tisserant parents: 2880 diff changeset	39	}
3bb49f93d48c SVGHMI: added widget_common.ysl2 Edouard Tisserant parents: 2880 diff changeset	40	otherwise {
2950 1e53d8b60ee9 SVGHMI: Parameters common to all widget constructors now passed as ordered parameters. Edouard Tisserant <edouard.tisserant@gmail.com> parents: 2949 diff changeset	41	> «@index»`if "position()!=last()" > ,`
2792 0c0d3895b036 SVGHMI: moved/fixed some templates, avoided namespace problems, added parsing of HMI:* inkscape labels Edouard Tisserant parents: 2791 diff changeset	42	}
0c0d3895b036 SVGHMI: moved/fixed some templates, avoided namespace problems, added parsing of HMI:* inkscape labels Edouard Tisserant parents: 2791 diff changeset	43	}
0c0d3895b036 SVGHMI: moved/fixed some templates, avoided namespace problems, added parsing of HMI:* inkscape labels Edouard Tisserant parents: 2791 diff changeset	44	}
2950 1e53d8b60ee9 SVGHMI: Parameters common to all widget constructors now passed as ordered parameters. Edouard Tisserant <edouard.tisserant@gmail.com> parents: 2949 diff changeset	45
1e53d8b60ee9 SVGHMI: Parameters common to all widget constructors now passed as ordered parameters. Edouard Tisserant <edouard.tisserant@gmail.com> parents: 2949 diff changeset	46	\| "«@id»": new «$widget/@type»Widget ("«@id»",[«$args»],[«$indexes»],{
2881 3bb49f93d48c SVGHMI: added widget_common.ysl2 Edouard Tisserant parents: 2880 diff changeset	47	apply "$widget", mode="widget_defs" with "hmi_element",".";
2949 e50908ddec60 SVGHMI: One class per widget type, widget objects are instances of these classes, and members are passed through constructor. This allows to keep compatible with previous widget_defs template used in most widgets. Edouard Tisserant <edouard.tisserant@gmail.com> parents: 2948 diff changeset	48	\| })`if "position()!=last()" > ,`
e50908ddec60 SVGHMI: One class per widget type, widget objects are instances of these classes, and members are passed through constructor. This allows to keep compatible with previous widget_defs template used in most widgets. Edouard Tisserant <edouard.tisserant@gmail.com> parents: 2948 diff changeset	49	}
2948 faaf677ea99d SVGHMI: Add an exslt function to collect used widget types, in order to only include necessary JS definitions in furure changes. Edouard Tisserant <edouard.tisserant@gmail.com> parents: 2941 diff changeset	50
faaf677ea99d SVGHMI: Add an exslt function to collect used widget types, in order to only include necessary JS definitions in furure changes. Edouard Tisserant <edouard.tisserant@gmail.com> parents: 2941 diff changeset	51	def "func:unique_types" {
faaf677ea99d SVGHMI: Add an exslt function to collect used widget types, in order to only include necessary JS definitions in furure changes. Edouard Tisserant <edouard.tisserant@gmail.com> parents: 2941 diff changeset	52	param "elts_with_type";
faaf677ea99d SVGHMI: Add an exslt function to collect used widget types, in order to only include necessary JS definitions in furure changes. Edouard Tisserant <edouard.tisserant@gmail.com> parents: 2941 diff changeset	53	choose {
faaf677ea99d SVGHMI: Add an exslt function to collect used widget types, in order to only include necessary JS definitions in furure changes. Edouard Tisserant <edouard.tisserant@gmail.com> parents: 2941 diff changeset	54	when "count($elts_with_type) > 1" {
faaf677ea99d SVGHMI: Add an exslt function to collect used widget types, in order to only include necessary JS definitions in furure changes. Edouard Tisserant <edouard.tisserant@gmail.com> parents: 2941 diff changeset	55	const "prior_results","func:unique_types($elts_with_type[position()!=last()])";
faaf677ea99d SVGHMI: Add an exslt function to collect used widget types, in order to only include necessary JS definitions in furure changes. Edouard Tisserant <edouard.tisserant@gmail.com> parents: 2941 diff changeset	56	choose {
faaf677ea99d SVGHMI: Add an exslt function to collect used widget types, in order to only include necessary JS definitions in furure changes. Edouard Tisserant <edouard.tisserant@gmail.com> parents: 2941 diff changeset	57	when "$elts_with_type[last()][@type = $prior_results/@type]"{
faaf677ea99d SVGHMI: Add an exslt function to collect used widget types, in order to only include necessary JS definitions in furure changes. Edouard Tisserant <edouard.tisserant@gmail.com> parents: 2941 diff changeset	58	// type already in
faaf677ea99d SVGHMI: Add an exslt function to collect used widget types, in order to only include necessary JS definitions in furure changes. Edouard Tisserant <edouard.tisserant@gmail.com> parents: 2941 diff changeset	59	result "$prior_results";
faaf677ea99d SVGHMI: Add an exslt function to collect used widget types, in order to only include necessary JS definitions in furure changes. Edouard Tisserant <edouard.tisserant@gmail.com> parents: 2941 diff changeset	60	}
faaf677ea99d SVGHMI: Add an exslt function to collect used widget types, in order to only include necessary JS definitions in furure changes. Edouard Tisserant <edouard.tisserant@gmail.com> parents: 2941 diff changeset	61	otherwise {
faaf677ea99d SVGHMI: Add an exslt function to collect used widget types, in order to only include necessary JS definitions in furure changes. Edouard Tisserant <edouard.tisserant@gmail.com> parents: 2941 diff changeset	62	result "$prior_results \| $elts_with_type[last()]";
faaf677ea99d SVGHMI: Add an exslt function to collect used widget types, in order to only include necessary JS definitions in furure changes. Edouard Tisserant <edouard.tisserant@gmail.com> parents: 2941 diff changeset	63	}
faaf677ea99d SVGHMI: Add an exslt function to collect used widget types, in order to only include necessary JS definitions in furure changes. Edouard Tisserant <edouard.tisserant@gmail.com> parents: 2941 diff changeset	64	}
faaf677ea99d SVGHMI: Add an exslt function to collect used widget types, in order to only include necessary JS definitions in furure changes. Edouard Tisserant <edouard.tisserant@gmail.com> parents: 2941 diff changeset	65	}
faaf677ea99d SVGHMI: Add an exslt function to collect used widget types, in order to only include necessary JS definitions in furure changes. Edouard Tisserant <edouard.tisserant@gmail.com> parents: 2941 diff changeset	66	otherwise {
faaf677ea99d SVGHMI: Add an exslt function to collect used widget types, in order to only include necessary JS definitions in furure changes. Edouard Tisserant <edouard.tisserant@gmail.com> parents: 2941 diff changeset	67	result "$elts_with_type";
faaf677ea99d SVGHMI: Add an exslt function to collect used widget types, in order to only include necessary JS definitions in furure changes. Edouard Tisserant <edouard.tisserant@gmail.com> parents: 2941 diff changeset	68	}
faaf677ea99d SVGHMI: Add an exslt function to collect used widget types, in order to only include necessary JS definitions in furure changes. Edouard Tisserant <edouard.tisserant@gmail.com> parents: 2941 diff changeset	69	}
faaf677ea99d SVGHMI: Add an exslt function to collect used widget types, in order to only include necessary JS definitions in furure changes. Edouard Tisserant <edouard.tisserant@gmail.com> parents: 2941 diff changeset	70	}
faaf677ea99d SVGHMI: Add an exslt function to collect used widget types, in order to only include necessary JS definitions in furure changes. Edouard Tisserant <edouard.tisserant@gmail.com> parents: 2941 diff changeset	71
3017 15e2df3e5610 SVGHMI: Intermediate state while implementing local HMI variables. Now write to cache only (no send), still need to implement dispatch on change. Edouard Tisserant <edouard.tisserant@gmail.com> parents: 3007 diff changeset	72	emit "preamble:local-variable-indexes" {
15e2df3e5610 SVGHMI: Intermediate state while implementing local HMI variables. Now write to cache only (no send), still need to implement dispatch on change. Edouard Tisserant <edouard.tisserant@gmail.com> parents: 3007 diff changeset	73	\|\|
15e2df3e5610 SVGHMI: Intermediate state while implementing local HMI variables. Now write to cache only (no send), still need to implement dispatch on change. Edouard Tisserant <edouard.tisserant@gmail.com> parents: 3007 diff changeset	74	let hmi_locals = {};
15e2df3e5610 SVGHMI: Intermediate state while implementing local HMI variables. Now write to cache only (no send), still need to implement dispatch on change. Edouard Tisserant <edouard.tisserant@gmail.com> parents: 3007 diff changeset	75	var last_remote_index = hmitree_types.length - 1;
15e2df3e5610 SVGHMI: Intermediate state while implementing local HMI variables. Now write to cache only (no send), still need to implement dispatch on change. Edouard Tisserant <edouard.tisserant@gmail.com> parents: 3007 diff changeset	76	var next_available_index = hmitree_types.length;
15e2df3e5610 SVGHMI: Intermediate state while implementing local HMI variables. Now write to cache only (no send), still need to implement dispatch on change. Edouard Tisserant <edouard.tisserant@gmail.com> parents: 3007 diff changeset	77
15e2df3e5610 SVGHMI: Intermediate state while implementing local HMI variables. Now write to cache only (no send), still need to implement dispatch on change. Edouard Tisserant <edouard.tisserant@gmail.com> parents: 3007 diff changeset	78	function page_local_index(varname, pagename){
15e2df3e5610 SVGHMI: Intermediate state while implementing local HMI variables. Now write to cache only (no send), still need to implement dispatch on change. Edouard Tisserant <edouard.tisserant@gmail.com> parents: 3007 diff changeset	79	let pagevars = hmi_locals[pagename];
15e2df3e5610 SVGHMI: Intermediate state while implementing local HMI variables. Now write to cache only (no send), still need to implement dispatch on change. Edouard Tisserant <edouard.tisserant@gmail.com> parents: 3007 diff changeset	80	if(pagevars == undefined){
15e2df3e5610 SVGHMI: Intermediate state while implementing local HMI variables. Now write to cache only (no send), still need to implement dispatch on change. Edouard Tisserant <edouard.tisserant@gmail.com> parents: 3007 diff changeset	81	let new_index = next_available_index++;
15e2df3e5610 SVGHMI: Intermediate state while implementing local HMI variables. Now write to cache only (no send), still need to implement dispatch on change. Edouard Tisserant <edouard.tisserant@gmail.com> parents: 3007 diff changeset	82	hmi_locals[pagename] = {varname:new_index}
15e2df3e5610 SVGHMI: Intermediate state while implementing local HMI variables. Now write to cache only (no send), still need to implement dispatch on change. Edouard Tisserant <edouard.tisserant@gmail.com> parents: 3007 diff changeset	83	return new_index;
15e2df3e5610 SVGHMI: Intermediate state while implementing local HMI variables. Now write to cache only (no send), still need to implement dispatch on change. Edouard Tisserant <edouard.tisserant@gmail.com> parents: 3007 diff changeset	84	} else {
15e2df3e5610 SVGHMI: Intermediate state while implementing local HMI variables. Now write to cache only (no send), still need to implement dispatch on change. Edouard Tisserant <edouard.tisserant@gmail.com> parents: 3007 diff changeset	85	let result = pagevars[varname];
15e2df3e5610 SVGHMI: Intermediate state while implementing local HMI variables. Now write to cache only (no send), still need to implement dispatch on change. Edouard Tisserant <edouard.tisserant@gmail.com> parents: 3007 diff changeset	86	if(result==undefined){
15e2df3e5610 SVGHMI: Intermediate state while implementing local HMI variables. Now write to cache only (no send), still need to implement dispatch on change. Edouard Tisserant <edouard.tisserant@gmail.com> parents: 3007 diff changeset	87	let new_index = next_available_index++;
15e2df3e5610 SVGHMI: Intermediate state while implementing local HMI variables. Now write to cache only (no send), still need to implement dispatch on change. Edouard Tisserant <edouard.tisserant@gmail.com> parents: 3007 diff changeset	88	pagevars[varname] = new_index;
15e2df3e5610 SVGHMI: Intermediate state while implementing local HMI variables. Now write to cache only (no send), still need to implement dispatch on change. Edouard Tisserant <edouard.tisserant@gmail.com> parents: 3007 diff changeset	89	return new_index;
15e2df3e5610 SVGHMI: Intermediate state while implementing local HMI variables. Now write to cache only (no send), still need to implement dispatch on change. Edouard Tisserant <edouard.tisserant@gmail.com> parents: 3007 diff changeset	90	}
15e2df3e5610 SVGHMI: Intermediate state while implementing local HMI variables. Now write to cache only (no send), still need to implement dispatch on change. Edouard Tisserant <edouard.tisserant@gmail.com> parents: 3007 diff changeset	91	return result;
15e2df3e5610 SVGHMI: Intermediate state while implementing local HMI variables. Now write to cache only (no send), still need to implement dispatch on change. Edouard Tisserant <edouard.tisserant@gmail.com> parents: 3007 diff changeset	92	}
15e2df3e5610 SVGHMI: Intermediate state while implementing local HMI variables. Now write to cache only (no send), still need to implement dispatch on change. Edouard Tisserant <edouard.tisserant@gmail.com> parents: 3007 diff changeset	93	}
15e2df3e5610 SVGHMI: Intermediate state while implementing local HMI variables. Now write to cache only (no send), still need to implement dispatch on change. Edouard Tisserant <edouard.tisserant@gmail.com> parents: 3007 diff changeset	94
15e2df3e5610 SVGHMI: Intermediate state while implementing local HMI variables. Now write to cache only (no send), still need to implement dispatch on change. Edouard Tisserant <edouard.tisserant@gmail.com> parents: 3007 diff changeset	95	function hmi_local_index(varname){
15e2df3e5610 SVGHMI: Intermediate state while implementing local HMI variables. Now write to cache only (no send), still need to implement dispatch on change. Edouard Tisserant <edouard.tisserant@gmail.com> parents: 3007 diff changeset	96	return page_local_index(varname, "HMI_LOCAL");
15e2df3e5610 SVGHMI: Intermediate state while implementing local HMI variables. Now write to cache only (no send), still need to implement dispatch on change. Edouard Tisserant <edouard.tisserant@gmail.com> parents: 3007 diff changeset	97	}
15e2df3e5610 SVGHMI: Intermediate state while implementing local HMI variables. Now write to cache only (no send), still need to implement dispatch on change. Edouard Tisserant <edouard.tisserant@gmail.com> parents: 3007 diff changeset	98	\|\|
15e2df3e5610 SVGHMI: Intermediate state while implementing local HMI variables. Now write to cache only (no send), still need to implement dispatch on change. Edouard Tisserant <edouard.tisserant@gmail.com> parents: 3007 diff changeset	99	}
15e2df3e5610 SVGHMI: Intermediate state while implementing local HMI variables. Now write to cache only (no send), still need to implement dispatch on change. Edouard Tisserant <edouard.tisserant@gmail.com> parents: 3007 diff changeset	100
2949 e50908ddec60 SVGHMI: One class per widget type, widget objects are instances of these classes, and members are passed through constructor. This allows to keep compatible with previous widget_defs template used in most widgets. Edouard Tisserant <edouard.tisserant@gmail.com> parents: 2948 diff changeset	101	emit "preamble:widget-base-class" {
3017 15e2df3e5610 SVGHMI: Intermediate state while implementing local HMI variables. Now write to cache only (no send), still need to implement dispatch on change. Edouard Tisserant <edouard.tisserant@gmail.com> parents: 3007 diff changeset	102	\|\|
2949 e50908ddec60 SVGHMI: One class per widget type, widget objects are instances of these classes, and members are passed through constructor. This allows to keep compatible with previous widget_defs template used in most widgets. Edouard Tisserant <edouard.tisserant@gmail.com> parents: 2948 diff changeset	103	class Widget {
2963 113e2f2e324d SVGHMI: more Widget properties declared ES6 style. Edouard Tisserant <edouard.tisserant@gmail.com> parents: 2958 diff changeset	104	offset = 0;
113e2f2e324d SVGHMI: more Widget properties declared ES6 style. Edouard Tisserant <edouard.tisserant@gmail.com> parents: 2958 diff changeset	105	frequency = 10; /* FIXME arbitrary default max freq. Obtain from config ? */
2980 2a21d6060d64 SVGHMI: add "unsubscribable" property to widgets in order to generalize what already happens for jump buttons. Edouard Tisserant parents: 2963 diff changeset	106	unsubscribable = false;
2950 1e53d8b60ee9 SVGHMI: Parameters common to all widget constructors now passed as ordered parameters. Edouard Tisserant <edouard.tisserant@gmail.com> parents: 2949 diff changeset	107	constructor(elt_id,args,indexes,members){
2958 895d3f2b1786 SVGHMI: Back button updated to class style Edouard Tisserant <edouard.tisserant@gmail.com> parents: 2955 diff changeset	108	this.element_id = elt_id;
2950 1e53d8b60ee9 SVGHMI: Parameters common to all widget constructors now passed as ordered parameters. Edouard Tisserant <edouard.tisserant@gmail.com> parents: 2949 diff changeset	109	this.element = id(elt_id);
1e53d8b60ee9 SVGHMI: Parameters common to all widget constructors now passed as ordered parameters. Edouard Tisserant <edouard.tisserant@gmail.com> parents: 2949 diff changeset	110	this.args = args;
1e53d8b60ee9 SVGHMI: Parameters common to all widget constructors now passed as ordered parameters. Edouard Tisserant <edouard.tisserant@gmail.com> parents: 2949 diff changeset	111	this.indexes = indexes;
2949 e50908ddec60 SVGHMI: One class per widget type, widget objects are instances of these classes, and members are passed through constructor. This allows to keep compatible with previous widget_defs template used in most widgets. Edouard Tisserant <edouard.tisserant@gmail.com> parents: 2948 diff changeset	112	Object.keys(members).forEach(prop => this[prop]=members[prop]);
e50908ddec60 SVGHMI: One class per widget type, widget objects are instances of these classes, and members are passed through constructor. This allows to keep compatible with previous widget_defs template used in most widgets. Edouard Tisserant <edouard.tisserant@gmail.com> parents: 2948 diff changeset	113	}
2958 895d3f2b1786 SVGHMI: Back button updated to class style Edouard Tisserant <edouard.tisserant@gmail.com> parents: 2955 diff changeset	114
2951 506fe9272660 SVGHMI: Widget's specific sub/unsub traits are now wxpressed in widget's class. Edouard Tisserant <edouard.tisserant@gmail.com> parents: 2950 diff changeset	115	unsub(){
506fe9272660 SVGHMI: Widget's specific sub/unsub traits are now wxpressed in widget's class. Edouard Tisserant <edouard.tisserant@gmail.com> parents: 2950 diff changeset	116	/* remove subsribers */
3005 ff9ae4f4e3be SVGHMI: widgets are not anymore binary relative or absolute, but have a "relativeness". Edouard Tisserant <edouard.tisserant@gmail.com> parents: 3004 diff changeset	117	if(!this.unsubscribable)
ff9ae4f4e3be SVGHMI: widgets are not anymore binary relative or absolute, but have a "relativeness". Edouard Tisserant <edouard.tisserant@gmail.com> parents: 3004 diff changeset	118	for(let i = 0; i < this.indexes.length; i++) {
ff9ae4f4e3be SVGHMI: widgets are not anymore binary relative or absolute, but have a "relativeness". Edouard Tisserant <edouard.tisserant@gmail.com> parents: 3004 diff changeset	119	let index = this.indexes[i];
ff9ae4f4e3be SVGHMI: widgets are not anymore binary relative or absolute, but have a "relativeness". Edouard Tisserant <edouard.tisserant@gmail.com> parents: 3004 diff changeset	120	if(this.relativeness[i])
ff9ae4f4e3be SVGHMI: widgets are not anymore binary relative or absolute, but have a "relativeness". Edouard Tisserant <edouard.tisserant@gmail.com> parents: 3004 diff changeset	121	index += this.offset;
ff9ae4f4e3be SVGHMI: widgets are not anymore binary relative or absolute, but have a "relativeness". Edouard Tisserant <edouard.tisserant@gmail.com> parents: 3004 diff changeset	122	subscribers[index].delete(this);
ff9ae4f4e3be SVGHMI: widgets are not anymore binary relative or absolute, but have a "relativeness". Edouard Tisserant <edouard.tisserant@gmail.com> parents: 3004 diff changeset	123	}
2951 506fe9272660 SVGHMI: Widget's specific sub/unsub traits are now wxpressed in widget's class. Edouard Tisserant <edouard.tisserant@gmail.com> parents: 2950 diff changeset	124	this.offset = 0;
3005 ff9ae4f4e3be SVGHMI: widgets are not anymore binary relative or absolute, but have a "relativeness". Edouard Tisserant <edouard.tisserant@gmail.com> parents: 3004 diff changeset	125	this.relativeness = undefined;
ff9ae4f4e3be SVGHMI: widgets are not anymore binary relative or absolute, but have a "relativeness". Edouard Tisserant <edouard.tisserant@gmail.com> parents: 3004 diff changeset	126	}
ff9ae4f4e3be SVGHMI: widgets are not anymore binary relative or absolute, but have a "relativeness". Edouard Tisserant <edouard.tisserant@gmail.com> parents: 3004 diff changeset	127
3017 15e2df3e5610 SVGHMI: Intermediate state while implementing local HMI variables. Now write to cache only (no send), still need to implement dispatch on change. Edouard Tisserant <edouard.tisserant@gmail.com> parents: 3007 diff changeset	128	sub(new_offset=0, relativeness, container_id){
2951 506fe9272660 SVGHMI: Widget's specific sub/unsub traits are now wxpressed in widget's class. Edouard Tisserant <edouard.tisserant@gmail.com> parents: 2950 diff changeset	129	this.offset = new_offset;
3005 ff9ae4f4e3be SVGHMI: widgets are not anymore binary relative or absolute, but have a "relativeness". Edouard Tisserant <edouard.tisserant@gmail.com> parents: 3004 diff changeset	130	this.relativeness = relativeness;
3017 15e2df3e5610 SVGHMI: Intermediate state while implementing local HMI variables. Now write to cache only (no send), still need to implement dispatch on change. Edouard Tisserant <edouard.tisserant@gmail.com> parents: 3007 diff changeset	131	this.container_id = container_id ;
2951 506fe9272660 SVGHMI: Widget's specific sub/unsub traits are now wxpressed in widget's class. Edouard Tisserant <edouard.tisserant@gmail.com> parents: 2950 diff changeset	132	/* add this's subsribers */
3005 ff9ae4f4e3be SVGHMI: widgets are not anymore binary relative or absolute, but have a "relativeness". Edouard Tisserant <edouard.tisserant@gmail.com> parents: 3004 diff changeset	133	if(!this.unsubscribable)
ff9ae4f4e3be SVGHMI: widgets are not anymore binary relative or absolute, but have a "relativeness". Edouard Tisserant <edouard.tisserant@gmail.com> parents: 3004 diff changeset	134	for(let i = 0; i < this.indexes.length; i++) {
3017 15e2df3e5610 SVGHMI: Intermediate state while implementing local HMI variables. Now write to cache only (no send), still need to implement dispatch on change. Edouard Tisserant <edouard.tisserant@gmail.com> parents: 3007 diff changeset	135	let index = this.get_variable_index(i);
15e2df3e5610 SVGHMI: Intermediate state while implementing local HMI variables. Now write to cache only (no send), still need to implement dispatch on change. Edouard Tisserant <edouard.tisserant@gmail.com> parents: 3007 diff changeset	136	if(index > last_remote_index) return;
3005 ff9ae4f4e3be SVGHMI: widgets are not anymore binary relative or absolute, but have a "relativeness". Edouard Tisserant <edouard.tisserant@gmail.com> parents: 3004 diff changeset	137	subscribers[index].add(this);
ff9ae4f4e3be SVGHMI: widgets are not anymore binary relative or absolute, but have a "relativeness". Edouard Tisserant <edouard.tisserant@gmail.com> parents: 3004 diff changeset	138	}
2951 506fe9272660 SVGHMI: Widget's specific sub/unsub traits are now wxpressed in widget's class. Edouard Tisserant <edouard.tisserant@gmail.com> parents: 2950 diff changeset	139	need_cache_apply.push(this);
506fe9272660 SVGHMI: Widget's specific sub/unsub traits are now wxpressed in widget's class. Edouard Tisserant <edouard.tisserant@gmail.com> parents: 2950 diff changeset	140	}
506fe9272660 SVGHMI: Widget's specific sub/unsub traits are now wxpressed in widget's class. Edouard Tisserant <edouard.tisserant@gmail.com> parents: 2950 diff changeset	141
506fe9272660 SVGHMI: Widget's specific sub/unsub traits are now wxpressed in widget's class. Edouard Tisserant <edouard.tisserant@gmail.com> parents: 2950 diff changeset	142	apply_cache() {
3017 15e2df3e5610 SVGHMI: Intermediate state while implementing local HMI variables. Now write to cache only (no send), still need to implement dispatch on change. Edouard Tisserant <edouard.tisserant@gmail.com> parents: 3007 diff changeset	143	if(!this.unsubscribable) for(let i = 0; i < this.indexes.length; i++) {
2951 506fe9272660 SVGHMI: Widget's specific sub/unsub traits are now wxpressed in widget's class. Edouard Tisserant <edouard.tisserant@gmail.com> parents: 2950 diff changeset	144	/* dispatch current cache in newly opened page widgets */
3017 15e2df3e5610 SVGHMI: Intermediate state while implementing local HMI variables. Now write to cache only (no send), still need to implement dispatch on change. Edouard Tisserant <edouard.tisserant@gmail.com> parents: 3007 diff changeset	145	let realindex = this.get_variable_index(i);
2951 506fe9272660 SVGHMI: Widget's specific sub/unsub traits are now wxpressed in widget's class. Edouard Tisserant <edouard.tisserant@gmail.com> parents: 2950 diff changeset	146	let cached_val = cache[realindex];
506fe9272660 SVGHMI: Widget's specific sub/unsub traits are now wxpressed in widget's class. Edouard Tisserant <edouard.tisserant@gmail.com> parents: 2950 diff changeset	147	if(cached_val != undefined)
3006 bbffdefd2eed SVGHMI: JS refactoring continued : "dispatch_value_to_widget" becomes widget class member "new_hmi_value" (was also broken by previous relativeness commit) Edouard Tisserant <edouard.tisserant@gmail.com> parents: 3005 diff changeset	148	this.new_hmi_value(realindex, cached_val, cached_val);
2951 506fe9272660 SVGHMI: Widget's specific sub/unsub traits are now wxpressed in widget's class. Edouard Tisserant <edouard.tisserant@gmail.com> parents: 2950 diff changeset	149	}
506fe9272660 SVGHMI: Widget's specific sub/unsub traits are now wxpressed in widget's class. Edouard Tisserant <edouard.tisserant@gmail.com> parents: 2950 diff changeset	150	}
506fe9272660 SVGHMI: Widget's specific sub/unsub traits are now wxpressed in widget's class. Edouard Tisserant <edouard.tisserant@gmail.com> parents: 2950 diff changeset	151
3017 15e2df3e5610 SVGHMI: Intermediate state while implementing local HMI variables. Now write to cache only (no send), still need to implement dispatch on change. Edouard Tisserant <edouard.tisserant@gmail.com> parents: 3007 diff changeset	152	get_variable_index(varnum) {
15e2df3e5610 SVGHMI: Intermediate state while implementing local HMI variables. Now write to cache only (no send), still need to implement dispatch on change. Edouard Tisserant <edouard.tisserant@gmail.com> parents: 3007 diff changeset	153	let index = this.indexes[varnum];
15e2df3e5610 SVGHMI: Intermediate state while implementing local HMI variables. Now write to cache only (no send), still need to implement dispatch on change. Edouard Tisserant <edouard.tisserant@gmail.com> parents: 3007 diff changeset	154	if(typeof(index) == "string"){
15e2df3e5610 SVGHMI: Intermediate state while implementing local HMI variables. Now write to cache only (no send), still need to implement dispatch on change. Edouard Tisserant <edouard.tisserant@gmail.com> parents: 3007 diff changeset	155	let page = this.relativeness[varnum];
15e2df3e5610 SVGHMI: Intermediate state while implementing local HMI variables. Now write to cache only (no send), still need to implement dispatch on change. Edouard Tisserant <edouard.tisserant@gmail.com> parents: 3007 diff changeset	156	index = page_local_index(index, this.container_id);
15e2df3e5610 SVGHMI: Intermediate state while implementing local HMI variables. Now write to cache only (no send), still need to implement dispatch on change. Edouard Tisserant <edouard.tisserant@gmail.com> parents: 3007 diff changeset	157	} else {
15e2df3e5610 SVGHMI: Intermediate state while implementing local HMI variables. Now write to cache only (no send), still need to implement dispatch on change. Edouard Tisserant <edouard.tisserant@gmail.com> parents: 3007 diff changeset	158	if(this.relativeness[varnum]){
15e2df3e5610 SVGHMI: Intermediate state while implementing local HMI variables. Now write to cache only (no send), still need to implement dispatch on change. Edouard Tisserant <edouard.tisserant@gmail.com> parents: 3007 diff changeset	159	index += this.offset;
15e2df3e5610 SVGHMI: Intermediate state while implementing local HMI variables. Now write to cache only (no send), still need to implement dispatch on change. Edouard Tisserant <edouard.tisserant@gmail.com> parents: 3007 diff changeset	160	}
15e2df3e5610 SVGHMI: Intermediate state while implementing local HMI variables. Now write to cache only (no send), still need to implement dispatch on change. Edouard Tisserant <edouard.tisserant@gmail.com> parents: 3007 diff changeset	161	}
15e2df3e5610 SVGHMI: Intermediate state while implementing local HMI variables. Now write to cache only (no send), still need to implement dispatch on change. Edouard Tisserant <edouard.tisserant@gmail.com> parents: 3007 diff changeset	162	return index;
3001 003fd80ff0b8 SVGHMI: add get_idx(index) to widget objects to factorize a bit code repeated accross widgets. To be continued. Edouard Tisserant <edouard.tisserant@gmail.com> parents: 2997 diff changeset	163	}
3004 705e34c6fe93 SVGHMI: More JS code refactoring : change_hmi_value and apply_hmi_value now methods of widget class. Edouard Tisserant <edouard.tisserant@gmail.com> parents: 3001 diff changeset	164	change_hmi_value(index,opstr) {
3017 15e2df3e5610 SVGHMI: Intermediate state while implementing local HMI variables. Now write to cache only (no send), still need to implement dispatch on change. Edouard Tisserant <edouard.tisserant@gmail.com> parents: 3007 diff changeset	165	return change_hmi_value(this.get_variable_index(index), opstr);
3004 705e34c6fe93 SVGHMI: More JS code refactoring : change_hmi_value and apply_hmi_value now methods of widget class. Edouard Tisserant <edouard.tisserant@gmail.com> parents: 3001 diff changeset	166	}
705e34c6fe93 SVGHMI: More JS code refactoring : change_hmi_value and apply_hmi_value now methods of widget class. Edouard Tisserant <edouard.tisserant@gmail.com> parents: 3001 diff changeset	167
705e34c6fe93 SVGHMI: More JS code refactoring : change_hmi_value and apply_hmi_value now methods of widget class. Edouard Tisserant <edouard.tisserant@gmail.com> parents: 3001 diff changeset	168	apply_hmi_value(index, new_val) {
3017 15e2df3e5610 SVGHMI: Intermediate state while implementing local HMI variables. Now write to cache only (no send), still need to implement dispatch on change. Edouard Tisserant <edouard.tisserant@gmail.com> parents: 3007 diff changeset	169	return apply_hmi_value(this.get_variable_index(0), new_val);
3004 705e34c6fe93 SVGHMI: More JS code refactoring : change_hmi_value and apply_hmi_value now methods of widget class. Edouard Tisserant <edouard.tisserant@gmail.com> parents: 3001 diff changeset	170	}
3006 bbffdefd2eed SVGHMI: JS refactoring continued : "dispatch_value_to_widget" becomes widget class member "new_hmi_value" (was also broken by previous relativeness commit) Edouard Tisserant <edouard.tisserant@gmail.com> parents: 3005 diff changeset	171
bbffdefd2eed SVGHMI: JS refactoring continued : "dispatch_value_to_widget" becomes widget class member "new_hmi_value" (was also broken by previous relativeness commit) Edouard Tisserant <edouard.tisserant@gmail.com> parents: 3005 diff changeset	172	new_hmi_value(index, value, oldval) {
bbffdefd2eed SVGHMI: JS refactoring continued : "dispatch_value_to_widget" becomes widget class member "new_hmi_value" (was also broken by previous relativeness commit) Edouard Tisserant <edouard.tisserant@gmail.com> parents: 3005 diff changeset	173	try {
bbffdefd2eed SVGHMI: JS refactoring continued : "dispatch_value_to_widget" becomes widget class member "new_hmi_value" (was also broken by previous relativeness commit) Edouard Tisserant <edouard.tisserant@gmail.com> parents: 3005 diff changeset	174	// TODO avoid searching, store index at sub()
bbffdefd2eed SVGHMI: JS refactoring continued : "dispatch_value_to_widget" becomes widget class member "new_hmi_value" (was also broken by previous relativeness commit) Edouard Tisserant <edouard.tisserant@gmail.com> parents: 3005 diff changeset	175	for(let i = 0; i < this.indexes.length; i++) {
3017 15e2df3e5610 SVGHMI: Intermediate state while implementing local HMI variables. Now write to cache only (no send), still need to implement dispatch on change. Edouard Tisserant <edouard.tisserant@gmail.com> parents: 3007 diff changeset	176	let refindex = this.get_variable_index(i);
3006 bbffdefd2eed SVGHMI: JS refactoring continued : "dispatch_value_to_widget" becomes widget class member "new_hmi_value" (was also broken by previous relativeness commit) Edouard Tisserant <edouard.tisserant@gmail.com> parents: 3005 diff changeset	177
bbffdefd2eed SVGHMI: JS refactoring continued : "dispatch_value_to_widget" becomes widget class member "new_hmi_value" (was also broken by previous relativeness commit) Edouard Tisserant <edouard.tisserant@gmail.com> parents: 3005 diff changeset	178	if(index == refindex) {
bbffdefd2eed SVGHMI: JS refactoring continued : "dispatch_value_to_widget" becomes widget class member "new_hmi_value" (was also broken by previous relativeness commit) Edouard Tisserant <edouard.tisserant@gmail.com> parents: 3005 diff changeset	179	let d = this.dispatch;
bbffdefd2eed SVGHMI: JS refactoring continued : "dispatch_value_to_widget" becomes widget class member "new_hmi_value" (was also broken by previous relativeness commit) Edouard Tisserant <edouard.tisserant@gmail.com> parents: 3005 diff changeset	180	if(typeof(d) == "function"){
bbffdefd2eed SVGHMI: JS refactoring continued : "dispatch_value_to_widget" becomes widget class member "new_hmi_value" (was also broken by previous relativeness commit) Edouard Tisserant <edouard.tisserant@gmail.com> parents: 3005 diff changeset	181	d.call(this, value, oldval, i);
bbffdefd2eed SVGHMI: JS refactoring continued : "dispatch_value_to_widget" becomes widget class member "new_hmi_value" (was also broken by previous relativeness commit) Edouard Tisserant <edouard.tisserant@gmail.com> parents: 3005 diff changeset	182	}
bbffdefd2eed SVGHMI: JS refactoring continued : "dispatch_value_to_widget" becomes widget class member "new_hmi_value" (was also broken by previous relativeness commit) Edouard Tisserant <edouard.tisserant@gmail.com> parents: 3005 diff changeset	183	else if(typeof(d) == "object"){
bbffdefd2eed SVGHMI: JS refactoring continued : "dispatch_value_to_widget" becomes widget class member "new_hmi_value" (was also broken by previous relativeness commit) Edouard Tisserant <edouard.tisserant@gmail.com> parents: 3005 diff changeset	184	d[i].call(this, value, oldval);
bbffdefd2eed SVGHMI: JS refactoring continued : "dispatch_value_to_widget" becomes widget class member "new_hmi_value" (was also broken by previous relativeness commit) Edouard Tisserant <edouard.tisserant@gmail.com> parents: 3005 diff changeset	185	}
bbffdefd2eed SVGHMI: JS refactoring continued : "dispatch_value_to_widget" becomes widget class member "new_hmi_value" (was also broken by previous relativeness commit) Edouard Tisserant <edouard.tisserant@gmail.com> parents: 3005 diff changeset	186	/* else dispatch_0, ..., dispatch_n ? */
bbffdefd2eed SVGHMI: JS refactoring continued : "dispatch_value_to_widget" becomes widget class member "new_hmi_value" (was also broken by previous relativeness commit) Edouard Tisserant <edouard.tisserant@gmail.com> parents: 3005 diff changeset	187	/*else {
bbffdefd2eed SVGHMI: JS refactoring continued : "dispatch_value_to_widget" becomes widget class member "new_hmi_value" (was also broken by previous relativeness commit) Edouard Tisserant <edouard.tisserant@gmail.com> parents: 3005 diff changeset	188	throw new Error("Dunno how to dispatch to widget at index = " + index);
bbffdefd2eed SVGHMI: JS refactoring continued : "dispatch_value_to_widget" becomes widget class member "new_hmi_value" (was also broken by previous relativeness commit) Edouard Tisserant <edouard.tisserant@gmail.com> parents: 3005 diff changeset	189	}*/
bbffdefd2eed SVGHMI: JS refactoring continued : "dispatch_value_to_widget" becomes widget class member "new_hmi_value" (was also broken by previous relativeness commit) Edouard Tisserant <edouard.tisserant@gmail.com> parents: 3005 diff changeset	190	break;
bbffdefd2eed SVGHMI: JS refactoring continued : "dispatch_value_to_widget" becomes widget class member "new_hmi_value" (was also broken by previous relativeness commit) Edouard Tisserant <edouard.tisserant@gmail.com> parents: 3005 diff changeset	191	}
bbffdefd2eed SVGHMI: JS refactoring continued : "dispatch_value_to_widget" becomes widget class member "new_hmi_value" (was also broken by previous relativeness commit) Edouard Tisserant <edouard.tisserant@gmail.com> parents: 3005 diff changeset	192	}
bbffdefd2eed SVGHMI: JS refactoring continued : "dispatch_value_to_widget" becomes widget class member "new_hmi_value" (was also broken by previous relativeness commit) Edouard Tisserant <edouard.tisserant@gmail.com> parents: 3005 diff changeset	193	} catch(err) {
bbffdefd2eed SVGHMI: JS refactoring continued : "dispatch_value_to_widget" becomes widget class member "new_hmi_value" (was also broken by previous relativeness commit) Edouard Tisserant <edouard.tisserant@gmail.com> parents: 3005 diff changeset	194	console.log(err);
bbffdefd2eed SVGHMI: JS refactoring continued : "dispatch_value_to_widget" becomes widget class member "new_hmi_value" (was also broken by previous relativeness commit) Edouard Tisserant <edouard.tisserant@gmail.com> parents: 3005 diff changeset	195	}
bbffdefd2eed SVGHMI: JS refactoring continued : "dispatch_value_to_widget" becomes widget class member "new_hmi_value" (was also broken by previous relativeness commit) Edouard Tisserant <edouard.tisserant@gmail.com> parents: 3005 diff changeset	196	}
2949 e50908ddec60 SVGHMI: One class per widget type, widget objects are instances of these classes, and members are passed through constructor. This allows to keep compatible with previous widget_defs template used in most widgets. Edouard Tisserant <edouard.tisserant@gmail.com> parents: 2948 diff changeset	197	}
e50908ddec60 SVGHMI: One class per widget type, widget objects are instances of these classes, and members are passed through constructor. This allows to keep compatible with previous widget_defs template used in most widgets. Edouard Tisserant <edouard.tisserant@gmail.com> parents: 2948 diff changeset	198	\|\|
e50908ddec60 SVGHMI: One class per widget type, widget objects are instances of these classes, and members are passed through constructor. This allows to keep compatible with previous widget_defs template used in most widgets. Edouard Tisserant <edouard.tisserant@gmail.com> parents: 2948 diff changeset	199	}
e50908ddec60 SVGHMI: One class per widget type, widget objects are instances of these classes, and members are passed through constructor. This allows to keep compatible with previous widget_defs template used in most widgets. Edouard Tisserant <edouard.tisserant@gmail.com> parents: 2948 diff changeset	200
3007 360300a8b995 SVGHMI : have to move some JS declarations from "preamble" to "declarations" and others from "declarations" to "definitions" section to make room for JS libraries that would be used by widget classes. Edouard Tisserant <edouard.tisserant@gmail.com> parents: 3006 diff changeset	201	emit "declarations:hmi-classes" {
2948 faaf677ea99d SVGHMI: Add an exslt function to collect used widget types, in order to only include necessary JS definitions in furure changes. Edouard Tisserant <edouard.tisserant@gmail.com> parents: 2941 diff changeset	202	const "used_widget_types", "func:unique_types($parsed_widgets/widget)";
faaf677ea99d SVGHMI: Add an exslt function to collect used widget types, in order to only include necessary JS definitions in furure changes. Edouard Tisserant <edouard.tisserant@gmail.com> parents: 2941 diff changeset	203	apply "$used_widget_types", mode="widget_class";
2881 3bb49f93d48c SVGHMI: added widget_common.ysl2 Edouard Tisserant parents: 2880 diff changeset	204	}
2810 63b9a37b73c7 SVGHMI: various insignificant code moves, commenting and typos fixes. Edouard Tisserant parents: 2808 diff changeset	205
2949 e50908ddec60 SVGHMI: One class per widget type, widget objects are instances of these classes, and members are passed through constructor. This allows to keep compatible with previous widget_defs template used in most widgets. Edouard Tisserant <edouard.tisserant@gmail.com> parents: 2948 diff changeset	206	template "widget", mode="widget_class"
e50908ddec60 SVGHMI: One class per widget type, widget objects are instances of these classes, and members are passed through constructor. This allows to keep compatible with previous widget_defs template used in most widgets. Edouard Tisserant <edouard.tisserant@gmail.com> parents: 2948 diff changeset	207	\|\|
e50908ddec60 SVGHMI: One class per widget type, widget objects are instances of these classes, and members are passed through constructor. This allows to keep compatible with previous widget_defs template used in most widgets. Edouard Tisserant <edouard.tisserant@gmail.com> parents: 2948 diff changeset	208	class «@type»Widget extends Widget{
e50908ddec60 SVGHMI: One class per widget type, widget objects are instances of these classes, and members are passed through constructor. This allows to keep compatible with previous widget_defs template used in most widgets. Edouard Tisserant <edouard.tisserant@gmail.com> parents: 2948 diff changeset	209	/* empty class, as «@type» widget didn't provide any */
e50908ddec60 SVGHMI: One class per widget type, widget objects are instances of these classes, and members are passed through constructor. This allows to keep compatible with previous widget_defs template used in most widgets. Edouard Tisserant <edouard.tisserant@gmail.com> parents: 2948 diff changeset	210	}
e50908ddec60 SVGHMI: One class per widget type, widget objects are instances of these classes, and members are passed through constructor. This allows to keep compatible with previous widget_defs template used in most widgets. Edouard Tisserant <edouard.tisserant@gmail.com> parents: 2948 diff changeset	211	\|\|
e50908ddec60 SVGHMI: One class per widget type, widget objects are instances of these classes, and members are passed through constructor. This allows to keep compatible with previous widget_defs template used in most widgets. Edouard Tisserant <edouard.tisserant@gmail.com> parents: 2948 diff changeset	212
2997 2f298089e32e SVGHMI: JsonTable now picks items from HMI:List, and update texts, all according to Json data. Still miss scrolling. Edouard Tisserant <edouard.tisserant@gmail.com> parents: 2980 diff changeset	213	const "excluded_types", "str:split('Page Lang')";
2955 64e603b84aa3 SVGHMI: Exclude non-widget HMI:* labeled elements from hmi_widget. Namely : HMI:Page HMI:Lang and HMI:List have been excluded. Edouard Tisserant <edouard.tisserant@gmail.com> parents: 2954 diff changeset	214	const "excluded_ids","$parsed_widgets/widget[not(@type = $excluded_types)]/@id";
64e603b84aa3 SVGHMI: Exclude non-widget HMI:* labeled elements from hmi_widget. Namely : HMI:Page HMI:Lang and HMI:List have been excluded. Edouard Tisserant <edouard.tisserant@gmail.com> parents: 2954 diff changeset	215
3007 360300a8b995 SVGHMI : have to move some JS declarations from "preamble" to "declarations" and others from "declarations" to "definitions" section to make room for JS libraries that would be used by widget classes. Edouard Tisserant <edouard.tisserant@gmail.com> parents: 3006 diff changeset	216	emit "declarations:hmi-elements" {
2941 ef13a4007538 SVGHMI: spread JS code from svghmi/scripts.ysl2 in other .ysl2 files, using dedicated preamble and epilogue namespaces Edouard Tisserant <edouard.tisserant@gmail.com> parents: 2937 diff changeset	217	\| var hmi_widgets = {
2955 64e603b84aa3 SVGHMI: Exclude non-widget HMI:* labeled elements from hmi_widget. Namely : HMI:Page HMI:Lang and HMI:List have been excluded. Edouard Tisserant <edouard.tisserant@gmail.com> parents: 2954 diff changeset	218	apply "$hmi_elements[@id = $excluded_ids]", mode="hmi_widgets";
2941 ef13a4007538 SVGHMI: spread JS code from svghmi/scripts.ysl2 in other .ysl2 files, using dedicated preamble and epilogue namespaces Edouard Tisserant <edouard.tisserant@gmail.com> parents: 2937 diff changeset	219	\| }
ef13a4007538 SVGHMI: spread JS code from svghmi/scripts.ysl2 in other .ysl2 files, using dedicated preamble and epilogue namespaces Edouard Tisserant <edouard.tisserant@gmail.com> parents: 2937 diff changeset	220	}
ef13a4007538 SVGHMI: spread JS code from svghmi/scripts.ysl2 in other .ysl2 files, using dedicated preamble and epilogue namespaces Edouard Tisserant <edouard.tisserant@gmail.com> parents: 2937 diff changeset	221
2881 3bb49f93d48c SVGHMI: added widget_common.ysl2 Edouard Tisserant parents: 2880 diff changeset	222	function "defs_by_labels" {
3bb49f93d48c SVGHMI: added widget_common.ysl2 Edouard Tisserant parents: 2880 diff changeset	223	param "labels","''";
3bb49f93d48c SVGHMI: added widget_common.ysl2 Edouard Tisserant parents: 2880 diff changeset	224	param "mandatory","'yes'";
2920 3ee337c8c769 SVGHMI: finished shift and capslock support n keypad widget. Added a helper in widgets_common to collect subelements likle active/inactive/disabled... Edouard Tisserant <edouard.tisserant@gmail.com> parents: 2897 diff changeset	225	param "subelements","/..";
2881 3bb49f93d48c SVGHMI: added widget_common.ysl2 Edouard Tisserant parents: 2880 diff changeset	226	param "hmi_element";
3bb49f93d48c SVGHMI: added widget_common.ysl2 Edouard Tisserant parents: 2880 diff changeset	227	const "widget_type","@type";
3bb49f93d48c SVGHMI: added widget_common.ysl2 Edouard Tisserant parents: 2880 diff changeset	228	foreach "str:split($labels)" {
3bb49f93d48c SVGHMI: added widget_common.ysl2 Edouard Tisserant parents: 2880 diff changeset	229	const "name",".";
2920 3ee337c8c769 SVGHMI: finished shift and capslock support n keypad widget. Added a helper in widgets_common to collect subelements likle active/inactive/disabled... Edouard Tisserant <edouard.tisserant@gmail.com> parents: 2897 diff changeset	230	const "elt","$result_svg_ns//[@id = $hmi_element/@id]//[@inkscape:label=$name][1]";
2881 3bb49f93d48c SVGHMI: added widget_common.ysl2 Edouard Tisserant parents: 2880 diff changeset	231	choose {
2920 3ee337c8c769 SVGHMI: finished shift and capslock support n keypad widget. Added a helper in widgets_common to collect subelements likle active/inactive/disabled... Edouard Tisserant <edouard.tisserant@gmail.com> parents: 2897 diff changeset	232	when "not($elt/@id)" {
2881 3bb49f93d48c SVGHMI: added widget_common.ysl2 Edouard Tisserant parents: 2880 diff changeset	233	if "$mandatory='yes'" {
2920 3ee337c8c769 SVGHMI: finished shift and capslock support n keypad widget. Added a helper in widgets_common to collect subelements likle active/inactive/disabled... Edouard Tisserant <edouard.tisserant@gmail.com> parents: 2897 diff changeset	234	error > «$widget_type» widget must have a «$name» element
2834 6ac6a9dff594 SVGHMI: be a bit more tolerant with missing HMI paths or missing elements in widgets : continue build (with warning) and fail silently at runtime. Edouard Tisserant parents: 2833 diff changeset	235	}
2881 3bb49f93d48c SVGHMI: added widget_common.ysl2 Edouard Tisserant parents: 2880 diff changeset	236	// otherwise produce nothing
2797 c5ba1e77f054 SVGHMI: added a widgets description object, accessed by id. Added frequency to widgets, as separate template to allow future customization. Excluded non svg elements (i.e inkscape Sets) with HMI: labels from widgets. Edouard Tisserant parents: 2796 diff changeset	237	}
2881 3bb49f93d48c SVGHMI: added widget_common.ysl2 Edouard Tisserant parents: 2880 diff changeset	238	otherwise {
2920 3ee337c8c769 SVGHMI: finished shift and capslock support n keypad widget. Added a helper in widgets_common to collect subelements likle active/inactive/disabled... Edouard Tisserant <edouard.tisserant@gmail.com> parents: 2897 diff changeset	239	\| «$name»_elt: id("«$elt/@id»"),
3ee337c8c769 SVGHMI: finished shift and capslock support n keypad widget. Added a helper in widgets_common to collect subelements likle active/inactive/disabled... Edouard Tisserant <edouard.tisserant@gmail.com> parents: 2897 diff changeset	240	if "$subelements" {
3ee337c8c769 SVGHMI: finished shift and capslock support n keypad widget. Added a helper in widgets_common to collect subelements likle active/inactive/disabled... Edouard Tisserant <edouard.tisserant@gmail.com> parents: 2897 diff changeset	241	\| «$name»_sub: {
3ee337c8c769 SVGHMI: finished shift and capslock support n keypad widget. Added a helper in widgets_common to collect subelements likle active/inactive/disabled... Edouard Tisserant <edouard.tisserant@gmail.com> parents: 2897 diff changeset	242	foreach "str:split($subelements)" {
3ee337c8c769 SVGHMI: finished shift and capslock support n keypad widget. Added a helper in widgets_common to collect subelements likle active/inactive/disabled... Edouard Tisserant <edouard.tisserant@gmail.com> parents: 2897 diff changeset	243	const "subname",".";
3ee337c8c769 SVGHMI: finished shift and capslock support n keypad widget. Added a helper in widgets_common to collect subelements likle active/inactive/disabled... Edouard Tisserant <edouard.tisserant@gmail.com> parents: 2897 diff changeset	244	const "subelt","$elt/*[@inkscape:label=$subname][1]";
3ee337c8c769 SVGHMI: finished shift and capslock support n keypad widget. Added a helper in widgets_common to collect subelements likle active/inactive/disabled... Edouard Tisserant <edouard.tisserant@gmail.com> parents: 2897 diff changeset	245	choose {
3ee337c8c769 SVGHMI: finished shift and capslock support n keypad widget. Added a helper in widgets_common to collect subelements likle active/inactive/disabled... Edouard Tisserant <edouard.tisserant@gmail.com> parents: 2897 diff changeset	246	when "not($subelt/@id)" {
3ee337c8c769 SVGHMI: finished shift and capslock support n keypad widget. Added a helper in widgets_common to collect subelements likle active/inactive/disabled... Edouard Tisserant <edouard.tisserant@gmail.com> parents: 2897 diff changeset	247	if "$mandatory='yes'" {
3ee337c8c769 SVGHMI: finished shift and capslock support n keypad widget. Added a helper in widgets_common to collect subelements likle active/inactive/disabled... Edouard Tisserant <edouard.tisserant@gmail.com> parents: 2897 diff changeset	248	error > «$widget_type» widget must have a «$name»/«$subname» element
3ee337c8c769 SVGHMI: finished shift and capslock support n keypad widget. Added a helper in widgets_common to collect subelements likle active/inactive/disabled... Edouard Tisserant <edouard.tisserant@gmail.com> parents: 2897 diff changeset	249	}
3ee337c8c769 SVGHMI: finished shift and capslock support n keypad widget. Added a helper in widgets_common to collect subelements likle active/inactive/disabled... Edouard Tisserant <edouard.tisserant@gmail.com> parents: 2897 diff changeset	250	\| /* missing «$name»/«$subname» element */
3ee337c8c769 SVGHMI: finished shift and capslock support n keypad widget. Added a helper in widgets_common to collect subelements likle active/inactive/disabled... Edouard Tisserant <edouard.tisserant@gmail.com> parents: 2897 diff changeset	251	}
3ee337c8c769 SVGHMI: finished shift and capslock support n keypad widget. Added a helper in widgets_common to collect subelements likle active/inactive/disabled... Edouard Tisserant <edouard.tisserant@gmail.com> parents: 2897 diff changeset	252	otherwise {
3ee337c8c769 SVGHMI: finished shift and capslock support n keypad widget. Added a helper in widgets_common to collect subelements likle active/inactive/disabled... Edouard Tisserant <edouard.tisserant@gmail.com> parents: 2897 diff changeset	253	\| "«$subname»": id("«$subelt/@id»")`if "position()!=last()" > ,`
3ee337c8c769 SVGHMI: finished shift and capslock support n keypad widget. Added a helper in widgets_common to collect subelements likle active/inactive/disabled... Edouard Tisserant <edouard.tisserant@gmail.com> parents: 2897 diff changeset	254	}
3ee337c8c769 SVGHMI: finished shift and capslock support n keypad widget. Added a helper in widgets_common to collect subelements likle active/inactive/disabled... Edouard Tisserant <edouard.tisserant@gmail.com> parents: 2897 diff changeset	255	}
3ee337c8c769 SVGHMI: finished shift and capslock support n keypad widget. Added a helper in widgets_common to collect subelements likle active/inactive/disabled... Edouard Tisserant <edouard.tisserant@gmail.com> parents: 2897 diff changeset	256	}
3ee337c8c769 SVGHMI: finished shift and capslock support n keypad widget. Added a helper in widgets_common to collect subelements likle active/inactive/disabled... Edouard Tisserant <edouard.tisserant@gmail.com> parents: 2897 diff changeset	257	\| },
3ee337c8c769 SVGHMI: finished shift and capslock support n keypad widget. Added a helper in widgets_common to collect subelements likle active/inactive/disabled... Edouard Tisserant <edouard.tisserant@gmail.com> parents: 2897 diff changeset	258	}
2836 ce6cecdb7320 SVGHMI : still behave, even if important things are missing in SVG widget definitions (ex: needle missing for Meter widget) Edouard Tisserant parents: 2834 diff changeset	259	}
2808 dc78ffa5253d SVGHMI: SVG viewport now defined so that HMI take scales and fit to the view. Implemented page switch through viewport change, no hiding of widget for now. Edouard Tisserant parents: 2807 diff changeset	260	}
dc78ffa5253d SVGHMI: SVG viewport now defined so that HMI take scales and fit to the view. Implemented page switch through viewport change, no hiding of widget for now. Edouard Tisserant parents: 2807 diff changeset	261	}
2881 3bb49f93d48c SVGHMI: added widget_common.ysl2 Edouard Tisserant parents: 2880 diff changeset	262	}
2808 dc78ffa5253d SVGHMI: SVG viewport now defined so that HMI take scales and fit to the view. Implemented page switch through viewport change, no hiding of widget for now. Edouard Tisserant parents: 2807 diff changeset	263
2883 8e3d130399b0 SVGHMI: created widget_.ysl2. Renamed widget_common in widgets_common, so that it doesn't match globing. Edouard Tisserant <edouard.tisserant@gmail.com>* parents: 2881 diff changeset	264	def "func:escape_quotes" {
8e3d130399b0 SVGHMI: created widget_.ysl2. Renamed widget_common in widgets_common, so that it doesn't match globing. Edouard Tisserant <edouard.tisserant@gmail.com>* parents: 2881 diff changeset	265	param "txt";
8e3d130399b0 SVGHMI: created widget_.ysl2. Renamed widget_common in widgets_common, so that it doesn't match globing. Edouard Tisserant <edouard.tisserant@gmail.com>* parents: 2881 diff changeset	266	// have to use a python string to enter escaped quote
8e3d130399b0 SVGHMI: created widget_.ysl2. Renamed widget_common in widgets_common, so that it doesn't match globing. Edouard Tisserant <edouard.tisserant@gmail.com>* parents: 2881 diff changeset	267	const "frst", !"substring-before($txt,'\"')"!;
8e3d130399b0 SVGHMI: created widget_.ysl2. Renamed widget_common in widgets_common, so that it doesn't match globing. Edouard Tisserant <edouard.tisserant@gmail.com>* parents: 2881 diff changeset	268	const "frstln", "string-length($frst)";
8e3d130399b0 SVGHMI: created widget_.ysl2. Renamed widget_common in widgets_common, so that it doesn't match globing. Edouard Tisserant <edouard.tisserant@gmail.com>* parents: 2881 diff changeset	269	choose {
8e3d130399b0 SVGHMI: created widget_.ysl2. Renamed widget_common in widgets_common, so that it doesn't match globing. Edouard Tisserant <edouard.tisserant@gmail.com>* parents: 2881 diff changeset	270	when "$frstln > 0 and string-length($txt) > $frstln" {
8e3d130399b0 SVGHMI: created widget_.ysl2. Renamed widget_common in widgets_common, so that it doesn't match globing. Edouard Tisserant <edouard.tisserant@gmail.com>* parents: 2881 diff changeset	271	result !"concat($frst,'\\\"',func:escape_quotes(substring-after($txt,'\"')))"!;
8e3d130399b0 SVGHMI: created widget_.ysl2. Renamed widget_common in widgets_common, so that it doesn't match globing. Edouard Tisserant <edouard.tisserant@gmail.com>* parents: 2881 diff changeset	272	}
8e3d130399b0 SVGHMI: created widget_.ysl2. Renamed widget_common in widgets_common, so that it doesn't match globing. Edouard Tisserant <edouard.tisserant@gmail.com>* parents: 2881 diff changeset	273	otherwise {
8e3d130399b0 SVGHMI: created widget_.ysl2. Renamed widget_common in widgets_common, so that it doesn't match globing. Edouard Tisserant <edouard.tisserant@gmail.com>* parents: 2881 diff changeset	274	result "$txt";
8e3d130399b0 SVGHMI: created widget_.ysl2. Renamed widget_common in widgets_common, so that it doesn't match globing. Edouard Tisserant <edouard.tisserant@gmail.com>* parents: 2881 diff changeset	275	}
8e3d130399b0 SVGHMI: created widget_.ysl2. Renamed widget_common in widgets_common, so that it doesn't match globing. Edouard Tisserant <edouard.tisserant@gmail.com>* parents: 2881 diff changeset	276	}
8e3d130399b0 SVGHMI: created widget_.ysl2. Renamed widget_common in widgets_common, so that it doesn't match globing. Edouard Tisserant <edouard.tisserant@gmail.com>* parents: 2881 diff changeset	277	}
8e3d130399b0 SVGHMI: created widget_.ysl2. Renamed widget_common in widgets_common, so that it doesn't match globing. Edouard Tisserant <edouard.tisserant@gmail.com>* parents: 2881 diff changeset	278

author	Edouard Tisserant <edouard.tisserant@gmail.com>
	Sat, 08 Aug 2020 15:53:28 +0200
branch	svghmi
changeset 3017	15e2df3e5610
parent 3007	360300a8b995
child 3022	f6fe42b7ce60
permissions	-rw-r--r--