Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

add support to initialise NTEnum like NTScalar #154

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
Open

add support to initialise NTEnum like NTScalar #154

Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
1418001
add support to initialise NTEnum like NTScalar
m2es3h Aug 20, 2024
0303dc4
make NTEnum.wrap() logic similar to NTScalar.wrap(), add tests
Aug 22, 2024
d075fe2
Merge branch 'epics-base:master' into bugfix/ntenum_initialisation
m2es3h Sep 16, 2024
2220d84
Merge branch 'epics-base:master' into bugfix/ntenum_initialisation
m2es3h Oct 7, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 6 additions & 2 deletions src/p4p/nt/enum.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,8 +67,12 @@ def wrap(self, value, choices=None, **kws):
V['value.choices'] = choices

if isinstance(value, dict):
# assume dict of index and choices list
V.value = value
if value.keys() == set(['index', 'choices']):
m2es3h marked this conversation as resolved.
Show resolved Hide resolved
# assume dict for Value.value (index and choices list)
V.value = value
else:
# assume dict for Value
V = Value(self.type, value)
m2es3h marked this conversation as resolved.
Show resolved Hide resolved
self._choices = V['value.choices']
else:
# index or string
Expand Down