Skip to content

Commit 99d3dc4

Browse files
authored
fix: allow c before p in axis orders in MDASequenceWidget (#489)
1 parent e0b50cb commit 99d3dc4

2 files changed

Lines changed: 11 additions & 1 deletion

File tree

src/pymmcore_widgets/useq_widgets/_mda_sequence.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,6 @@ def _check_order(x: str, first: str, second: str) -> bool:
4646
for first, second in (
4747
("t", "z"), # t cannot come after z
4848
("p", "g"), # p cannot come after g
49-
("p", "c"), # p cannot come after c
5049
("p", "z"), # p cannot come after z
5150
("g", "z"), # g cannot come after z
5251
):

tests/useq_widgets/test_useq_widgets.py

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -121,6 +121,14 @@ def test_data_table(qtbot: QtBot) -> None:
121121
keep_shutter_open_across=("z",),
122122
)
123123

124+
MDA_CP = useq.MDASequence(
125+
time_plan=useq.TIntervalLoops(interval=timedelta(seconds=2), loops=2),
126+
stage_positions=[(0, 0), (100, 100)],
127+
channels=[{"config": "DAPI", "exposure": 42}, {"config": "FITC", "exposure": 20}],
128+
z_plan=useq.ZRangeAround(range=4, step=0.5),
129+
axis_order="tcpz",
130+
)
131+
124132

125133
def test_mda_wdg(qtbot: QtBot):
126134
wdg = MDASequenceWidget()
@@ -133,6 +141,9 @@ def test_mda_wdg(qtbot: QtBot):
133141
wdg.setValue(SUB_SEQ)
134142
assert wdg.value().replace(metadata={}) == SUB_SEQ
135143

144+
wdg.setValue(MDA_CP)
145+
assert wdg.value().replace(metadata={}) == MDA_CP
146+
136147

137148
@pytest.mark.parametrize("ext", ["json", "yaml", "foo"])
138149
def test_mda_wdg_load_save(

0 commit comments

Comments
 (0)