beremiz

SVGHMI: fix XY graph init (consequence of earlier change) + reindent

2022-11-24, Edouard Tisserant
9289fdda0222
Parents f41733be17a8
Children 6dc619fa28aaa9b787d84846
SVGHMI: fix XY graph init (consequence of earlier change) + reindent

Earlier change did modify the variables attributes (options) are stored in widget objects. XY graph uses variables' min and max to determine range.
1 files changed, 11 insertions(+), 10 deletions(-)
  • +11 -10
    svghmi/widget_xygraph.ysl2
    • --- a/svghmi/widget_xygraph.ysl2 Thu Nov 24 11:47:56 2022 +0100
    +++ b/svghmi/widget_xygraph.ysl2 Thu Nov 24 12:05:43 2022 +0100
    @@ -58,20 +58,21 @@
    let y_min = Infinity, y_max = -Infinity;
    // Compute visible Y range by merging fixed curves Y ranges
    - for(let minmax of this.minmaxes){
    - if(minmax){
    - let [min,max] = minmax;
    - if(min < y_min)
    - y_min = min;
    - if(max > y_max)
    - y_max = max;
    - }
    + for(let varopts of this.variables_options){
    + let minmax = varopts.minmax
    + if(minmax){
    + let [min,max] = minmax;
    + if(min < y_min)
    + y_min = min;
    + if(max > y_max)
    + y_max = max;
    + }
    }
    if(y_min !== Infinity && y_max !== -Infinity){
    - this.fixed_y_range = true;
    + this.fixed_y_range = true;
    } else {
    - this.fixed_y_range = false;
    + this.fixed_y_range = false;
    }
    this.ymin = y_min;