large-image-source-multi 1.35.8.dev20__tar.gz → 1.35.8.dev24__tar.gz
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- {large_image_source_multi-1.35.8.dev20/large_image_source_multi.egg-info → large_image_source_multi-1.35.8.dev24}/PKG-INFO +3 -3
- {large_image_source_multi-1.35.8.dev20 → large_image_source_multi-1.35.8.dev24}/large_image_source_multi/__init__.py +34 -10
- {large_image_source_multi-1.35.8.dev20 → large_image_source_multi-1.35.8.dev24/large_image_source_multi.egg-info}/PKG-INFO +3 -3
- large_image_source_multi-1.35.8.dev24/large_image_source_multi.egg-info/requires.txt +9 -0
- large_image_source_multi-1.35.8.dev20/large_image_source_multi.egg-info/requires.txt +0 -9
- {large_image_source_multi-1.35.8.dev20 → large_image_source_multi-1.35.8.dev24}/LICENSE +0 -0
- {large_image_source_multi-1.35.8.dev20 → large_image_source_multi-1.35.8.dev24}/README.rst +0 -0
- {large_image_source_multi-1.35.8.dev20 → large_image_source_multi-1.35.8.dev24}/docs/specification.rst +0 -0
- {large_image_source_multi-1.35.8.dev20 → large_image_source_multi-1.35.8.dev24}/large_image_source_multi/girder_source.py +0 -0
- {large_image_source_multi-1.35.8.dev20 → large_image_source_multi-1.35.8.dev24}/large_image_source_multi.egg-info/SOURCES.txt +0 -0
- {large_image_source_multi-1.35.8.dev20 → large_image_source_multi-1.35.8.dev24}/large_image_source_multi.egg-info/dependency_links.txt +0 -0
- {large_image_source_multi-1.35.8.dev20 → large_image_source_multi-1.35.8.dev24}/large_image_source_multi.egg-info/entry_points.txt +0 -0
- {large_image_source_multi-1.35.8.dev20 → large_image_source_multi-1.35.8.dev24}/large_image_source_multi.egg-info/scm_file_list.json +0 -0
- {large_image_source_multi-1.35.8.dev20 → large_image_source_multi-1.35.8.dev24}/large_image_source_multi.egg-info/top_level.txt +0 -0
- {large_image_source_multi-1.35.8.dev20 → large_image_source_multi-1.35.8.dev24}/pyproject.toml +0 -0
- {large_image_source_multi-1.35.8.dev20 → large_image_source_multi-1.35.8.dev24}/setup.cfg +0 -0
- {large_image_source_multi-1.35.8.dev20 → large_image_source_multi-1.35.8.dev24}/setup.py +0 -0
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
Metadata-Version: 2.4
|
|
2
2
|
Name: large-image-source-multi
|
|
3
|
-
Version: 1.35.8.
|
|
3
|
+
Version: 1.35.8.dev24
|
|
4
4
|
Summary: A tilesource for large_image to composite other tile sources
|
|
5
5
|
Home-page: https://github.com/girder/large_image
|
|
6
6
|
Author: Kitware, Inc.
|
|
@@ -19,12 +19,12 @@ Requires-Python: >=3.10
|
|
|
19
19
|
Description-Content-Type: text/x-rst
|
|
20
20
|
License-File: LICENSE
|
|
21
21
|
Requires-Dist: jsonschema
|
|
22
|
-
Requires-Dist: large-image>=1.35.8.
|
|
22
|
+
Requires-Dist: large-image>=1.35.8.dev24
|
|
23
23
|
Requires-Dist: pyyaml
|
|
24
24
|
Provides-Extra: all
|
|
25
25
|
Requires-Dist: scikit-image; extra == "all"
|
|
26
26
|
Provides-Extra: girder
|
|
27
|
-
Requires-Dist: girder-large-image>=1.35.8.
|
|
27
|
+
Requires-Dist: girder-large-image>=1.35.8.dev24; extra == "girder"
|
|
28
28
|
Dynamic: author
|
|
29
29
|
Dynamic: author-email
|
|
30
30
|
Dynamic: classifier
|
|
@@ -60,6 +60,30 @@ def _lazyImportSkimageTransform():
|
|
|
60
60
|
raise TileSourceError(msg)
|
|
61
61
|
|
|
62
62
|
|
|
63
|
+
def _estimateTransform(cls, src, dst):
|
|
64
|
+
"""
|
|
65
|
+
Estimate a scikit-image transform from corresponding points. This uses
|
|
66
|
+
from_estimate when available (scikit-image >= 0.26) and estimate
|
|
67
|
+
otherwise.
|
|
68
|
+
|
|
69
|
+
:param cls: a scikit-image transform class, such as AffineTransform.
|
|
70
|
+
:param src: an array of source points.
|
|
71
|
+
:param dst: an array of destination points.
|
|
72
|
+
:returns: an instance of the transform class.
|
|
73
|
+
"""
|
|
74
|
+
if hasattr(cls, 'from_estimate'):
|
|
75
|
+
transformer = cls.from_estimate(src, dst)
|
|
76
|
+
if not transformer:
|
|
77
|
+
msg = f'Cannot compute the warp transform: {transformer}'
|
|
78
|
+
raise TileSourceError(msg)
|
|
79
|
+
return transformer
|
|
80
|
+
transformer = cls()
|
|
81
|
+
if not transformer.estimate(src, dst):
|
|
82
|
+
msg = f'Cannot compute the warp transform: {cls.__name__} estimation failed'
|
|
83
|
+
raise TileSourceError(msg)
|
|
84
|
+
return transformer
|
|
85
|
+
|
|
86
|
+
|
|
63
87
|
SourceEntrySchema = {
|
|
64
88
|
'type': 'object',
|
|
65
89
|
'additionalProperties': True,
|
|
@@ -697,12 +721,12 @@ class MultiFileTileSource(FileTileSource, metaclass=LruCacheMetaclass):
|
|
|
697
721
|
m[0][2] += warp_dst[0][0] - warp_src[0][0]
|
|
698
722
|
m[1][2] += warp_dst[0][1] - warp_src[0][1]
|
|
699
723
|
elif useSimilarity:
|
|
700
|
-
transformer =
|
|
701
|
-
|
|
724
|
+
transformer = _estimateTransform(
|
|
725
|
+
skimage_transform.SimilarityTransform, warp_src, warp_dst)
|
|
702
726
|
m = transformer.params
|
|
703
727
|
elif warp_src.shape[0] <= 3:
|
|
704
|
-
transformer =
|
|
705
|
-
|
|
728
|
+
transformer = _estimateTransform(
|
|
729
|
+
skimage_transform.AffineTransform, warp_src, warp_dst)
|
|
706
730
|
m = np.dot(transformer.params, m)
|
|
707
731
|
else:
|
|
708
732
|
warp_dst = np.dot(m, np.hstack([warp_dst, np.ones((len(warp_dst), 1))]).T).T[:, :2]
|
|
@@ -757,8 +781,8 @@ class MultiFileTileSource(FileTileSource, metaclass=LruCacheMetaclass):
|
|
|
757
781
|
if warp is None:
|
|
758
782
|
transcorners = np.dot(m, corners.T)
|
|
759
783
|
elif skimage_transform is not None:
|
|
760
|
-
transformer =
|
|
761
|
-
|
|
784
|
+
transformer = _estimateTransform(
|
|
785
|
+
skimage_transform.ThinPlateSplineTransform, warp.get('src'), warp.get('dst'))
|
|
762
786
|
# We might want to adjust the number of points based on some
|
|
763
787
|
# criteria such as source image size or number of warp points
|
|
764
788
|
corners = self._perimeterPoints(x0, y0, x1, y1, 8)
|
|
@@ -1272,8 +1296,8 @@ class MultiFileTileSource(FileTileSource, metaclass=LruCacheMetaclass):
|
|
|
1272
1296
|
dstcorners = corners
|
|
1273
1297
|
srccorners = np.dot(np.linalg.inv(transform), np.array(corners).T).T.tolist()
|
|
1274
1298
|
else:
|
|
1275
|
-
transformer =
|
|
1276
|
-
|
|
1299
|
+
transformer = _estimateTransform(
|
|
1300
|
+
skimage_transform.ThinPlateSplineTransform, warp_dst, warp_src)
|
|
1277
1301
|
# Is there any way to be smarter about the sampling?
|
|
1278
1302
|
dstcorners = self._perimeterPoints(0, 0, outw, outh, 8)
|
|
1279
1303
|
srccorners = transformer(dstcorners)
|
|
@@ -1373,8 +1397,8 @@ class MultiFileTileSource(FileTileSource, metaclass=LruCacheMetaclass):
|
|
|
1373
1397
|
if warp is None:
|
|
1374
1398
|
transformer = skimage_transform.AffineTransform(np.linalg.inv(transform))
|
|
1375
1399
|
else:
|
|
1376
|
-
transformer =
|
|
1377
|
-
|
|
1400
|
+
transformer = _estimateTransform(
|
|
1401
|
+
skimage_transform.ThinPlateSplineTransform, warp_dst, warp_src)
|
|
1378
1402
|
# skimage.transform.warp is faster and has less artifacts than
|
|
1379
1403
|
# scipy.ndimage.affine_transform. It is faster than using cupy's
|
|
1380
1404
|
# version of scipy's affine_transform when the source and destination
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
Metadata-Version: 2.4
|
|
2
2
|
Name: large-image-source-multi
|
|
3
|
-
Version: 1.35.8.
|
|
3
|
+
Version: 1.35.8.dev24
|
|
4
4
|
Summary: A tilesource for large_image to composite other tile sources
|
|
5
5
|
Home-page: https://github.com/girder/large_image
|
|
6
6
|
Author: Kitware, Inc.
|
|
@@ -19,12 +19,12 @@ Requires-Python: >=3.10
|
|
|
19
19
|
Description-Content-Type: text/x-rst
|
|
20
20
|
License-File: LICENSE
|
|
21
21
|
Requires-Dist: jsonschema
|
|
22
|
-
Requires-Dist: large-image>=1.35.8.
|
|
22
|
+
Requires-Dist: large-image>=1.35.8.dev24
|
|
23
23
|
Requires-Dist: pyyaml
|
|
24
24
|
Provides-Extra: all
|
|
25
25
|
Requires-Dist: scikit-image; extra == "all"
|
|
26
26
|
Provides-Extra: girder
|
|
27
|
-
Requires-Dist: girder-large-image>=1.35.8.
|
|
27
|
+
Requires-Dist: girder-large-image>=1.35.8.dev24; extra == "girder"
|
|
28
28
|
Dynamic: author
|
|
29
29
|
Dynamic: author-email
|
|
30
30
|
Dynamic: classifier
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
{large_image_source_multi-1.35.8.dev20 → large_image_source_multi-1.35.8.dev24}/pyproject.toml
RENAMED
|
File without changes
|
|
File without changes
|
|
File without changes
|