changed signature of dicom read metadata

ArcanaFramework · Dec 7, 2023 · 9158916 · 9158916
1 parent 75aab0f
commit 9158916
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/extras/fileformats/extras/medimage/dicom.py b/extras/fileformats/extras/medimage/dicom.py
@@ -60,7 +60,7 @@ def dicom_dir_generate_sample_data(dcmdir: DicomDir, dest_dir: Path, seed: ty.Un
 
 
 @FileSet.generate_sample_data.register
-def dicom_set_generate_sample_data(dcm_series: DicomSeries, dest_dir: Path, seed: ty.Union[int, Random] = 0, stem: ty.Optional[str] = None) -> ty.Iterable[Path]:
+def dicom_series_generate_sample_data(dcm_series: DicomSeries, dest_dir: Path, seed: ty.Union[int, Random] = 0, stem: ty.Optional[str] = None) -> ty.Iterable[Path]:
     rng = Random(seed)
     dicom_dir = dicom_dir_generate_sample_data(dcm_series, dest_dir=mkdtemp(), seed=rng, stem=None)[0]
     stem = gen_filename(rng, stem=stem)

diff --git a/fileformats/medimage/dicom.py b/fileformats/medimage/dicom.py
@@ -46,12 +46,16 @@ def from_paths(
         dicoms, remaining = Dicom.from_paths(fspaths, common_ok=common_ok)
         series_dict = defaultdict(list)
         for dicom in dicoms:
-            series_dict[(str(dicom["StudyInstanceUID"]), str(dicom["SeriesNumber"]))].append(dicom)
+            series_dict[
+                (str(dicom["StudyInstanceUID"]), str(dicom["SeriesNumber"]))
+            ].append(dicom)
         return set([cls(s) for s in series_dict.values()]), remaining
 
 
 @FileSet.read_metadata.register
-def dicom_collection_read_metadata(collection: DicomCollection) -> ty.Mapping[str, ty.Any]:
+def dicom_collection_read_metadata(
+    collection: DicomCollection, selected_keys: ty.Optional[ty.Sequence[str]] = None
+) -> ty.Mapping[str, ty.Any]:
     # Collated DICOM headers across series
     collated = copy(collection.contents[0].metadata)
     for i, dicom in enumerate(collection.contents[1:], start=1):