Newer openslide and vips libraries read dicom.

girder · Jun 29, 2023 · 232f658 · 232f658
1 parent 8c2f5c6
commit 232f658
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 3 deletions.
diff --git 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
@@ -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
@@ -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
     },
 }