--- a/svghmi/analyse_widget.xslt Mon May 23 18:11:31 2022 +0200
+++ b/svghmi/analyse_widget.xslt Mon May 23 18:12:30 2022 +0200
@@ -50,6 +50,16 @@
<xsl:value-of select="$type"/>
+ <xsl:if test="not(regexp:test($freq,'^[0-9]*(\.[0-9]+)?[smh]?'))"> + <xsl:message terminate="yes"> + <xsl:text>Widget id:</xsl:text> + <xsl:value-of select="$id"/> + <xsl:text> label:</xsl:text> + <xsl:value-of select="$label"/> + <xsl:text> has wrong syntax of frequency forcing </xsl:text> + <xsl:value-of select="$freq"/> <xsl:attribute name="freq">
<xsl:value-of select="$freq"/>
@@ -223,8 +233,6 @@
<xsl:template name="generated_button_class">
- <xsl:text> frequency = 5; <xsl:text> display = "inactive";
<xsl:text> state = "init";
@@ -717,7 +725,7 @@
<xsl:value-of select="@type"/>
--- a/svghmi/gen_dnd_widget_svg.xslt Mon May 23 18:11:31 2022 +0200
+++ b/svghmi/gen_dnd_widget_svg.xslt Mon May 23 18:12:30 2022 +0200
@@ -52,6 +52,16 @@
<xsl:value-of select="$type"/>
+ <xsl:if test="not(regexp:test($freq,'^[0-9]*(\.[0-9]+)?[smh]?'))"> + <xsl:message terminate="yes"> + <xsl:text>Widget id:</xsl:text> + <xsl:value-of select="$id"/> + <xsl:text> label:</xsl:text> + <xsl:value-of select="$label"/> + <xsl:text> has wrong syntax of frequency forcing </xsl:text> + <xsl:value-of select="$freq"/> <xsl:attribute name="freq">
<xsl:value-of select="$freq"/>
--- a/svghmi/gen_index_xhtml.xslt Mon May 23 18:11:31 2022 +0200
+++ b/svghmi/gen_index_xhtml.xslt Mon May 23 18:12:30 2022 +0200
@@ -207,6 +207,16 @@
<xsl:value-of select="$type"/>
+ <xsl:if test="not(regexp:test($freq,'^[0-9]*(\.[0-9]+)?[smh]?'))"> + <xsl:message terminate="yes"> + <xsl:text>Widget id:</xsl:text> + <xsl:value-of select="$id"/> + <xsl:text> label:</xsl:text> + <xsl:value-of select="$label"/> + <xsl:text> has wrong syntax of frequency forcing </xsl:text> + <xsl:value-of select="$freq"/> <xsl:attribute name="freq">
<xsl:value-of select="$freq"/>
@@ -1248,7 +1258,9 @@
<xsl:variable name="freq">
<xsl:when test="$widget/@freq">
<xsl:value-of select="$widget/@freq"/>
<xsl:text>undefined</xsl:text>
@@ -1477,6 +1489,68 @@
<xsl:text> this.forced_frequency = freq;
+ <xsl:text> this.clip = true; + <xsl:text> let forced = this.forced_frequency; + <xsl:text> if(forced !== undefined){ + <xsl:text> once every 10 seconds : 10s + <xsl:text> once per minute : 1m + <xsl:text> once per hour : 1h + <xsl:text> once per day : 1d + <xsl:text> let unit = forced.slice(-1); + <xsl:text> let factor = { + <xsl:text> "d":86400}[unit]; + <xsl:text> this.frequency = factor ? 1/(factor * Number(forced.slice(0,-1))) + <xsl:text> : Number(forced); + <xsl:text> let init = this.init; + <xsl:text> if(typeof(init) == "function"){ + <xsl:text> init.call(this); + <xsl:text> } catch(err) { + <xsl:text> console.log(err); @@ -1649,7 +1723,9 @@
<xsl:text> let new_val = eval_operation_string(old_val, opstr);
- <xsl:text> new_val = this.clip_min_max(index, new_val);+ <xsl:text> if(this.clip) + <xsl:text> new_val = this.clip_min_max(index, new_val); <xsl:text> return apply_hmi_value(realindex, new_val);
@@ -1663,7 +1739,9 @@
<xsl:text> if(realindex == undefined) return undefined;
- <xsl:text> new_val = this.clip_min_max(index, new_val);+ <xsl:text> if(this.clip) + <xsl:text> new_val = this.clip_min_max(index, new_val); <xsl:text> return apply_hmi_value(realindex, new_val);
@@ -1883,8 +1961,10 @@
<xsl:param name="hmi_element"/>
<xsl:variable name="widget_type" select="@type"/>
<xsl:for-each select="str:split($labels)">
- <xsl:variable name="name" select="."/>- <xsl:variable name="elt" select="$result_widgets[@id = $hmi_element/@id]//*[@inkscape:label=$name][1]"/>+ <xsl:variable name="absolute" select="starts-with(., '/')"/> + <xsl:variable name="name" select="substring(.,number($absolute)+1)"/> + <xsl:variable name="widget" select="$result_widgets[@id = $hmi_element/@id]"/> + <xsl:variable name="elt" select="($widget//*[not($absolute) and @inkscape:label=$name] | $widget/*[$absolute and @inkscape:label=$name])[1]"/> <xsl:when test="not($elt/@id)">
<xsl:if test="$mandatory='yes'">
@@ -2400,10 +2480,6 @@
<xsl:value-of select="@name"/>
- <xsl:text>console.log("Entering state </xsl:text>- <xsl:value-of select="@name"/>- <xsl:text>", this.frequency); <xsl:apply-templates mode="actions" select="*"/>
@@ -2424,8 +2500,6 @@
<xsl:template name="generated_button_class">
- <xsl:text> frequency = 5; <xsl:text> display = "inactive";
<xsl:text> state = "init";
@@ -2492,6 +2566,8 @@
<xsl:text>ButtonWidget</xsl:text>
<xsl:text> extends Widget{
+ <xsl:text> frequency = 5; <xsl:variable name="fsm" select="exsl:node-set($_button_fsm)"/>
<xsl:call-template name="generated_button_class">
<xsl:with-param name="fsm" select="$fsm"/>
@@ -2514,6 +2590,8 @@
<xsl:text>PushButtonWidget</xsl:text>
<xsl:text> extends Widget{
+ <xsl:text> frequency = 20; <xsl:variable name="fsm" select="exsl:node-set($_push_button_fsm)"/>
<xsl:call-template name="generated_button_class">
<xsl:with-param name="fsm" select="$fsm"/>
@@ -6116,7 +6194,7 @@
<xsl:value-of select="@type"/>
@@ -6159,7 +6237,7 @@
<xsl:text> origPt = undefined;
@@ -6243,7 +6321,7 @@
<xsl:text> bestDistance = beforeDistance;
- <xsl:text> } else if ((afterLength = bestLength + precision) <= this.pathLength && + <xsl:text> } else if ((afterLength = bestLength + precision) <= this.pathLength && <xsl:text> (afterDistance = distance2(afterPoint = this.path_elt.getPointAtLength(afterLength))) < bestDistance) {
@@ -7627,7 +7705,7 @@
<xsl:text> activate(val) {
- <xsl:text> let [active, inactive] = val ? ["none",""] : ["", "none"];+ <xsl:text> let [active, inactive] = val ? ["","none"] : ["none", ""]; <xsl:text> if (this.active_elt)
@@ -7751,7 +7829,7 @@
<xsl:text> modulo: /^%{2}/,
- <xsl:text> placeholder: /^%(?:([1-9]\d*)\$|\(([^)]+)\))?(\+)?(0|'[^$])?(-)?(\d+)?(?:\.(\d+))?([b-gijostTuvxX])/,+ <xsl:text> placeholder: /^%(?:([1-9]\d*)\$|\(([^)]+)\))?(\+)?(0|'[^$])?(-)?(\d+)?(?:\.(\d+))?([b-gijostTuvxXD])/, <xsl:text> key: /^([a-z_][a-z_\d]*)/i,
@@ -7877,6 +7955,96 @@
+ <xsl:text> select date format with width + <xsl:text> select time format with precision + <xsl:text> %D => 13:31 AM (default) + <xsl:text> %1D => 13:31 AM + <xsl:text> %.1D => 07/07/20 + <xsl:text> %1.1D => 07/07/20, 13:31 AM + <xsl:text> %1.2D => 07/07/20, 13:31:55 AM + <xsl:text> %2.2D => May 5, 2022, 9:29:16 AM + <xsl:text> %3.3D => May 5, 2022 at 9:28:16 AM GMT+2 + <xsl:text> %4.4D => Thursday, May 5, 2022 at 9:26:59 AM Central European Summer Time + <xsl:text> see meaning of DateTimeFormat's options "datestyle" and "timestyle" in MDN + <xsl:text> let [datestyle, timestyle] = [ph.width, ph.precision].map(val => ({ + <xsl:text> 2: "medium", + <xsl:text> if(timestyle === undefined && datestyle === undefined){ + <xsl:text> timestyle = "short"; + <xsl:text> let options = { + <xsl:text> dateStyle: datestyle, + <xsl:text> timeStyle: timestyle, + <xsl:text> hour12: false + <xsl:text> /* get lang from globals */ + <xsl:text> let lang = get_current_lang_code(); + <xsl:text> arg = Date(arg).toLocaleString('en-US', options); + <xsl:text> TODO: select with padding char + <xsl:text> a: absolute time and date (default) + <xsl:text> r: relative time <xsl:text> arg = JSON.stringify(arg, null, ph.width ? parseInt(ph.width) : 0)
@@ -8221,25 +8389,7 @@
<xsl:text> let widget = hmi_widgets[id];
- <xsl:text> let init = widget.init;- <xsl:text> if(typeof(init) == "function"){- <xsl:text> init.call(widget);- <xsl:text> } catch(err) {- <xsl:text> console.log(err);- <xsl:text> if(widget.forced_frequency !== undefined)- <xsl:text> widget.frequency = widget.forced_frequency;+ <xsl:text> widget.do_init(); @@ -8713,6 +8863,16 @@
+ <xsl:text>// returns en_US, fr_FR or en_UK depending on selected language + <xsl:text>function get_current_lang_code(){ + <xsl:text> return cache[langcode_local_index]; <xsl:text>function setup_lang(){
<xsl:text> let current_lang = cache[lang_local_index];
