Skip to content

Commit f72a3d6

Browse files
committed
feature: Allow gui to be None
For supporting DiamondLightSource/FastCS#142
1 parent d587a48 commit f72a3d6

File tree

1 file changed

+15
-13
lines changed

1 file changed

+15
-13
lines changed

src/fastcs_pandablocks/__init__.py

Lines changed: 15 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -19,21 +19,23 @@ def ioc(
1919
screens_directory: Path | None = None,
2020
poll_period: float = DEFAULT_POLL_PERIOD,
2121
):
22-
p4p_ioc_options = EpicsPVAOptions(ioc=EpicsIOCOptions(pv_prefix=pv_prefix))
23-
if screens_directory:
24-
if not screens_directory.is_dir():
25-
raise ValueError(
26-
f"`screens_directory` {screens_directory} is not a directory"
27-
)
28-
29-
gui_options = EpicsGUIOptions(
30-
output_path=screens_directory / "out.bob", title=pv_prefix
31-
)
32-
p4p_ioc_options.gui = gui_options
22+
if screens_directory and not screens_directory.is_dir():
23+
raise ValueError(f"`screens_directory` {screens_directory} is not a directory.")
24+
25+
epics_gui_options = (
26+
EpicsGUIOptions(output_path=screens_directory / "output.bob", title=pv_prefix)
27+
if screens_directory
28+
else None
29+
)
30+
31+
epics_pva_options = EpicsPVAOptions(
32+
ioc=EpicsIOCOptions(pv_prefix=pv_prefix), gui=epics_gui_options
33+
)
3334

3435
controller = PandaController(hostname, poll_period)
35-
transport = FastCS(controller, [p4p_ioc_options])
36-
transport.run()
36+
launcher = FastCS(controller, [epics_pva_options])
37+
launcher.create_gui()
38+
launcher.run()
3739

3840

3941
__all__ = ["__version__", "panda", "types", "DEFAULT_POLL_PERIOD"]

0 commit comments

Comments
 (0)