beremiz

SVGHMI: cosmetic fixes in button widget
svghmi
2020-12-07, Edouard Tisserant
a70a97196654
Parents 6b1b23971960
Children 9b50ffe6264a
SVGHMI: cosmetic fixes in button widget
1 files changed, 9 insertions(+), 11 deletions(-)
  • +9 -11
    svghmi/widget_button.ysl2
    • --- a/svghmi/widget_button.ysl2 Sat Dec 05 16:59:27 2020 +0100
    +++ b/svghmi/widget_button.ysl2 Mon Dec 07 09:49:34 2020 +0100
    @@ -10,7 +10,6 @@
    decl hmi_value(value);
    // State machine to drive HMI_BOOL on a potentially laggy connection
    -// TODO: make more robust in case other widget or PLC change value on their own
    const "_button_fsm" fsm {
    state "init" {
    on_dispatch "false" jump "released";
    @@ -57,13 +56,13 @@
    }
    template "state", mode="dispatch_transition" {
    | case "«@name»":
    - apply "on-dispatch";
    + apply "on-dispatch";
    | break;
    }
    template "on-dispatch" {
    - | if(value == «@value») {
    - apply "jump", mode="transition";
    - | }
    + | if(value == «@value») {
    + apply "jump", mode="transition";
    + | }
    }
    template "fsm", mode="mouse_transition" {
    @@ -79,8 +78,8 @@
    | break;
    }
    template "on-mouse" {
    - // up or down state is already assumed because apply statement filters it
    - apply "jump", mode="transition";
    + // up or down state is already assumed because apply statement filters it
    + apply "jump", mode="transition";
    }
    template "jump", mode="transition" {
    @@ -92,17 +91,17 @@
    apply "state", mode="actions";
    }
    template "state", mode="actions" {
    - | «@name»_action(){
    + | «@name»_action(){
    //| console.log("Entering state «@name»");
    apply "*", mode="actions";
    - | }
    + | }
    }
    template "show", mode="actions" {
    | this.display = "«@eltname»";
    | this.request_animate();
    }
    template "hmi-value", mode="actions" {
    - | this.apply_hmi_value(0, «@value»);
    + | this.apply_hmi_value(0, «@value»);
    }
    template "widget[@type='Button']", mode="widget_class"{
    @@ -153,5 +152,4 @@
    template "widget[@type='Button']", mode="widget_defs" {
    param "hmi_element";
    optional_labels("active inactive");
    - |,
    }