Skip to content

Commit 39a17f3

Browse files
author
Peter Braun
committed
fix property skippings
1 parent d1e710a commit 39a17f3

File tree

3 files changed

+14
-2
lines changed

3 files changed

+14
-2
lines changed

cfg/ophyd_secop_test_cfg.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@
2828
"test module for reading String signals in Bluesky RE",
2929
group="test",
3030
value="blah",
31+
3132
)
3233

3334

@@ -67,6 +68,7 @@
6768
"frappy_modules.ophyd_secop_test_modules.OPHYD_test_primitive_arrays",
6869
"simulated hardware for testing handling of arays of primitives",
6970
value=10.3,
71+
plotly={"data": [{"y": [1, 2, 3, 4]}], "layout": {"title": "A Plotly Graph"}},
7072
)
7173

7274

frappy_modules/ophyd_secop_test_modules.py

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
import time
44

55
import numpy as np
6-
from frappy.core import Command, Drivable, IntRange, Parameter, Readable, StructOf
6+
from frappy.core import Command, Drivable, IntRange, Parameter, Readable, Property
77
from frappy.datatypes import (
88
ArrayOf,
99
BoolType,
@@ -12,6 +12,8 @@
1212
StatusType,
1313
StringType,
1414
TupleOf,
15+
StructOf,
16+
ValueType
1517
)
1618
from frappy.errors import ImpossibleError
1719
from frappy.lib import clamp, mkthread
@@ -21,6 +23,8 @@
2123

2224

2325
class Test_Mod_str(Readable):
26+
27+
2428
Status = Enum(Readable.Status)
2529

2630
status = Parameter(datatype=StatusType(Status))
@@ -125,6 +129,12 @@ def write_writable_strct_of_arr(self, val):
125129

126130

127131
class OPHYD_test_primitive_arrays(Readable):
132+
plotly = Property(
133+
"JSON object defining Plotly graph",
134+
datatype=ValueType(),
135+
export="always",
136+
default={},
137+
)
128138

129139
value = Parameter("struct Value", datatype=FloatRange(), default=1.0, readonly=True)
130140
arr_int = Parameter(

src/secop_ophyd/SECoPDevices.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -260,7 +260,7 @@ def __init__(
260260
if property == "implementation":
261261
self.impl = module_desc["properties"]["implementation"]
262262

263-
if property in ["meaning", "plotly"]:
263+
if property in ["meaning", "_plotly"]:
264264
continue
265265

266266
propb = PropertyBackend(property, module_desc["properties"], secclient)

0 commit comments

Comments
 (0)