--- a/controls/DebugVariablePanel/DebugVariableItem.py Tue Sep 13 16:51:54 2022 +0200
+++ b/controls/DebugVariablePanel/DebugVariableItem.py Tue Sep 13 16:53:15 2022 +0200
@@ -144,7 +144,7 @@
# Return immediately if data empty or none
if self.Data is None or self.Data.count == 0:
# Find nearest data outside given range indexes
start_idx = (self.GetNearestData(start_tick, -1)
@@ -187,6 +187,9 @@
# Get data in given tick range
data = self.GetData(start_tick, end_tick)
+ return None, None, None # Value range is calculated on whole data
return data, self.MinValue, self.MaxValue
--- a/svghmi/gen_index_xhtml.ysl2 Tue Sep 13 16:51:54 2022 +0200
+++ b/svghmi/gen_index_xhtml.ysl2 Tue Sep 13 16:53:15 2022 +0200
@@ -84,6 +84,8 @@
+ include text pythonic.js | \n//\n//\n// Early independent declarations \n//\n//
apply "document('')/*/preamble:*";
@@ -98,8 +100,6 @@
- include text pythonic.js
| \n//\n//\n// Declarations from SVG scripts (inkscape document properties) \n//\n//
--- a/svghmi/parse_labels.ysl2 Tue Sep 13 16:51:54 2022 +0200
+++ b/svghmi/parse_labels.ysl2 Tue Sep 13 16:53:15 2022 +0200
@@ -2,7 +2,7 @@
-// "HMI:WidgetType|freq:param1:param2@path1,path1min,path1max@path2"
+// "HMI:WidgetType|freq:param1:param2@a=path1,path1min,path1max@b=path2#a+b>3" // widget type="WidgetType" id="blah456" {
@@ -13,39 +13,39 @@
// path value="path4" index="path4" type="HMI_LOCAL";
-const "pathregex",!"'^([^\[,]+)(\[[^\]]+\])?([-.\d,]*)$'"!;
+const "pathregex",!"'^(\w+=)?([^,=]+)([-.\d,]*)$'"!; const "twonewlines", "concat($newline,$newline)";
template "*", mode="parselabel"
- const "part","@inkscape:label";
+ const "label","@inkscape:label"; const "desc", "svg:desc";
// add svg:desc field if continuation "\" marker is found at the end of label
- const "len","string-length($part)";
- const "has_continuation", "substring($part,$len,1)='\\'";
+ const "len","string-length($label)"; + const "has_continuation", "substring($label,$len,1)='\\'"; + const "full_decl" choose{ when "$has_continuation" {
const "_continuation", "substring-before($desc, $twonewlines)";
const "continuation" choose {
when "$_continuation" value "$_continuation";
- value "concat(substring($part,1,$len - 1),translate($continuation,$newline,''))";
+ value "concat(substring($label,1,$len - 1),translate($continuation,$newline,''))"; - otherwise value "$part";
+ otherwise value "$label"; - const "description", "substring-after($label,'HMI:')";
+ const "declaration", "substring-after($full_decl,'HMI:')"; - const "_args", "substring-before($description,'@')";
+ const "_args", "substring-before($declaration,'@')"; when "$_args" value "$_args";
- otherwise value "$description";
+ otherwise value "$declaration"; const "_typefreq", "substring-before($args,':')";
@@ -66,37 +66,59 @@
attrib "type" > «$type»
if "not(regexp:test($freq,'^[0-9]*(\.[0-9]+)?[smh]?'))" {
- error > Widget id:«$id» label:«$label» has wrong syntax of frequency forcing «$freq»
+ error > Widget id:«$id» label:«$full_decl» has wrong syntax of frequency forcing «$freq» attrib "freq" > «$freq»
+ // find "#" + JS expr at the end + const "tail", "substring-after($declaration,'@')"; + const "taillen","string-length($tail)"; + const "has_enable", "contains($tail, '#')"; + value "substring-before($tail,'#')"; + otherwise value "$tail"; + const "enable_expr", "substring-after($tail,'#')"; + attrib "enable_expr" value "$enable_expr"; foreach "str:split(substring-after($args, ':'), ':')" {
- const "paths", "substring-after($description,'@')";
+ // for stricter syntax checking, this should make error + // if $paths contains "@@" or ends with "@" (empty paths) foreach "str:split($paths, '@')" {
if "string-length(.) > 0" path {
const "path_match", "regexp:match(.,$pathregex)";
+ const "pathassign", "substring-before($path_match[2],'=')"; const "pathminmax", "str:split($path_match[4],',')";
- const "path", "$path_match[2]";
- const "path_accepts", "$path_match[3]";
+ const "path", "$path_match[3]"; const "pathminmaxcount", "count($pathminmax)";
- attrib "value" > «$path»
- if "string-length($path_accepts)"
- attrib "accepts" > «$path_accepts»
+ error > Widget id:«$id» label:«$full_decl» has wrong syntax + attrib "value" value "$path"; + attrib "assign" value "$pathassign"; when "$pathminmaxcount = 2" {
attrib "min" > «$pathminmax[1]»
attrib "max" > «$pathminmax[2]»
when "$pathminmaxcount = 1 or $pathminmaxcount > 2" {
- error > Widget id:«$id» label:«$label» has wrong syntax of path section «$pathminmax»
+ error > Widget id:«$id» label:«$full_decl» has wrong syntax of path section «$pathminmax» if "$indexed_hmitree" choose {
@@ -110,7 +132,7 @@
const "item", "$indexed_hmitree/*[@hmipath = $path]";
const "pathtype", "local-name($item)";
if "$pathminmaxcount = 3 and not($pathtype = 'HMI_INT' or $pathtype = 'HMI_REAL')" {
- error > Widget id:«$id» label:«$label» path section «$pathminmax» use min and max on non mumeric value
+ error > Widget id:«$id» label:«$full_decl» path section «$pathminmax» use min and max on non mumeric value attrib "index" > «$item/@index»
--- a/svghmi/svghmi.js Tue Sep 13 16:51:54 2022 +0200
+++ b/svghmi/svghmi.js Tue Sep 13 16:53:15 2022 +0200
@@ -1,7 +1,5 @@
-var need_cache_apply = [];
function dispatch_value(index, value) {
let widgets = subscribers(index);
@@ -86,13 +84,8 @@
- while(widget = need_cache_apply.pop()){
if(jumps_need_update) update_jumps();
pending_widget_animates.forEach(widget => widget._animate());
pending_widget_animates = [];
@@ -139,8 +132,9 @@
throw new Error("Unknown index "+index);
// register for rendering on next frame, since there are updates
// 1003 is for "Unsupported Data"
// ws.close(1003, err.message);
@@ -348,14 +342,13 @@
function send_hmi_value(index, value) {
if(index > last_remote_index){
- updates.set(index, value);
+ dispatch_value(index, value); if(persistent_indexes.has(index)){
let varname = persistent_indexes.get(index);
document.cookie = varname+"="+value+"; max-age=3153600000";
--- a/svghmi/ui.py Tue Sep 13 16:51:54 2022 +0200
+++ b/svghmi/ui.py Tue Sep 13 16:53:15 2022 +0200
@@ -662,14 +662,6 @@
self.AddPathToSignature(path)
- # for widget in widgets:
- # widget_type = widget.get("type")
- # for path in widget.iterchildren("path"):
- # path_value = path.get("value")
- # str.strip, path.get("accepts", '')[1:-1].split(','))
self.main_panel.SetupScrolling(scroll_x=False)
def GetWidgetParams(self, _context):
--- a/svghmi/widget_button.ysl2 Tue Sep 13 16:51:54 2022 +0200
+++ b/svghmi/widget_button.ysl2 Tue Sep 13 16:53:15 2022 +0200
@@ -151,7 +151,7 @@
template "show", mode="actions" {
- | this.display = "«@eltname»";
+ | this.activity_state = «@eltname = 'active'»; | this.request_animate();
template "hmi-value", mode="actions" {
@@ -164,7 +164,6 @@
function "generated_button_class" {
- | display = "inactive";
@@ -182,14 +181,10 @@
apply "$fsm", mode="actions";
- | this.set_activation_state(this.display == "active");
| this.bound_onmouseup = this.onmouseup.bind(this);
| this.element.addEventListener("pointerdown", this.onmousedown.bind(this));
- | this.set_activation_state(undefined);
+ | this.activity_state = undefined; --- a/svghmi/widget_jump.ysl2 Tue Sep 13 16:51:54 2022 +0200
+++ b/svghmi/widget_jump.ysl2 Tue Sep 13 16:53:15 2022 +0200
@@ -3,17 +3,42 @@
- Jump widget brings focus to a different page. Mandatory single argument
+ Jump widget brings focus to a different page. Mandatory first argument - Optional single path is used as new reference when jumping to a relative
- page, it must point to a HMI_NODE.
+ If first path is pointint to HMI_NODE variable is used as new reference + when jumping to a relative page. + Additional arguments are unordered options: + - Absolute: force page jump to be not relative even if first path is of type HMI_NODE + - name=value: Notify PLC about jump by setting variable with path having same name assigned "active"+"inactive" labeled elements can be provided and reflect current
- "disabled" labeled element, if provided, is shown instead of "active" or
- "inactive" widget when pointed HMI_NODE is null.
+ HMI:Jump:RelativePage@/PUMP9 + HMI:Jump:RelativePage@/PUMP9@role=.userrole#role=="admin" + HMI:Jump:AbsolutePage@role=.userrole#role=="admin" + HMI:Jump:AbsolutePage:Absolute@/PUMP9 + HMI:Jump:AbsolutePage:Absolute:notify=1@notify=/PUMP9 + HMI:Jump:AbsolutePage:notify=1@notify=.did_jump shortdesc > Jump to given page
@@ -26,110 +51,85 @@
- this.active_elt.style.display = "";
- this.inactive_elt.style.display = "none";
- this.inactive_elt.style.display = "";
- this.active_elt.style.display = "none";
- this.disabled_elt.style.display = "";
- this.inactive_elt.style.display = "none";
- this.active_elt.style.display = "none";
- this.disabled_elt.style.display = "none";
- this.update_activity();
const name = this.args[0];
- /* TODO: in order to allow jumps to page selected through for exemple a dropdown,
- support path pointing to local variable whom value
- would be an HMI_TREE index and then jump to a relative page not hard-coded in advance */
- const index = that.indexes.length > 0 ? that.indexes[0] + that.offset : undefined;
+ /* TODO: in order to allow jumps to page selected through + for exemple a dropdown, support path pointing to local + variable whom value would be an HMI_TREE index and then + jump to a relative page not hard-coded in advance + if(that.enable_state) { + (that.is_relative && that.indexes.length > 0) ? + that.indexes[0] + that.offset : undefined; fading_page_switch(name, index);
notify_page_change(page_name, index) {
+ // called from animate() const ref_index = this.indexes.length > 0 ? this.indexes[0] + this.offset : undefined;
const ref_name = this.args[0];
- this.active = ((ref_name == undefined || ref_name == page_name) && index == ref_index);
+ this.activity_state = ((ref_name == undefined || ref_name == page_name) && index == ref_index); + // Since called from animate, update activity directly + if(this.enable_displayed_state && this.has_activity) { + this.animate_activity();
- this.disabled = !Number(value);
- // TODO : use RequestAnimate and animate()
+def "func:is_relative_jump" { + result "$widget/path and $widget/path[1]/@type='HMI_NODE' and not($widget/arg[position()>1 and @value = 'Absolute'])"; - // TODO: ensure both active and inactive are provided
- const "activity" optional_labels("active inactive");
- const "have_activity","string-length($activity)>0";
- const "disability" optional_labels("disabled");
- const "have_disability","$have_activity and string-length($disability)>0";
+ const "jump_disability","$has_activity and $has_disability"; | this.element.onclick = this.make_on_click();
- if "not($have_disability)" {
- | this.unsubscribable = true;
- when "$have_disability" {
- > this.update_disability
- when "$have_activity" {
+ when "func:is_relative_jump(.)" > true + foreach "arg[position()>1 and contains(@value,'=')]"{ + const "name","substring-before(@value,'=')"; + const "value","substring-after(@value,'=')"; + const "index" foreach "$paths" if "@assign = $name" value "position()-1"; + | this.apply_hmi_value(«$index», «$value»); - /* check that given path is compatible with page's reference path */
- /* TODO: suport local variable containing an HMI_TREE index to jump to a relative page */
+ /* jump is considered relative jump if first path points to HMI_NODE + but a jump can be forced Absolute by adding a "Absolute" argument */ + if "func:is_relative_jump(.)" { + /* if relative check that given path is compatible with page's reference path */ /* when no page name provided, check for same page */
const "target_page_name" choose {
when "arg" value "arg[1]/@value";
@@ -142,9 +142,12 @@
if "not(func:same_class_paths($target_page_path, path[1]/@value))"
error > Jump id="«@id»" to page "«$target_page_name»" with incompatible path "«path[1]/@value» (must be same class as "«$target_page_path»")
/* TODO: move to detachable pages ysl2 */
@@ -165,6 +168,7 @@
var jump_history = [[default_page, undefined]];
function update_jumps() {
+ // called from animate() page_desc[current_visible_page].jumps.map(w=>w.notify_page_change(current_visible_page,current_page_index));
jumps_need_update = false;
--- a/svghmi/widget_tooglebutton.ysl2 Tue Sep 13 16:51:54 2022 +0200
+++ b/svghmi/widget_tooglebutton.ysl2 Tue Sep 13 16:53:15 2022 +0200
@@ -18,33 +18,27 @@
widget_class("ToggleButton") {
active_style = undefined;
inactive_style = undefined;
+ this.activity_state = Boolean(value); - this.state = this.state ? false : true;
- this.apply_hmi_value(0, this.state);
+ this.activity_state = this.activity_state ? false : true; + this.apply_hmi_value(0, this.activity_state);
- // redraw toggle button on screen refresh
- this.set_activation_state(this.state);
this.element.onclick = (evt) => this.on_click(evt);
- this.set_activation_state(undefined);
+ this.activity_state = undefined; --- a/svghmi/widgets_common.ysl2 Tue Sep 13 16:51:54 2022 +0200
+++ b/svghmi/widgets_common.ysl2 Tue Sep 13 16:53:15 2022 +0200
@@ -21,13 +21,25 @@
-decl activable() alias - {
+decl _activable(*level) alias - { - warning_labels("/active /inactive") {
+ const "activity" labels("/active /inactive") { + with "mandatory"{text *level};
+ const "has_activity","string-length($activity)>0"; + | has_activity: «$has_activity», +decl activable() alias - { +decl optional_activable() alias - { decl activable_labels(*ptr) alias - {
with "subelements","'active inactive'";
@@ -48,6 +60,10 @@
in xsl decl widget_defs(%name, match="widget[@type='%name']", mode="widget_defs") alias template {
+ // all widget potentially has a "disabled" labeled element + const "disability" optional_labels("/disabled"); + const "has_disability","string-length($disability)>0"; @@ -65,6 +81,11 @@
const "args" foreach "$widget/arg" > "«func:escape_quotes(@value)»"`if "position()!=last()" > ,`
const "indexes" foreach "$widget/path" {
+ if "position()!=last()" > , + const "variables" foreach "$widget/path" { @@ -84,16 +105,15 @@
- if "position()!=last()" > ,
- const "minmaxes" foreach "$widget/path" {
+ > minmax:[«@min», «@max»] if "position()!=last()" > ,
@@ -104,7 +124,34 @@
- | "«@id»": new «$widget/@type»Widget ("«@id»",«$freq»,[«$args»],[«$indexes»],[«$minmaxes»],{
+ const "enable_expr" choose{ + when "$widget/@enable_expr" + | "«@id»": new «$widget/@type»Widget ("«@id»",«$freq»,[«$args»],[«$variables»],«$enable_expr»,{ + if "$widget/@enable_expr" { + | compute_enable: function(value, oldval, varnum) { + foreach "$widget/path" { + const "varid","generate-id()"; + const "varnum","position()-1"; + if "@assign" foreach "$widget/path[@assign]" if "$varid = generate-id()" { + | if(varnum == «$varnum») this.assignments[«position()-1»] = value; + | let «@assign» = this.assignments[«position()-1»]; + | if(«@assign» == undefined) break; + | result = «$widget/@enable_expr»; apply "$widget", mode="widget_defs" with "hmi_element",".";
| })`if "position()!=last()" > ,`
@@ -187,7 +234,7 @@
placeholder.parentNode.insertBefore(elt, placeholder);
- function set_activation_state(eltsub, state){
+ function set_activity_state(eltsub, state){ if(eltsub.active_elt != undefined){
if(eltsub.active_elt_placeholder == undefined){
eltsub.active_elt_placeholder = document.createComment("");
@@ -204,35 +251,34 @@
- function activate_activable(eltsub) {
- set_activation_state(eltsub, true);
- function inactivate_activable(eltsub) {
- set_activation_state(eltsub, false);
frequency = 10; /* FIXME arbitrary default max freq. Obtain from config ? */
- constructor(elt_id, freq, args, indexes, minmaxes, members){
+ constructor(elt_id, freq, args, variables, enable_expr, members){ this.element_id = elt_id;
this.element = id(elt_id);
- this.indexes = indexes;
- this.minmaxes = minmaxes;
+ [this.indexes, this.variables_options] = (variables.length>0) ? zip(...variables) : [[],[]]; + this.indexes_length = this.indexes.length; + this.enable_expr = enable_expr; + this.enable_state = true; + this.enable_displayed_state = true; + this.enabled_elts = []; Object.keys(members).forEach(prop => this[prop]=members[prop]);
- this.lastapply = indexes.map(() => undefined);
- this.inhibit = indexes.map(() => undefined);
- this.pending = indexes.map(() => undefined);
+ this.lastapply = this.indexes.map(() => undefined); + this.inhibit = this.indexes.map(() => undefined); + this.pending = this.indexes.map(() => undefined); this.bound_uninhibit = this.uninhibit.bind(this);
- this.lastdispatch = indexes.map(() => undefined);
- this.deafen = indexes.map(() => undefined);
- this.incoming = indexes.map(() => undefined);
+ this.lastdispatch = this.indexes.map(() => undefined); + this.deafen = this.indexes.map(() => undefined); + this.incoming = this.indexes.map(() => undefined); this.bound_undeafen = this.undeafen.bind(this);
this.forced_frequency = freq;
@@ -267,30 +313,39 @@
+ this.enable_state = false; + this.enable_displayed_state = false; + for(let child of Array.from(this.element.children)){ + let label = child.getAttribute("inkscape:label"); + this.enabled_elts.push(child); + this.element.removeChild(child); - if(!this.unsubscribable)
- for(let i = 0; i < this.indexes.length; i++) {
- /* flush updates pending because of inhibition */
- let inhibition = this.inhibit[i];
- if(inhibition != undefined){
- clearTimeout(inhibition);
- this.lastapply[i] = undefined;
- let deafened = this.deafen[i];
- if(deafened != undefined){
- clearTimeout(deafened);
- this.lastdispatch[i] = undefined;
- let index = this.indexes[i];
- if(this.relativeness[i])
- subscribers(index).delete(this);
+ for(let i = 0; i < this.indexes_length; i++) { + /* flush updates pending because of inhibition */ + let inhibition = this.inhibit[i]; + if(inhibition != undefined){ + clearTimeout(inhibition); + this.lastapply[i] = undefined; + let deafened = this.deafen[i]; + if(deafened != undefined){ + clearTimeout(deafened); + this.lastdispatch[i] = undefined; + let index = this.get_variable_index(i); + subscribers(index).delete(this); this.relativeness = undefined;
@@ -300,23 +355,22 @@
this.relativeness = relativeness;
this.container_id = container_id ;
/* add this's subsribers */
- if(!this.unsubscribable)
- for(let i = 0; i < this.indexes.length; i++) {
- let index = this.get_variable_index(i);
- if(index == undefined) continue;
- subscribers(index).add(this);
- need_cache_apply.push(this);
+ for(let i = 0; i < this.indexes_length; i++) { + let index = this.get_variable_index(i); + if(index == undefined) continue; + subscribers(index).add(this); - if(!this.unsubscribable) for(let index in this.indexes){
+ for(let i = 0; i < this.indexes_length; i++) { /* dispatch current cache in newly opened page widgets */
- let realindex = this.get_variable_index(index);
+ let realindex = this.get_variable_index(i); if(realindex == undefined) continue;
let cached_val = cache[realindex];
if(cached_val != undefined)
- this._dispatch(cached_val, cached_val, index);
+ this.feed_data_for_dispatch(cached_val, cached_val, i); @@ -339,7 +393,7 @@
clip_min_max(index, new_val) {
- let minmax = this.minmaxes[index];
+ let minmax = this.variables_options[index].minmax; if(minmax !== undefined && typeof new_val == "number") {
@@ -402,12 +456,12 @@
new_hmi_value(index, value, oldval) {
// TODO avoid searching, store index at sub()
- for(let i = 0; i < this.indexes.length; i++) {
+ for(let i = 0; i < this.indexes_length; i++) { let refindex = this.get_variable_index(i);
if(refindex == undefined) continue;
- this._dispatch(value, oldval, i);
+ this.feed_data_for_dispatch(value, oldval, i); @@ -417,23 +471,57 @@
this.deafen[index] = undefined;
let [new_val, old_val] = this.incoming[index];
this.incoming[index] = undefined;
- this.dispatch(new_val, old_val, index);
+ this.do_dispatch(new_val, old_val, index); + if(this.enable_state != enabled){ + this.enable_state = enabled; + this.request_animate(); - _dispatch(value, oldval, varnum) {
- let dispatch = this.dispatch;
- if(dispatch != undefined){
+ if(this.enable_state && !this.enable_displayed_state){ + for(let child of this.enabled_elts){ + this.element.appendChild(child); + //hide disabled content + if(this.disabled_elt && this.disabled_elt.parentNode != null) + this.element.removeChild(this.disabled_elt); + this.enable_displayed_state = true; + }else if(!this.enable_state && this.enable_displayed_state){ + for(let child of this.enabled_elts){ + if(child.parentNode != null) + this.element.removeChild(child); + //show disabled content + this.element.appendChild(this.disabled_elt); + this.enable_displayed_state = false; + // once disabled activity display is lost + this.activity_displayed_state = undefined; + feed_data_for_dispatch(value, oldval, varnum) { + if(this.dispatch || this.enable_expr){ if(this.deafen[varnum] == undefined){
let min_interval = 1000/this.frequency;
let lastdispatch = this.lastdispatch[varnum];
if(lastdispatch == undefined || now > lastdispatch + min_interval){
this.lastdispatch[varnum] = now;
- dispatch.call(this, value, oldval, varnum);
+ this.do_dispatch(value, oldval, varnum) let elapsed = now - lastdispatch;
@@ -447,8 +535,29 @@
+ do_dispatch(value, oldval, varnum) { + if(this.dispatch) try { + this.dispatch(value, oldval, varnum); + if(this.enable_expr) try { + this.compute_enable(value, oldval, varnum);
+ // inhibit widget animation when disabled + if(!this.enable_expr || this.enable_state){ + this.animate_activity(); + if(this.animate != undefined) this.pending_animate = false;
@@ -460,8 +569,11 @@
- set_activation_state(state){
- set_activation_state(this.activable_sub, state);
+ if(this.activity_displayed_state != this.activity_state){ + set_activity_state(this.activable_sub, this.activity_state); + this.activity_displayed_state = this.activity_state; --- a/tests/projects/svghmi/plc.xml Tue Sep 13 16:51:54 2022 +0200
+++ b/tests/projects/svghmi/plc.xml Tue Sep 13 16:53:15 2022 +0200
@@ -1,7 +1,7 @@
<?xml version='1.0' encoding='utf-8'?>
<project xmlns:ns1="http://www.plcopen.org/xml/tc6_0201" xmlns:xhtml="http://www.w3.org/1999/xhtml" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns="http://www.plcopen.org/xml/tc6_0201">
<fileHeader companyName="Unknown" productName="Unnamed" productVersion="1" creationDateTime="2019-08-06T14:23:42"/>
- <contentHeader name="Unnamed" modificationDateTime="2022-07-21T11:39:43">
+ <contentHeader name="Unnamed" modificationDateTime="2022-08-31T11:57:03"> @@ -575,64 +575,6 @@
- <inVariable localId="2" executionOrderId="0" height="30" width="60" negated="false">
- <position x="240" y="190"/>
- <relPosition x="60" y="15"/>
- <expression>Sloth</expression>
- <outVariable localId="3" executionOrderId="0" height="30" width="75" negated="false">
- <position x="435" y="205"/>
- <relPosition x="0" y="15"/>
- <connection refLocalId="8" formalParameter="OUT">
- <position x="435" y="220"/>
- <position x="410" y="220"/>
- <expression>Pressure</expression>
- <block localId="8" typeName="DIV" executionOrderId="0" height="60" width="65">
- <position x="345" y="190"/>
- <variable formalParameter="IN1">
- <relPosition x="0" y="30"/>
- <connection refLocalId="2">
- <position x="345" y="220"/>
- <position x="335" y="220"/>
- <position x="335" y="205"/>
- <position x="300" y="205"/>
- <variable formalParameter="IN2">
- <relPosition x="0" y="50"/>
- <connection refLocalId="9">
- <position x="345" y="240"/>
- <position x="300" y="240"/>
- <variable formalParameter="OUT">
- <relPosition x="65" y="30"/>
- <inVariable localId="9" executionOrderId="0" height="30" width="60" negated="false">
- <position x="240" y="225"/>
- <relPosition x="60" y="15"/>
- <expression>100</expression>
<block localId="10" typeName="CONCAT" executionOrderId="0" height="60" width="65">
<position x="360" y="345"/>
@@ -688,7 +630,7 @@
<relPosition x="125" y="15"/>
- <expression>TargetPressure</expression>
+ <expression>Pressure</expression> <block localId="13" typeName="INT_TO_STRING" executionOrderId="0" height="40" width="115">
<position x="315" y="270"/>
--- a/tests/projects/svghmi/svghmi_0@svghmi/svghmi.svg Tue Sep 13 16:51:54 2022 +0200
+++ b/tests/projects/svghmi/svghmi_0@svghmi/svghmi.svg Tue Sep 13 16:53:15 2022 +0200
@@ -136,9 +136,9 @@
inkscape:current-layer="hmi0"
- inkscape:zoom="0.14174805"
- inkscape:cx="-1530.0784"
- inkscape:cy="-1404.9832"
+ inkscape:zoom="0.40092403" + inkscape:cx="323.58553" + inkscape:cy="-56.756946" inkscape:window-width="1600"
inkscape:window-height="836"
@@ -3240,7 +3240,7 @@
transform="matrix(0.57180538,0,0,0.57180538,1024.0513,-317.49049)"
- inkscape:label="HMI:Jump:RelativePageTest@/PUMP0"
+ inkscape:label="HMI:Jump:RelativePageTest@en=/PUMP0#en" inkscape:label="disabled"
@@ -3255,6 +3255,17 @@
style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:0.28600003;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;vector-effect:none;fill:#e6e6e6;fill-opacity:1;fill-rule:nonzero;stroke:#ff6600;stroke-width:5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
+ style="font-style:normal;font-weight:normal;font-size:40px;line-height:125%;font-family:sans-serif;text-align:center;letter-spacing:0px;word-spacing:0px;text-anchor:middle;display:inline;fill:#434343;fill-opacity:1;stroke:none;stroke-width:0.99999994px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" + id="text1454-0-7"><tspan + style="text-align:center;text-anchor:middle;fill:#434343;fill-opacity:1;stroke-width:0.99999994px" + id="tspan1460-3-5">Disabled</tspan></text> @@ -3269,6 +3280,17 @@
inkscape:label="button" />
+ style="font-style:normal;font-weight:normal;font-size:40px;line-height:125%;font-family:sans-serif;text-align:center;letter-spacing:0px;word-spacing:0px;text-anchor:middle;display:inline;fill:#ff6600;fill-opacity:1;stroke:none;stroke-width:0.99999994px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" + style="text-align:center;text-anchor:middle;fill:#ff6600;stroke-width:0.99999994px" + id="tspan1460-3">Inactive</tspan></text> @@ -3283,272 +3305,326 @@
style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;vector-effect:none;fill:#e6e6e6;fill-opacity:1;fill-rule:nonzero;stroke:#ff6600;stroke-width:5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
style="font-style:normal;font-weight:normal;font-size:40px;line-height:125%;font-family:sans-serif;text-align:center;letter-spacing:0px;word-spacing:0px;text-anchor:middle;display:inline;fill:#ff6600;fill-opacity:1;stroke:none;stroke-width:0.99999994px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
- inkscape:label="setting_jmp"><tspan
+ id="text1454-0-3"><tspan
style="text-align:center;text-anchor:middle;fill:#ff6600;stroke-width:0.99999994px"
- id="tspan1460-3">Pump</tspan></text>
- style="font-style:normal;font-weight:normal;font-size:39.32668304px;line-height:125%;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.24579209px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
- inkscape:label="HMI:Display@/PUMP0/STROUT"><tspan
- style="fill:#000000;fill-opacity:1;stroke-width:0.24579209px">8888</tspan></text>
+ id="tspan1460-3-6">Active</tspan></text> + style="font-style:normal;font-weight:normal;font-size:22.48720932px;line-height:125%;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.14054523px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" + inkscape:label="HMI:Display@/PUMP0/STROUT"><tspan + style="fill:#000000;fill-opacity:1;stroke-width:0.14054523px">8888</tspan></text> + style="font-style:normal;font-weight:normal;font-size:22.48720932px;line-height:125%;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.14054523px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" + inkscape:label="HMI:Display@/PUMP1/STROUT"><tspan + style="fill:#000000;fill-opacity:1;stroke-width:0.14054523px">8888</tspan></text>
- inkscape:label="HMI:Jump:RelativePageTest@/PUMP1"
- transform="matrix(0.57180538,0,0,0.57180538,1184.0513,-317.49049)">
+ transform="matrix(0.57180538,0,0,0.57180538,1184.0513,-317.49049)" + inkscape:label="HMI:Jump:RelativePageTest@en=/PUMP1#en"
- inkscape:label="disabled">
+ inkscape:label="disabled" + style="display:inline"> - style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:0.28600003;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;vector-effect:none;fill:#e6e6e6;fill-opacity:1;fill-rule:nonzero;stroke:#ff6600;stroke-width:5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+ inkscape:label="button" + style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:0.28600003;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;vector-effect:none;fill:#e6e6e6;fill-opacity:1;fill-rule:nonzero;stroke:#ff6600;stroke-width:5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" /> + style="font-style:normal;font-weight:normal;font-size:40px;line-height:125%;font-family:sans-serif;text-align:center;letter-spacing:0px;word-spacing:0px;text-anchor:middle;display:inline;fill:#434343;fill-opacity:1;stroke:none;stroke-width:0.99999994px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" + id="text1454-0-7-2"><tspan + style="text-align:center;text-anchor:middle;fill:#434343;fill-opacity:1;stroke-width:0.99999994px" + id="tspan1460-3-5-9">Disabled</tspan></text> + inkscape:label="inactive" + style="display:inline"> + style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;vector-effect:none;fill:#3d3d3d;fill-opacity:1;fill-rule:nonzero;stroke:#ff6600;stroke-width:5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" inkscape:label="button" />
+ style="font-style:normal;font-weight:normal;font-size:40px;line-height:125%;font-family:sans-serif;text-align:center;letter-spacing:0px;word-spacing:0px;text-anchor:middle;display:inline;fill:#ff6600;fill-opacity:1;stroke:none;stroke-width:0.99999994px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" + id="text1454-0-70"><tspan + style="text-align:center;text-anchor:middle;fill:#ff6600;stroke-width:0.99999994px" + id="tspan1460-3-9">Inactive</tspan></text> - inkscape:label="inactive"
+ inkscape:label="active"
- style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;vector-effect:none;fill:#3d3d3d;fill-opacity:1;fill-rule:nonzero;stroke:#ff6600;stroke-width:5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
- inkscape:label="active"
- style="display:inline">
- style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;vector-effect:none;fill:#e6e6e6;fill-opacity:1;fill-rule:nonzero;stroke:#ff6600;stroke-width:5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
- inkscape:label="button" />
- inkscape:label="setting_jmp"
- style="font-style:normal;font-weight:normal;font-size:40px;line-height:125%;font-family:sans-serif;text-align:center;letter-spacing:0px;word-spacing:0px;text-anchor:middle;display:inline;fill:#ff6600;fill-opacity:1;stroke:none;stroke-width:0.99999994px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
- xml:space="preserve"><tspan
- style="text-align:center;text-anchor:middle;fill:#ff6600;stroke-width:0.99999994px"
- id="tspan1477-6">Pump</tspan></text>
+ style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;vector-effect:none;fill:#e6e6e6;fill-opacity:1;fill-rule:nonzero;stroke:#ff6600;stroke-width:5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" /> - style="font-style:normal;font-weight:normal;font-size:39.32668304px;line-height:125%;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.24579208px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
- inkscape:label="HMI:Display@/PUMP1/STROUT"><tspan
+ style="font-style:normal;font-weight:normal;font-size:40px;line-height:125%;font-family:sans-serif;text-align:center;letter-spacing:0px;word-spacing:0px;text-anchor:middle;display:inline;fill:#ff6600;fill-opacity:1;stroke:none;stroke-width:0.99999994px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" + id="text1454-0-3-0"><tspan
- style="fill:#000000;fill-opacity:1;stroke-width:0.24579208px">8888</tspan></text>
+ style="text-align:center;text-anchor:middle;fill:#ff6600;stroke-width:0.99999994px" + id="tspan1460-3-6-6">Active</tspan></text> + style="font-style:normal;font-weight:normal;font-size:22.48720932px;line-height:125%;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.14054523px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" + inkscape:label="HMI:Display@/PUMP2/STROUT"><tspan + style="fill:#000000;fill-opacity:1;stroke-width:0.14054523px">8888</tspan></text> transform="matrix(0.57180538,0,0,0.57180538,1344.0513,-317.49049)"
- inkscape:label="HMI:Jump:RelativePageTest@/PUMP2"
+ inkscape:label="HMI:Jump:RelativePageTest@en=/PUMP2#en" inkscape:label="disabled"
+ style="display:inline">
style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:0.28600003;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;vector-effect:none;fill:#e6e6e6;fill-opacity:1;fill-rule:nonzero;stroke:#ff6600;stroke-width:5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
+ style="font-style:normal;font-weight:normal;font-size:40px;line-height:125%;font-family:sans-serif;text-align:center;letter-spacing:0px;word-spacing:0px;text-anchor:middle;display:inline;fill:#434343;fill-opacity:1;stroke:none;stroke-width:0.99999994px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" + id="text1454-0-7-8"><tspan + style="text-align:center;text-anchor:middle;fill:#434343;fill-opacity:1;stroke-width:0.99999994px" + id="tspan1460-3-5-7">Disabled</tspan></text>
- inkscape:label="inactive">
+ inkscape:label="inactive" + style="display:inline"> style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;vector-effect:none;fill:#3d3d3d;fill-opacity:1;fill-rule:nonzero;stroke:#ff6600;stroke-width:5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
inkscape:label="button" />
+ style="font-style:normal;font-weight:normal;font-size:40px;line-height:125%;font-family:sans-serif;text-align:center;letter-spacing:0px;word-spacing:0px;text-anchor:middle;display:inline;fill:#ff6600;fill-opacity:1;stroke:none;stroke-width:0.99999994px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" + id="text1454-0-2"><tspan + style="text-align:center;text-anchor:middle;fill:#ff6600;stroke-width:0.99999994px" + id="tspan1460-3-3">Inactive</tspan></text>
+ style="display:inline">
style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;vector-effect:none;fill:#e6e6e6;fill-opacity:1;fill-rule:nonzero;stroke:#ff6600;stroke-width:5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
style="font-style:normal;font-weight:normal;font-size:40px;line-height:125%;font-family:sans-serif;text-align:center;letter-spacing:0px;word-spacing:0px;text-anchor:middle;display:inline;fill:#ff6600;fill-opacity:1;stroke:none;stroke-width:0.99999994px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
- inkscape:label="setting_jmp"><tspan
+ id="text1454-0-3-9"><tspan
- style="text-align:center;text-anchor:middle;fill:#ff6600;stroke-width:0.99999994px">Pump</tspan></text>
- style="font-style:normal;font-weight:normal;font-size:39.32668304px;line-height:125%;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.24579208px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
- inkscape:label="HMI:Display@/PUMP2/STROUT"><tspan
- style="fill:#000000;fill-opacity:1;stroke-width:0.24579208px">8888</tspan></text>
+ style="text-align:center;text-anchor:middle;fill:#ff6600;stroke-width:0.99999994px" + id="tspan1460-3-6-2">Active</tspan></text> + style="font-style:normal;font-weight:normal;font-size:22.48720932px;line-height:125%;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.14054523px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" + inkscape:label="HMI:Display@/PUMP3/STROUT"><tspan + style="fill:#000000;fill-opacity:1;stroke-width:0.14054523px">8888</tspan></text>
- inkscape:label="HMI:Jump:RelativePageTest@/PUMP3"
- transform="matrix(0.57180538,0,0,0.57180538,1504.0513,-317.49049)">
+ transform="matrix(0.57180538,0,0,0.57180538,1504.0513,-317.49049)" + inkscape:label="HMI:Jump:RelativePageTest@en=/PUMP3#en"
inkscape:label="disabled"
- style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:0.28600003;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;vector-effect:none;fill:#e6e6e6;fill-opacity:1;fill-rule:nonzero;stroke:#ff6600;stroke-width:5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+ inkscape:label="button"
- inkscape:label="button" />
+ style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:0.28600003;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;vector-effect:none;fill:#e6e6e6;fill-opacity:1;fill-rule:nonzero;stroke:#ff6600;stroke-width:5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" /> + style="font-style:normal;font-weight:normal;font-size:40px;line-height:125%;font-family:sans-serif;text-align:center;letter-spacing:0px;word-spacing:0px;text-anchor:middle;display:inline;fill:#434343;fill-opacity:1;stroke:none;stroke-width:0.99999994px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" + id="text1454-0-7-3"><tspan + style="text-align:center;text-anchor:middle;fill:#434343;fill-opacity:1;stroke-width:0.99999994px" + id="tspan1460-3-5-6">Disabled</tspan></text>
inkscape:label="inactive"
style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;vector-effect:none;fill:#3d3d3d;fill-opacity:1;fill-rule:nonzero;stroke:#ff6600;stroke-width:5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
inkscape:label="button" />
+ style="font-style:normal;font-weight:normal;font-size:40px;line-height:125%;font-family:sans-serif;text-align:center;letter-spacing:0px;word-spacing:0px;text-anchor:middle;display:inline;fill:#ff6600;fill-opacity:1;stroke:none;stroke-width:0.99999994px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" + id="text1454-0-31"><tspan + style="text-align:center;text-anchor:middle;fill:#ff6600;stroke-width:0.99999994px" + id="tspan1460-3-94">Inactive</tspan></text>
style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;vector-effect:none;fill:#e6e6e6;fill-opacity:1;fill-rule:nonzero;stroke:#ff6600;stroke-width:5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
- inkscape:label="setting_jmp"
- style="font-style:normal;font-weight:normal;font-size:40px;line-height:125%;font-family:sans-serif;text-align:center;letter-spacing:0px;word-spacing:0px;text-anchor:middle;display:inline;fill:#ff6600;fill-opacity:1;stroke:none;stroke-width:0.99999994px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
- xml:space="preserve"><tspan
- style="text-align:center;text-anchor:middle;fill:#ff6600;stroke-width:0.99999994px"
- id="tspan1511-4">Pump</tspan><tspan
- style="text-align:center;text-anchor:middle;fill:#ff6600;stroke-width:0.99999994px"
- id="tspan1503-1" /></text>
- style="font-style:normal;font-weight:normal;font-size:39.32668304px;line-height:125%;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.24579208px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
- inkscape:label="HMI:Display@/PUMP3/STROUT"><tspan
+ style="font-style:normal;font-weight:normal;font-size:40px;line-height:125%;font-family:sans-serif;text-align:center;letter-spacing:0px;word-spacing:0px;text-anchor:middle;display:inline;fill:#ff6600;fill-opacity:1;stroke:none;stroke-width:0.99999994px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" + id="text1454-0-3-5"><tspan
- style="fill:#000000;fill-opacity:1;stroke-width:0.24579208px">8888</tspan></text>
+ style="text-align:center;text-anchor:middle;fill:#ff6600;stroke-width:0.99999994px" + id="tspan1460-3-6-0">Active</tspan></text> @@ -8450,4 +8526,35 @@
style="text-align:center;text-anchor:middle;fill:#ff6600;stroke-width:0.99999994px">up</tspan></text>
+ transform="translate(-940,-418)" + inkscape:label="HMI:Jump:Home:notify=42:plop="WTF"@notify=/SELECTION@plop=/PUMP0/STRIN" + inkscape:label="button" + sodipodi:nodetypes="cssssccc" + inkscape:connector-curvature="0" + d="m 1217.4113,1410.4016 -22,24.5657 c -10.7925,12.0511 6.1317,35.5791 -13.5791,35.5791 h -174.2877 c -19.71078,0 -2.7866,-23.528 -13.57905,-35.5791 l -22,-24.5657 127.74845,-48.4334 z" + style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;vector-effect:none;fill:#e6e6e6;fill-opacity:1;fill-rule:nonzero;stroke:#ff6600;stroke-width:5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" /> + inkscape:label="home_jmp" + style="font-style:normal;font-weight:normal;font-size:40px;line-height:125%;font-family:sans-serif;text-align:center;letter-spacing:0px;word-spacing:0px;text-anchor:middle;display:inline;fill:#ff6600;fill-opacity:1;stroke:none;stroke-width:0.99999994px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" + xml:space="preserve"><tspan + style="text-align:center;text-anchor:middle;fill:#ff6600;stroke-width:0.99999994px" + sodipodi:role="line">Home</tspan></text> --- a/tests/projects/svghmi_scrollbar/plc.xml Tue Sep 13 16:51:54 2022 +0200
+++ b/tests/projects/svghmi_scrollbar/plc.xml Tue Sep 13 16:53:15 2022 +0200
@@ -1,7 +1,7 @@
<?xml version='1.0' encoding='utf-8'?>
<project xmlns:ns1="http://www.plcopen.org/xml/tc6_0201" xmlns:xhtml="http://www.w3.org/1999/xhtml" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns="http://www.plcopen.org/xml/tc6_0201">
<fileHeader companyName="Unknown" productName="Unnamed" productVersion="1" creationDateTime="2019-08-06T14:23:42"/>
- <contentHeader name="Unnamed" modificationDateTime="2021-09-10T14:17:04">
+ <contentHeader name="Unnamed" modificationDateTime="2022-08-23T09:33:50"> --- a/tests/projects/svghmi_scrollbar/svghmi_0@svghmi/svghmi.svg Tue Sep 13 16:51:54 2022 +0200
+++ b/tests/projects/svghmi_scrollbar/svghmi_0@svghmi/svghmi.svg Tue Sep 13 16:53:15 2022 +0200
@@ -60,8 +60,8 @@
- inkscape:cx="476.03774"
- inkscape:cy="444.53549"
+ inkscape:cx="864.62819" + inkscape:cy="344.83986" inkscape:window-width="1600"
inkscape:window-height="836"
@@ -748,11 +748,18 @@
inkscape:label="HMI:ScrollBar\"
transform="translate(-202)">
+ id="desc150">@range=.range +#pos>10&&range>50 + inkscape:connector-curvature="0" + d="m 972,603 h 75 l -37.5,58 z m 37.5,-579.999998 37.5,58 H 972 Z M 969,236 h 81 V 407 H 969 Z M 960,84.000002 h 100 V 600 H 960 Z" + style="opacity:1;vector-effect:none;fill:none;fill-opacity:1;stroke:#000000;stroke-width:4;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:8, 8;stroke-dashoffset:0;stroke-opacity:1;marker:none" + inkscape:label="disabled" />