large-image-source-dicom 1.27.1.dev5__tar.gz → 1.27.1.dev7__tar.gz

{large-image-source-dicom-1.27.1.dev5 → large-image-source-dicom-1.27.1.dev7}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: large-image-source-dicom
-Version: 1.27.1.dev5
+Version: 1.27.1.dev7
 Summary: A DICOM tilesource for large_image.
 Home-page: https://github.com/girder/large_image
 Author: Kitware, Inc.

{large-image-source-dicom-1.27.1.dev5 → large-image-source-dicom-1.27.1.dev7}/large_image_source_dicom/__init__.py

@@ -48,6 +48,13 @@ def _lazyImport():
         warnings.filterwarnings('ignore', category=UserWarning, module='pydicom')
 
 
+def _lazyImportPydicom():
+    global pydicom
+
+    if pydicom is None:
+        import pydicom
+
+
 def dicom_to_dict(ds, base=None):
     """
     Convert a pydicom dataset to a fairly flat python dictionary for purposes
@@ -134,7 +141,7 @@ class DICOMFileTileSource(FileTileSource, metaclass=LruCacheMetaclass):
             self._largeImagePath = [
                 os.path.join(root, entry) for entry in os.listdir(root)
                 if os.path.isfile(os.path.join(root, entry)) and
-                self._pathMightBeDicom(entry, path)]
+                self._pathMightBeDicom(os.path.join(root, entry), path)]
             if (path not in self._largeImagePath and
                     os.path.join(root, os.path.basename(path)) not in self._largeImagePath):
                 self._largeImagePath = [path]
@@ -213,19 +220,38 @@ class DICOMFileTileSource(FileTileSource, metaclass=LruCacheMetaclass):
         :param path: the path to check.
         :returns: True if this might be a dicom, False otherwise.
         """
+        mightbe = False
+        origpath = path
         path = os.path.basename(path)
         if (basepath is not None and
                 os.path.splitext(os.path.basename(basepath))[-1][1:] not in self.extensions):
             if os.path.splitext(path)[-1] == os.path.splitext(os.path.basename(basepath))[-1]:
-                return True
+                mightbe = True
         elif os.path.splitext(path)[-1][1:] in self.extensions:
 
-            return True
-        if re.match(r'^([1-9][0-9]*|0)(\.([1-9][0-9]*|0))+$', path) and len(path) <= 64:
-            return True
-        if re.match(r'^DCM_\d+$', path):
-            return True
-        return False
+            mightbe = True
+        if (not mightbe and re.match(r'^([1-9][0-9]*|0)(\.([1-9][0-9]*|0))+$', path) and
+                len(path) <= 64):
+            mightbe = True
+        if not mightbe and re.match(r'^DCM_\d+$', path):
+            mightbe = True
+        if mightbe and basepath:
+            try:
+                _lazyImportPydicom()
+                base_series_uid = pydicom.filereader.dcmread(
+                    basepath, stop_before_pixels=True,
+                )[pydicom.tag.Tag('SeriesInstanceUID')].value
+            except Exception:
+                base_series_uid = None
+            if base_series_uid:
+                try:
+                    series_uid = pydicom.filereader.dcmread(
+                        origpath, stop_before_pixels=True,
+                    )[pydicom.tag.Tag('SeriesInstanceUID')].value
+                    mightbe = base_series_uid == series_uid
+                except Exception:
+                    mightbe = False
+        return mightbe
 
     def getNativeMagnification(self):
         """

{large-image-source-dicom-1.27.1.dev5 → large-image-source-dicom-1.27.1.dev7}/large_image_source_dicom/girder_source.py

@@ -53,7 +53,7 @@ class DICOMGirderTileSource(DICOMFileTileSource, GirderTileSource):
         for item in Folder().childItems(folder):
             if len(list(Item().childFiles(item, limit=2))) == 1:
                 file = next(Item().childFiles(item, limit=2))
-                if self._pathMightBeDicom(file['name']):
+                if self._pathMightBeDicom(File().getLocalFilePath(file)):
                     filelist.append(File().getLocalFilePath(file))
         return filelist
 

{large-image-source-dicom-1.27.1.dev5 → large-image-source-dicom-1.27.1.dev7}/large_image_source_dicom.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: large-image-source-dicom
-Version: 1.27.1.dev5
+Version: 1.27.1.dev7
 Summary: A DICOM tilesource for large_image.
 Home-page: https://github.com/girder/large_image
 Author: Kitware, Inc.

large-image-source-dicom-1.27.1.dev7/large_image_source_dicom.egg-info/requires.txt

@@ -0,0 +1,5 @@
+large-image>=1.27.1.dev7
+wsidicom>=0.9.0
+
+[girder]
+girder-large-image>=1.27.1.dev7

large-image-source-dicom-1.27.1.dev5/large_image_source_dicom.egg-info/requires.txt

@@ -1,5 +0,0 @@
-large-image>=1.27.1.dev5
-wsidicom>=0.9.0
-
-[girder]
-girder-large-image>=1.27.1.dev5