large-image-source-bioformats 1.30.4.dev2__py3-none-any.whl → 1.30.5__py3-none-any.whl

large_image_source_bioformats/__init__.py

@@ -509,13 +509,15 @@ class BioformatsFileTileSource(FileTileSource, metaclass=LruCacheMetaclass):
 
     def _computeMagnification(self):
         self._magnification = {}
-        metadata = self._metadata['metadata']
+        metadata = self._metadata.get('seriesMetadata', {}).copy()
+        metadata.update(self._metadata['metadata'])
         valuekeys = {
             'x': [('Scaling|Distance|Value #1', 1e3)],
             'y': [('Scaling|Distance|Value #2', 1e3)],
         }
         tuplekeys = [
             ('Physical pixel size', 1e-3),
+            ('0028,0030 Pixel Spacing', 1),
         ]
         magkeys = [
             'Information|Instrument|Objective|NominalMagnification #1',
@@ -528,11 +530,11 @@ class BioformatsFileTileSource(FileTileSource, metaclass=LruCacheMetaclass):
         if 'mm_x' not in self._magnification and 'mm_y' not in self._magnification:
             for key, units in tuplekeys:
                 if metadata.get(key):
-                    found = re.match(r'^\D*(\d+(|\.\d+))\D+(\d+(|\.\d+))\D*$', metadata[key])
+                    found = re.match(r'^[^0-9.]*(\d*\.?\d+)[^0-9.]+(\d*\.?\d+)\D*$', metadata[key])
                     if found:
                         try:
                             self._magnification['mm_x'], self._magnification['mm_y'] = (
-                                float(found.groups()[0]) * units, float(found.groups()[2]) * units)
+                                float(found.groups()[0]) * units, float(found.groups()[1]) * units)
                         except Exception:
                             pass
         for key in magkeys:

{large_image_source_bioformats-1.30.4.dev2.dist-info → large_image_source_bioformats-1.30.5.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: large-image-source-bioformats
-Version: 1.30.4.dev2
+Version: 1.30.5
 Summary: An bioformats tilesource for large_image.
 Home-page: https://github.com/girder/large_image
 Author: Kitware, Inc.
@@ -19,10 +19,10 @@ Classifier: Programming Language :: Python :: 3.13
 Requires-Python: >=3.8
 Description-Content-Type: text/x-rst
 License-File: LICENSE
-Requires-Dist: large-image>=1.30.4.dev2
+Requires-Dist: large-image>=1.30.5
 Requires-Dist: python-bioformats>=1.5.2
 Provides-Extra: girder
-Requires-Dist: girder-large-image>=1.30.4.dev2; extra == "girder"
+Requires-Dist: girder-large-image>=1.30.5; extra == "girder"
 
 An bioformats tilesource for large_image.
 

large_image_source_bioformats-1.30.5.dist-info/RECORD

@@ -0,0 +1,8 @@
+large_image_source_bioformats/__init__.py,sha256=FrnLn4Tpjfnk-bxOvbr6hxUWqar9nRYe8pzgkBc_vSQ,32406
+large_image_source_bioformats/girder_source.py,sha256=t0X1P0m4qMsRklpdxoPH-yqgHByMvQIzFJ4qRIUykVI,1355
+large_image_source_bioformats-1.30.5.dist-info/LICENSE,sha256=psuoW8kuDP96RQsdhzwOqi6fyWv0ct8CR6Jr7He_P_k,10173
+large_image_source_bioformats-1.30.5.dist-info/METADATA,sha256=rYI6S-YnnpIjLZu8EKiyPGMwnTxXJptBZ1a5UZevcbU,1103
+large_image_source_bioformats-1.30.5.dist-info/WHEEL,sha256=PZUExdf71Ui_so67QXpySuHtCi3-J3wvF4ORK6k_S8U,91
+large_image_source_bioformats-1.30.5.dist-info/entry_points.txt,sha256=xgIbKr53QhQkyRFkr87fkagfPWweeqhHHekUEMrcpF8,202
+large_image_source_bioformats-1.30.5.dist-info/top_level.txt,sha256=e0enjlcFXwPi638IhE71Rk5-eeriA7W3M3IsQ6yH3RI,30
+large_image_source_bioformats-1.30.5.dist-info/RECORD,,

large_image_source_bioformats-1.30.4.dev2.dist-info/RECORD

@@ -1,8 +0,0 @@
-large_image_source_bioformats/__init__.py,sha256=3ZHaTWSn_5HZf9VQPy9VIAsklvbXkm0sXh-wyQJhq7U,32283
-large_image_source_bioformats/girder_source.py,sha256=t0X1P0m4qMsRklpdxoPH-yqgHByMvQIzFJ4qRIUykVI,1355
-large_image_source_bioformats-1.30.4.dev2.dist-info/LICENSE,sha256=psuoW8kuDP96RQsdhzwOqi6fyWv0ct8CR6Jr7He_P_k,10173
-large_image_source_bioformats-1.30.4.dev2.dist-info/METADATA,sha256=kR7Vbv1xq7h9Abw_f9wFY1khbhSFUYpQkpg6o9jlWYg,1118
-large_image_source_bioformats-1.30.4.dev2.dist-info/WHEEL,sha256=PZUExdf71Ui_so67QXpySuHtCi3-J3wvF4ORK6k_S8U,91
-large_image_source_bioformats-1.30.4.dev2.dist-info/entry_points.txt,sha256=xgIbKr53QhQkyRFkr87fkagfPWweeqhHHekUEMrcpF8,202
-large_image_source_bioformats-1.30.4.dev2.dist-info/top_level.txt,sha256=e0enjlcFXwPi638IhE71Rk5-eeriA7W3M3IsQ6yH3RI,30
-large_image_source_bioformats-1.30.4.dev2.dist-info/RECORD,,