Skip to content

Commit a8805b9

Browse files
committed
chore: amend controller vector name
1 parent 3e8e43a commit a8805b9

File tree

4 files changed

+7
-9
lines changed

4 files changed

+7
-9
lines changed

src/fastcs/controller.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -206,7 +206,7 @@ async def disconnect(self) -> None:
206206
pass
207207

208208

209-
class SubControllerVector(MutableMapping[int, Controller], Controller):
209+
class ControllerVector(MutableMapping[int, Controller], Controller):
210210
"""A collection of SubControllers, with an arbitrary integer index.
211211
An instance of this class can be registered with a parent ``Controller`` to include
212212
it's children as part of a larger controller. Each child of the vector will keep

tests/example_p4p_ioc.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
from fastcs.attribute_io import AttributeIO
88
from fastcs.attribute_io_ref import AttributeIORef
99
from fastcs.attributes import AttrR, AttrRW, AttrW
10-
from fastcs.controller import Controller, SubControllerVector
10+
from fastcs.controller import Controller, ControllerVector
1111
from fastcs.datatypes import Bool, Enum, Float, Int, T, Table, Waveform
1212
from fastcs.launch import FastCS
1313
from fastcs.transport.epics.options import (
@@ -96,7 +96,7 @@ def run(pv_prefix="P4P_TEST_DEVICE"):
9696
p4p_options = EpicsPVATransport(pva_ioc=EpicsIOCOptions(pv_prefix=pv_prefix))
9797
controller = ParentController(ios=[simple_attribute_io])
9898

99-
class ChildVector(SubControllerVector):
99+
class ChildVector(ControllerVector):
100100
vector_attribute: AttrR = AttrR(Int())
101101

102102
def __init__(self, children, description=None):

tests/example_softioc.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
from pathlib import Path
22

33
from fastcs.attributes import AttrR, AttrRW, AttrW
4-
from fastcs.controller import Controller, SubControllerVector
4+
from fastcs.controller import Controller, ControllerVector
55
from fastcs.datatypes import Int
66
from fastcs.launch import FastCS
77
from fastcs.transport.epics.ca.transport import EpicsCATransport, EpicsGUIOptions
@@ -24,7 +24,7 @@ async def d(self):
2424

2525
def run(pv_prefix="SOFTIOC_TEST_DEVICE"):
2626
controller = ParentController()
27-
vector = SubControllerVector({i: ChildController() for i in range(2)})
27+
vector = ControllerVector({i: ChildController() for i in range(2)})
2828
controller.add_sub_controller("ChildVector", vector)
2929
gui_options = EpicsGUIOptions(
3030
output_path=Path(".") / "demo.bob", title="Demo Vector"

tests/transport/epics/pva/test_p4p.py

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
from p4p.nt import NTTable
1515

1616
from fastcs.attributes import AttrR, AttrRW, AttrW
17-
from fastcs.controller import Controller, SubControllerVector
17+
from fastcs.controller import Controller, ControllerVector
1818
from fastcs.datatypes import Bool, Enum, Float, Int, String, Table, Waveform
1919
from fastcs.launch import FastCS
2020
from fastcs.transport.epics.options import EpicsIOCOptions
@@ -275,9 +275,7 @@ class SomeController(Controller):
275275

276276
controller = SomeController()
277277

278-
sub_controller_vector = SubControllerVector(
279-
{i: ChildController() for i in range(3)}
280-
)
278+
sub_controller_vector = ControllerVector({i: ChildController() for i in range(3)})
281279

282280
controller.add_sub_controller("Child", sub_controller_vector)
283281

0 commit comments

Comments
 (0)