Skip to content

Commit de5082e

Browse files
committed
I/O: worker argument has to be optional in read methods
1 parent 75fe66d commit de5082e

File tree

6 files changed

+20
-9
lines changed

6 files changed

+20
-9
lines changed

cdl/core/io/base.py

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -257,7 +257,9 @@ def get_filter(self, action: IOAction) -> str:
257257
return ""
258258
return f"{self.info.name} ({self.info.extensions})"
259259

260-
def read(self, filename: str, worker: CallbackWorker) -> list[BaseObj]:
260+
def read(
261+
self, filename: str, worker: CallbackWorker | None = None
262+
) -> list[BaseObj]:
261263
"""Read list of native objects (signal or image) from file.
262264
For single object, return a list with one object.
263265

cdl/core/io/image/base.py

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,9 @@ def create_object(filename: str, index: int | None = None) -> ImageObj:
4848
name += f" {index:02d}"
4949
return create_image(name)
5050

51-
def read(self, filename: str, worker: CallbackWorker) -> list[ImageObj]:
51+
def read(
52+
self, filename: str, worker: CallbackWorker | None = None
53+
) -> list[ImageObj]:
5254
"""Read list of image objects from file
5355
5456
Args:

cdl/core/io/image/formats.py

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -156,7 +156,9 @@ class AndorSIFImageFormat(ImageFormatBase):
156156
writeable=False,
157157
)
158158

159-
def read(self, filename: str, worker: CallbackWorker) -> list[ImageObj]:
159+
def read(
160+
self, filename: str, worker: CallbackWorker | None = None
161+
) -> list[ImageObj]:
160162
"""Read list of image objects from file
161163
162164
Args:
@@ -173,9 +175,10 @@ def read(self, filename: str, worker: CallbackWorker) -> list[ImageObj]:
173175
obj = self.create_object(filename, index=idx)
174176
obj.data = data[idx, ::]
175177
objlist.append(obj)
176-
worker.set_progress((idx + 1) / data.shape[0])
177-
if worker.was_canceled():
178-
break
178+
if worker is not None:
179+
worker.set_progress((idx + 1) / data.shape[0])
180+
if worker.was_canceled():
181+
break
179182
return objlist
180183
obj = self.create_object(filename)
181184
obj.data = data

cdl/core/io/signal/base.py

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,9 @@ def create_signals_from(self, xydata: np.ndarray, filename: str) -> list[SignalO
8181
objs.append(obj)
8282
return objs
8383

84-
def read(self, filename: str, worker: CallbackWorker) -> list[SignalObj]:
84+
def read(
85+
self, filename: str, worker: CallbackWorker | None = None
86+
) -> list[SignalObj]:
8587
"""Read list of signal objects from file
8688
8789
Args:

cdl/core/io/signal/formats.py

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,9 @@ class CSVSignalFormat(SignalFormatBase):
3131
writeable=True,
3232
)
3333

34-
def read(self, filename: str, worker: CallbackWorker) -> list[SignalObj]:
34+
def read(
35+
self, filename: str, worker: CallbackWorker | None = None
36+
) -> list[SignalObj]:
3537
"""Read list of signal objects from file
3638
3739
Args:

cdl/core/io/signal/funcs.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@ def read_csv_by_chunks(
107107

108108
def read_csv(
109109
filename: str,
110-
worker: CallbackWorker,
110+
worker: CallbackWorker | None = None,
111111
) -> tuple[
112112
np.ndarray, str | None, str | None, list[str] | None, list[str] | None, str | None
113113
]:

0 commit comments

Comments
 (0)