large-image-source-multi 1.33.6.dev35__tar.gz → 1.33.6.dev39__tar.gz

{large_image_source_multi-1.33.6.dev35/large_image_source_multi.egg-info → large_image_source_multi-1.33.6.dev39}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: large-image-source-multi
-Version: 1.33.6.dev35
+Version: 1.33.6.dev39
 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 @@ Requires-Python: >=3.10
 Description-Content-Type: text/x-rst
 License-File: LICENSE
 Requires-Dist: jsonschema
-Requires-Dist: large-image>=1.33.6.dev35
+Requires-Dist: large-image>=1.33.6.dev39
 Requires-Dist: pyyaml
 Provides-Extra: all
 Requires-Dist: scikit-image; extra == "all"
 Provides-Extra: girder
-Requires-Dist: girder-large-image>=1.33.6.dev35; extra == "girder"
+Requires-Dist: girder-large-image>=1.33.6.dev39; extra == "girder"
 Dynamic: author
 Dynamic: author-email
 Dynamic: classifier

{large_image_source_multi-1.33.6.dev35 → large_image_source_multi-1.33.6.dev39}/large_image_source_multi/__init__.py

@@ -285,9 +285,10 @@ SourceEntrySchema = {
                 },
                 'warp': {
                     'description':
-                        'An object describing a series of landmarks which have both '
-                        'a source location and a destination location. These sets of points '
-                        'define a warp (thin plate spline or affine transform) that will '
+                        'An object describing a series of landmarks which '
+                        'have both a source location and a destination '
+                        'location. These sets of points define a warp (thin '
+                        'plate spline (TPS) or affine transform) that will '
                         'be applied to the source image.',
                     'type': 'object',
                     'properties': {
@@ -682,11 +683,23 @@ class MultiFileTileSource(FileTileSource, metaclass=LruCacheMetaclass):
         warp_dst = np.array(warp_dst or []).astype(float)
         warp_src = warp_src[:min(warp_src.shape[0], warp_dst.shape[0]), :]
         warp_dst = warp_dst[:warp_src.shape[0], :]
+
+        useSimilarity = False
+        if len(warp_src) > 0 and len(warp_dst) > 0:
+            srcsvd = np.linalg.svd(warp_src - warp_src.mean(axis=0), compute_uv=False)
+            dstsvd = np.linalg.svd(warp_dst - warp_dst.mean(axis=0), compute_uv=False)
+            useSimilarity = warp_src.shape[0] < 3 or min(
+                srcsvd[1] / (srcsvd[0] or 1), dstsvd[1] / (dstsvd[0] or 1)) < 1e-3
+
         if warp_src.shape[0] < 1:
             pass
         elif warp_src.shape[0] == 1:
             m[0][2] += warp_dst[0][0] - warp_src[0][0]
             m[1][2] += warp_dst[0][1] - warp_src[0][1]
+        elif useSimilarity:
+            transformer = skimage_transform.SimilarityTransform()
+            transformer.estimate(warp_src, warp_dst)
+            m = transformer.params
         elif warp_src.shape[0] <= 3:
             transformer = skimage_transform.AffineTransform()
             transformer.estimate(warp_src, warp_dst)

{large_image_source_multi-1.33.6.dev35 → large_image_source_multi-1.33.6.dev39/large_image_source_multi.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: large-image-source-multi
-Version: 1.33.6.dev35
+Version: 1.33.6.dev39
 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 @@ Requires-Python: >=3.10
 Description-Content-Type: text/x-rst
 License-File: LICENSE
 Requires-Dist: jsonschema
-Requires-Dist: large-image>=1.33.6.dev35
+Requires-Dist: large-image>=1.33.6.dev39
 Requires-Dist: pyyaml
 Provides-Extra: all
 Requires-Dist: scikit-image; extra == "all"
 Provides-Extra: girder
-Requires-Dist: girder-large-image>=1.33.6.dev35; extra == "girder"
+Requires-Dist: girder-large-image>=1.33.6.dev39; extra == "girder"
 Dynamic: author
 Dynamic: author-email
 Dynamic: classifier

large_image_source_multi-1.33.6.dev39/large_image_source_multi.egg-info/requires.txt

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

large_image_source_multi-1.33.6.dev35/large_image_source_multi.egg-info/requires.txt

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