From: Philipp Klaus Date: Tue, 12 Sep 2017 16:24:02 +0000 (+0200) Subject: DASH: add HOPR,LOPR,HIGH,LOW,HIHI,LOLO to local state X-Git-Url: https://jspc29.x-matter.uni-frankfurt.de/git/?a=commitdiff_plain;h=4e96d3ce454de9316869a74cf56e1b8c355a802c;p=mvd_epics.git DASH: add HOPR,LOPR,HIGH,LOW,HIHI,LOLO to local state --- diff --git a/python_suite/dashboard/dashboard.py b/python_suite/dashboard/dashboard.py index ff8d700..661cc2c 100755 --- a/python_suite/dashboard/dashboard.py +++ b/python_suite/dashboard/dashboard.py @@ -103,6 +103,24 @@ def cb_value_update(**kwargs): pv['num_value'] = float('nan') pv['char_value'] = 'invalid' register_pv_value_in_history(kwargs['pvname'], kwargs['timestamp'], pv['num_value']) + if kwargs['upper_disp_limit'] != kwargs['lower_disp_limit']: + pv['upper_disp_limit'] = kwargs['upper_disp_limit'] + pv['lower_disp_limit'] = kwargs['lower_disp_limit'] + else: + pv['upper_disp_limit'] = float('nan') + pv['lower_disp_limit'] = float('nan') + if kwargs['upper_alarm_limit'] != kwargs['lower_alarm_limit']: + pv['upper_alarm_limit'] = kwargs['upper_alarm_limit'] + pv['lower_alarm_limit'] = kwargs['lower_alarm_limit'] + else: + pv['upper_alarm_limit'] = float('nan') + pv['lower_alarm_limit'] = float('nan') + if kwargs['upper_warning_limit'] != kwargs['lower_warning_limit']: + pv['upper_warning_limit'] = kwargs['upper_warning_limit'] + pv['lower_warning_limit'] = kwargs['lower_warning_limit'] + else: + pv['upper_warning_limit'] = float('nan') + pv['lower_warning_limit'] = float('nan') pv['precision'] = kwargs['precision'] #if type(kwargs['precision']) == int and ('double' in kwargs['type'] or 'float' in kwargs['type']): # pv['value'] = round(pv['value'], kwargs['precision'])