Skip to content

Commit 171e6c0

Browse files
committed
io1_unit: read both signal/image text files
1 parent 1cc482a commit 171e6c0

File tree

1 file changed

+21
-12
lines changed

1 file changed

+21
-12
lines changed

cdl/tests/features/common/io1_unit.py

Lines changed: 21 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -11,48 +11,57 @@
1111

1212
# guitest: show
1313

14+
from __future__ import annotations
15+
1416
from guidata.qthelpers import qt_app_context
1517

1618
from cdl.core.io.image import funcs as image_funcs
1719
from cdl.env import execenv
18-
from cdl.obj import read_signal
20+
from cdl.obj import ImageObj, SignalObj, read_image, read_signal
1921
from cdl.utils.tests import try_open_test_data
2022
from cdl.utils.vistools import view_curve_items, view_images
2123

2224

25+
def __read_obj(fname: str) -> SignalObj | ImageObj:
26+
"""Read an object from a file"""
27+
if "curve_formats" in fname:
28+
return read_signal(fname)
29+
return read_image(fname)
30+
31+
2332
@try_open_test_data("Testing TXT file reader", "*.txt")
24-
def open_txt(fname=None):
33+
def open_txt(fname: str | None = None) -> None:
2534
"""Testing TXT files"""
26-
signal = read_signal(fname)
27-
execenv.print(signal)
28-
view_curve_items([signal.make_item()])
35+
obj = __read_obj(fname)
36+
execenv.print(obj)
37+
view_curve_items([obj.make_item()])
2938

3039

3140
@try_open_test_data("Testing CSV file reader", "*.csv")
32-
def open_csv(fname=None):
41+
def open_csv(fname: str | None = None) -> None:
3342
"""Testing CSV files"""
34-
signal = read_signal(fname)
35-
execenv.print(signal)
36-
view_curve_items([signal.make_item()])
43+
obj = __read_obj(fname)
44+
execenv.print(obj)
45+
view_curve_items([obj.make_item()])
3746

3847

3948
@try_open_test_data("Testing SIF file handler", "*.sif")
40-
def open_sif(fname=None):
49+
def open_sif(fname: str | None = None) -> None:
4150
"""Testing SIF files"""
4251
execenv.print(image_funcs.SIFFile(fname))
4352
data = image_funcs.imread_sif(fname)[0]
4453
view_images(data)
4554

4655

4756
@try_open_test_data("Testing SCOR-DATA file handler", "*.scor-data")
48-
def open_scordata(fname=None):
57+
def open_scordata(fname: str | None = None) -> None:
4958
"""Testing SCOR-DATA files"""
5059
execenv.print(image_funcs.SCORFile(fname))
5160
data = image_funcs.imread_scor(fname)
5261
view_images(data)
5362

5463

55-
def test_io1():
64+
def test_io1() -> None:
5665
"""I/O test"""
5766
with qt_app_context():
5867
open_txt()

0 commit comments

Comments
 (0)