wassname/scikit-image
1
0
Fork 0
mirror of https://github.com/wassname/scikit-image.git synced 2026-07-08 04:18:37 +08:00
Code Issues Packages Projects Releases Wiki Activity

complete default matrix initialization of geometric transforms

Browse Source
This commit is contained in:
Johannes Schönberger
2012-08-19 13:02:03 +02:00
parent 2724f50b4c
commit 195bdc8c00
1 changed files with 18 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
skimage/transform/_geometric.py
+18 -10
View File
@@ -105,7 +105,10 @@ class ProjectiveTransform(GeometricTransform):
coeffs = range(8)
def __init__(self, matrix=None):
if matrix is not None and matrix.shape != (3, 3):
if matrix is None:
# default to an identity transform
matrix = np.eye(3)
if matrix.shape != (3, 3):
raise ValueError("invalid shape of transformation matrix")
self._matrix = matrix
@@ -271,15 +274,16 @@ class AffineTransform(ProjectiveTransform):
def __init__(self, matrix=None, scale=None, rotation=None, shear=None,
translation=None):
self._matrix = matrix
params = any(param is not None
for param in (scale, rotation, shear, translation))
if params and matrix is not None:
raise ValueError("You cannot specify the transformation matrix and "
"the implicit parameters at the same time.")
elif matrix is not None and matrix.shape != (3, 3):
raise ValueError("Invalid shape of transformation matrix.")
elif matrix is not None:
if matrix.shape != (3, 3):
raise ValueError("Invalid shape of transformation matrix.")
self._matrix = matrix
elif params:
if scale is None:
scale = (1, 1)
@@ -298,7 +302,7 @@ class AffineTransform(ProjectiveTransform):
])
self._matrix[0:2, 2] = translation
else:
# Default to an identity transform
# default to an identity transform
self._matrix = np.eye(3)
@property
@@ -351,15 +355,16 @@ class SimilarityTransform(ProjectiveTransform):
def __init__(self, matrix=None, scale=None, rotation=None,
translation=None):
self._matrix = matrix
params = any(param is not None
for param in (scale, rotation, translation))
if params and matrix is not None:
raise ValueError("You cannot specify the transformation matrix and "
"the implicit parameters at the same time.")
elif matrix is not None and matrix.shape != (3, 3):
raise ValueError("Invalid shape of transformation matrix.")
elif matrix is not None:
if matrix.shape != (3, 3):
raise ValueError("Invalid shape of transformation matrix.")
self._matrix = matrix
elif params:
if scale is None:
scale = 1
@@ -376,7 +381,7 @@ class SimilarityTransform(ProjectiveTransform):
self._matrix *= scale
self._matrix[0:2, 2] = translation
else:
# Default to an identity transform
# default to an identity transform
self._matrix = np.eye(3)
def estimate(self, src, dst):
@@ -480,7 +485,10 @@ class PolynomialTransform(GeometricTransform):
"""
def __init__(self, params=None):
if params is not None and params.shape[0] != 2:
if params is None:
# default to transformation which preserves original coordinates
params = np.array([[0, 1, 0], [0, 0, 1]])
if params.shape[0] != 2:
raise ValueError("invalid shape of transformation parameters")
self._params = params