From 232f658e8b41bbf6e748dadd53e7e7a9f91f42a8 Mon Sep 17 00:00:00 2001 From: David Manthey Date: Thu, 29 Jun 2023 10:12:00 -0400 Subject: [PATCH] Newer openslide and vips libraries read dicom. --- large_image/tilesource/__init__.py | 3 ++- sources/dicom/large_image_source_dicom/__init__.py | 1 + test/test_source_base.py | 4 ++-- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/large_image/tilesource/__init__.py b/large_image/tilesource/__init__.py index ad3a823b7..aea07f555 100644 --- a/large_image/tilesource/__init__.py +++ b/large_image/tilesource/__init__.py @@ -29,7 +29,8 @@ def isGeospatial(path): """ if not len(AvailableTileSources): loadTileSources() - for source in AvailableTileSources.values(): + for sourceName in sorted(AvailableTileSources): + source = AvailableTileSources[sourceName] if hasattr(source, 'isGeospatial'): result = None try: diff --git a/sources/dicom/large_image_source_dicom/__init__.py b/sources/dicom/large_image_source_dicom/__init__.py index 34c93e7a3..62535e33e 100644 --- a/sources/dicom/large_image_source_dicom/__init__.py +++ b/sources/dicom/large_image_source_dicom/__init__.py @@ -94,6 +94,7 @@ class DICOMFileTileSource(FileTileSource, metaclass=LruCacheMetaclass): } nameMatches = { r'DCM_\d+$': SourcePriority.MEDIUM, + r'\d+(\.\d+){3,20}$': SourcePriority.MEDIUM, } _minTileSize = 64 diff --git a/test/test_source_base.py b/test/test_source_base.py index 423be0d03..a930ed0d0 100644 --- a/test/test_source_base.py +++ b/test/test_source_base.py @@ -59,7 +59,7 @@ 'ometiff': {'read': r'\.(ome\.tif.*)$'}, 'openjpeg': {'read': r'\.(jp2)$'}, 'openslide': { - 'read': r'\.(ptif|svs|tif.*|qptiff)$', + 'read': r'\.(ptif|svs|tif.*|qptiff|dcm)$', 'noread': r'(oahu|DDX58_AXL|huron\.image2_jpeg2k|landcover_sample|d042-353\.crop|US_Geo\.|extraoverview|imagej)', # noqa 'skipTiles': r'one_layer_missing', }, @@ -87,7 +87,7 @@ }, 'vips': { 'read': r'', - 'noread': r'\.(nc|nd2|yml|yaml|json|czi|png|svs|scn|dcm)$', + 'noread': r'\.(nc|nd2|yml|yaml|json|czi|png|svs|scn)$', 'skipTiles': r'(sample_image\.ptif|one_layer_missing_tiles|JK-kidney_B-gal_H3_4C_1-500sec\.jp2|extraoverview)' # noqa }, }