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

revert 'change to new visibility spec'

Browse Source 
nicos is not yet ready for this

Change-Id: Ibfbb7e32e06a6e0616ded8342bc5844fd531944f
This commit is contained in:
zolliker 2025-04-24 11:08:34 +02:00
parent dc87a50c76
commit 9a818ab40b
3 changed files with 10 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
frappy/datatypes.py
View File

@ -1238,16 +1238,6 @@ class OrType(DataType):
raise WrongTypeError(f"Invalid Value, must conform to one of {', '.join(str(t) for t in self.types)}") raise WrongTypeError(f"Invalid Value, must conform to one of {', '.join(str(t) for t in self.types)}")
LEGACY_VISIBILITY = {'user': 'www', 1: 'www', 'advanced': 'ww-', 2: 'ww-', 'expert': 'w--', 3: 'w--'}
def visibility_validator(value):
value = LEGACY_VISIBILITY.get(value, value)
if len(value) == 3 and set(value) <= set('wr-'):
return value
raise RangeError(f'{value!r} is not a valid visibility')
Int8 = IntRange(-(1 << 7), (1 << 7) - 1) Int8 = IntRange(-(1 << 7), (1 << 7) - 1)
Int16 = IntRange(-(1 << 15), (1 << 15) - 1) Int16 = IntRange(-(1 << 15), (1 << 15) - 1)
Int32 = IntRange(-(1 << 31), (1 << 31) - 1) Int32 = IntRange(-(1 << 31), (1 << 31) - 1)

10
frappy/modulebase.py
View File

@ -27,9 +27,9 @@ import time
import threading import threading
from collections import OrderedDict from collections import OrderedDict
from frappy.datatypes import ArrayOf, BoolType, FloatRange, IntRange, NoneOr, \ from frappy.datatypes import ArrayOf, BoolType, EnumType, FloatRange, \
StringType, TextType, TupleOf, ValueType, visibility_validator IntRange, StringType, TextType, TupleOf, \
NoneOr
from frappy.errors import BadValueError, CommunicationFailedError, ConfigError, \ from frappy.errors import BadValueError, CommunicationFailedError, ConfigError, \
ProgrammingError, SECoPError, secop_error, RangeError ProgrammingError, SECoPError, secop_error, RangeError
from frappy.lib import formatException, mkthread, UniqueObject from frappy.lib import formatException, mkthread, UniqueObject
@ -306,8 +306,8 @@ class Module(HasAccessibles):
description = Property('description of the module', TextType(), extname='description', mandatory=True) description = Property('description of the module', TextType(), extname='description', mandatory=True)
meaning = Property('optional meaning indicator', TupleOf(StringType(), IntRange(0, 50)), meaning = Property('optional meaning indicator', TupleOf(StringType(), IntRange(0, 50)),
default=('', 0), extname='meaning') default=('', 0), extname='meaning')
visibility = Property('optional visibility hint', ValueType(visibility_validator), visibility = Property('optional visibility hint', EnumType('visibility', user=1, advanced=2, expert=3),
default='www', extname='visibility') default='user', extname='visibility')
implementation = Property('internal name of the implementation class of the module', StringType(), implementation = Property('internal name of the implementation class of the module', StringType(),
extname='implementation') extname='implementation')
interface_classes = Property('offical highest interface-class of the module', ArrayOf(StringType()), interface_classes = Property('offical highest interface-class of the module', ArrayOf(StringType()),

10
frappy/params.py
View File

@ -26,7 +26,7 @@ import inspect
from frappy.datatypes import ArrayOf, BoolType, CommandType, DataType, \ from frappy.datatypes import ArrayOf, BoolType, CommandType, DataType, \
DataTypeType, EnumType, FloatRange, NoneOr, OrType, StringType, StructOf, \ DataTypeType, EnumType, FloatRange, NoneOr, OrType, StringType, StructOf, \
TextType, TupleOf, ValueType, visibility_validator TextType, TupleOf, ValueType
from frappy.errors import BadValueError, ProgrammingError, WrongTypeError from frappy.errors import BadValueError, ProgrammingError, WrongTypeError
from frappy.lib import generalConfig from frappy.lib import generalConfig
from frappy.properties import HasProperties, Property from frappy.properties import HasProperties, Property
@ -152,8 +152,8 @@ class Parameter(Accessible):
'optional parameter group this parameter belongs to', StringType(), 'optional parameter group this parameter belongs to', StringType(),
extname='group', default='') extname='group', default='')
visibility = Property( visibility = Property(
'optional visibility hint', ValueType(visibility_validator), 'optional visibility hint', EnumType('visibility', user=1, advanced=2, expert=3),
extname='visibility', default='www') extname='visibility', default=1)
constant = Property( constant = Property(
'optional constant value for constant parameters', ValueType(), 'optional constant value for constant parameters', ValueType(),
extname='constant', default=None) extname='constant', default=None)
@ -367,8 +367,8 @@ class Command(Accessible):
'optional command group of the command.', StringType(), 'optional command group of the command.', StringType(),
extname='group', export=True, default='') extname='group', export=True, default='')
visibility = Property( visibility = Property(
'optional visibility hint', ValueType(visibility_validator), 'optional visibility hint', EnumType('visibility', user=1, advanced=2, expert=3),
extname='visibility', export=True, default='www') extname='visibility', export=True, default=1)
export = Property( export = Property(
'''[internal] export settings '''[internal] export settings