linse/frappy
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

params: move unit into datatypes, support for constant property

Browse Source 
Change-Id: Ida7c8b5fd7d508d41d3b44ea98600f27f7f57dbd
Reviewed-on: https://forge.frm2.tum.de/review/20243
Tested-by: JenkinsCodeReview <bjoern_pedersen@frm2.tum.de>
Reviewed-by: Enrico Faulhaber <enrico.faulhaber@frm2.tum.de>
This commit is contained in:
Enrico Faulhaber
2019-03-27 14:32:40 +01:00
parent 99f757bf78
commit 18586a3f09
4 changed files with 35 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
secop/params.py
View File

@ -94,17 +94,18 @@ class Parameter(Accessible):
# unit and datatype are not listed (handled separately)
valid_properties = dict()
for prop in ('description', 'readonly', 'group', 'visibility', 'fmtstr', 'precision'):
for prop in ('description', 'readonly', 'group', 'visibility', 'constant'):
valid_properties[prop] = prop
def __init__(self,
description,
datatype=None,
default=unset_value,
unit='',
readonly=True,
export=True,
poll=False,
unit=u'',
constant=None,
value=None, # swallow
timestamp=None, # swallow
optional=False,
@ -121,10 +122,10 @@ class Parameter(Accessible):
self.description = description
self.datatype = datatype
self.default = default
self.unit = unit
self.readonly = readonly
self.readonly = readonly if constant is None else True
self.export = export
self.optional = optional
self.constant = constant
# note: auto-converts True/False to 1/0 which yield the expected
# behaviour...
@ -132,6 +133,14 @@ class Parameter(Accessible):
for key in kwds:
if key not in self.valid_properties:
raise ProgrammingError('%s is not a valid parameter property' % key)
if constant is not None:
# The value of the `constant` property should be the
# serialised version of the constant, or unset
constant = self.datatype.validate(constant)
self.constant = self.datatype.export_value(constant)
# helper. unit should be set on the datatype, not on the parameter!
if unit:
self.datatype.unit = unit
self.__dict__.update(kwds)
# internal caching: value and timestamp of last change...
self.value = default
@ -149,6 +158,16 @@ class Parameter(Accessible):
def export_value(self):
return self.datatype.export_value(self.value)
def _get_unit_(self):
return self.datatype.unit
def _set_unit_(self, unit):
self.datatype.unit = unit
unit = property(_get_unit_, _set_unit_)
del _get_unit_
del _set_unit_
class Override(CountedObj):
"""Stores the overrides to be applied to a Parameter
@ -177,7 +196,13 @@ class Override(CountedObj):
if key not in props and key not in type(obj).valid_properties:
raise ProgrammingError( "%s is not a valid %s property" %
(key, type(obj).__name__))
if isinstance(obj, Parameter):
if u'constant' in self.kwds:
constant = obj.datatype.validate(self.kwds.pop(u'constant'))
self.kwds[u'constant'] = obj.datatype.export_value(constant)
self.kwds[u'readonly'] = True
props.update(self.kwds)
if self.reorder:
props['ctr'] = self.ctr
return type(obj)(**props)