large-image-source-multi 1.29.5.dev38__tar.gz → 1.29.5.dev43__tar.gz

{large-image-source-multi-1.29.5.dev38/large_image_source_multi.egg-info → large-image-source-multi-1.29.5.dev43}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: large-image-source-multi
-Version: 1.29.5.dev38
+Version: 1.29.5.dev43
 Summary: A tilesource for large_image to composite other tile sources
 Home-page: https://github.com/girder/large_image
 Author: Kitware, Inc.
@@ -18,12 +18,12 @@ Classifier: Programming Language :: Python :: 3.12
 Requires-Python: >=3.6
 License-File: LICENSE
 Requires-Dist: jsonschema
-Requires-Dist: large-image>=1.29.5.dev38
+Requires-Dist: large-image>=1.29.5.dev43
 Requires-Dist: pyyaml
 Provides-Extra: all
 Requires-Dist: scikit-image; extra == "all"
 Provides-Extra: girder
-Requires-Dist: girder-large-image>=1.29.5.dev38; extra == "girder"
+Requires-Dist: girder-large-image>=1.29.5.dev43; extra == "girder"
 
 A tilesource for large_image to composite other tile sources
 

{large-image-source-multi-1.29.5.dev38 → large-image-source-multi-1.29.5.dev43}/large_image_source_multi/__init__.py

@@ -684,9 +684,15 @@ class MultiFileTileSource(FileTileSource, metaclass=LruCacheMetaclass):
             aKey = tuple(self._axisKey(source, frame.get(f'Index{axis.upper()}') or 0, axis)
                          for axis in self._axesList)
             channel = channels[cIdx] if cIdx < len(channels) else None
+            # We add the channel name to our channel list if the individual
+            # source lists the channel name or a set of channels OR the source
+            # appends channels to an existing set.
             if channel and channel not in self._channels and (
-                    'channel' in source or 'channels' in source):
+                    'channel' in source or 'channels' in source or
+                    len(self._channels) == aKey[0]):
                 self._channels.append(channel)
+            # Adjust the channel number if the source named the channel; do not
+            # do so in other cases
             if (channel and channel in self._channels and
                     'c' not in source and 'cValues' not in source):
                 aKey = tuple([self._channels.index(channel)] + list(aKey[1:]))

{large-image-source-multi-1.29.5.dev38 → large-image-source-multi-1.29.5.dev43/large_image_source_multi.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: large-image-source-multi
-Version: 1.29.5.dev38
+Version: 1.29.5.dev43
 Summary: A tilesource for large_image to composite other tile sources
 Home-page: https://github.com/girder/large_image
 Author: Kitware, Inc.
@@ -18,12 +18,12 @@ Classifier: Programming Language :: Python :: 3.12
 Requires-Python: >=3.6
 License-File: LICENSE
 Requires-Dist: jsonschema
-Requires-Dist: large-image>=1.29.5.dev38
+Requires-Dist: large-image>=1.29.5.dev43
 Requires-Dist: pyyaml
 Provides-Extra: all
 Requires-Dist: scikit-image; extra == "all"
 Provides-Extra: girder
-Requires-Dist: girder-large-image>=1.29.5.dev38; extra == "girder"
+Requires-Dist: girder-large-image>=1.29.5.dev43; extra == "girder"
 
 A tilesource for large_image to composite other tile sources
 

large-image-source-multi-1.29.5.dev43/large_image_source_multi.egg-info/requires.txt

@@ -0,0 +1,9 @@
+jsonschema
+large-image>=1.29.5.dev43
+pyyaml
+
+[all]
+scikit-image
+
+[girder]
+girder-large-image>=1.29.5.dev43

large-image-source-multi-1.29.5.dev38/large_image_source_multi.egg-info/requires.txt

@@ -1,9 +0,0 @@
-jsonschema
-large-image>=1.29.5.dev38
-pyyaml
-
-[all]
-scikit-image
-
-[girder]
-girder-large-image>=1.29.5.dev38