beremiz

SVGHMI: Fixed support for frequency parsing in widget label

2022-01-19, Edouard Tisserant
04c4835ca376
Parents 3e162ea3c726
Children 2e84a2782295
SVGHMI: Fixed support for frequency parsing in widget label
2 files changed, 4 insertions(+), 4 deletions(-)
  • +2 -2
    svghmi/parse_labels.ysl2
  • +2 -2
    svghmi/widgets_common.ysl2
    • --- a/svghmi/parse_labels.ysl2 Tue Jan 18 11:35:05 2022 +0100
    +++ b/svghmi/parse_labels.ysl2 Wed Jan 19 08:51:45 2022 +0100
    @@ -34,7 +34,7 @@
    otherwise value "$args";
    }
    - const "freq", "substring-after($typefreq,':')";
    + const "freq", "substring-after($typefreq,'|')";
    const "_type", "substring-before($typefreq,'|')";
    const "type" choose {
    @@ -44,7 +44,7 @@
    if "$type" widget {
    attrib "id" > «$id»
    attrib "type" > «$type»
    - if "freq" attrib "frequency" > «$freq»
    + if "$freq" attrib "freq" > «$freq»
    foreach "str:split(substring-after($args, ':'), ':')" {
    arg {
    attrib "value" > «.»
    --- a/svghmi/widgets_common.ysl2 Tue Jan 18 11:35:05 2022 +0100
    +++ b/svghmi/widgets_common.ysl2 Wed Jan 19 08:51:45 2022 +0100
    @@ -84,8 +84,8 @@
    }
    const "freq" choose {
    - when "$widget/freq"
    - > «$widget/freq»
    + when "$widget/@freq"
    + > «$widget/@freq»
    otherwise
    > undefined
    }