From d956a2fd5e698c6d3686f96cc78e2fc583221f25 Mon Sep 17 00:00:00 2001 From: Phil Howard Date: Wed, 2 Sep 2020 17:13:57 +0100 Subject: [PATCH] Avoid weird float addition, aaah --- examples/new/monitor.py | 7 +++++++ examples/new/settings.yml | 14 +++++++------- 2 files changed, 14 insertions(+), 7 deletions(-) diff --git a/examples/new/monitor.py b/examples/new/monitor.py index 0d55516..4c77ed9 100644 --- a/examples/new/monitor.py +++ b/examples/new/monitor.py @@ -306,6 +306,8 @@ class EditView(View): inc = option["inc"] limit = option["min"] value -= inc + if mode == "float": + value = round(value, option.get("round", 1)) if value < limit: value = limit setattr(object, prop, value) @@ -337,6 +339,8 @@ class EditView(View): inc = option["inc"] limit = option["max"] value += inc + if mode == "float": + value = round(value, option.get("round", 1)) if value > limit: value = limit setattr(object, prop, value) @@ -459,6 +463,7 @@ class ChannelEditView(ChannelView, EditView): "inc": 0.05, "min": 0, "max": 1.0, + "mode": "float", "format": lambda value: f"{value * 100:0.2f}%", "help": "Saturation at which alarm is triggered", }, @@ -475,6 +480,7 @@ class ChannelEditView(ChannelView, EditView): "inc": 0.5, "min": 1, "max": 27, + "mode": "float", "format": lambda value: f"{value:0.2f}Hz", "help": "Frequency for fully saturated soil", }, @@ -484,6 +490,7 @@ class ChannelEditView(ChannelView, EditView): "inc": 0.5, "min": 1, "max": 27, + "mode": "float", "format": lambda value: f"{value:0.2f}Hz", "help": "Frequency for fully dried soil", }, diff --git a/examples/new/settings.yml b/examples/new/settings.yml index c082be5..42c8f73 100644 --- a/examples/new/settings.yml +++ b/examples/new/settings.yml @@ -1,18 +1,18 @@ channel1: - dry_point: 27.5 + dry_point: 27 enabled: true warn_level: 0.4 - wet_point: 3.0 + wet_point: 3 channel2: - dry_point: 27.5 + dry_point: 27 enabled: true warn_level: 0.4 - wet_point: 3.0 + wet_point: 3 channel3: - dry_point: 27.5 + dry_point: 27 enabled: true warn_level: 0.4 - wet_point: 3.0 + wet_point: 3 general: alarm_enable: true - alarm_interval: 10.0 + alarm_interval: 10