[yt-svn] commit/yt: 3 new changesets
commits-noreply at bitbucket.org
commits-noreply at bitbucket.org
Mon Oct 5 11:56:07 PDT 2015
3 new commits in yt:
https://bitbucket.org/yt_analysis/yt/commits/c707b54bcff1/
Changeset: c707b54bcff1
Branch: yt
User: jisuoqing
Date: 2015-09-25 03:56:45+00:00
Summary: Fix unit error in project_to_plane for (stereo)perspective lens
Affected #: 1 file
diff -r 48ae4275ed75e7a4dc3ca2112fdd3431907bbc67 -r c707b54bcff15dc1d25fdf92bcb13736399b120f yt/visualization/volume_rendering/lens.py
--- a/yt/visualization/volume_rendering/lens.py
+++ b/yt/visualization/volume_rendering/lens.py
@@ -222,12 +222,11 @@
def project_to_plane(self, camera, pos, res=None):
if res is None:
res = camera.resolution
- sight_vector = pos - camera.position
+ sight_vector = pos - camera.position.d
pos1 = sight_vector
for i in range(0, sight_vector.shape[0]):
sight_vector_norm = np.sqrt(np.dot(sight_vector[i], sight_vector[i]))
sight_vector[i] = sight_vector[i] / sight_vector_norm
- sight_vector = sight_vector.d
sight_center = camera.position + camera.width[2] * camera.unit_vectors[2]
for i in range(0, sight_vector.shape[0]):
@@ -242,12 +241,14 @@
np.sqrt(1 - sight_angle_cos**2)
pos1[i] = camera.position + sight_length * sight_vector[i]
- dx = np.dot(pos1 - sight_center, camera.unit_vectors[0])
- dy = np.dot(pos1 - sight_center, camera.unit_vectors[1])
- dz = np.dot(pos1 - sight_center, camera.unit_vectors[2])
+ dx = np.dot(pos1 - sight_center.d, camera.unit_vectors[0])
+ dy = np.dot(pos1 - sight_center.d, camera.unit_vectors[1])
+ dz = np.dot(pos1 - sight_center.d, camera.unit_vectors[2])
# Transpose into image coords.
- px = (res[0] * 0.5 + res[0] / camera.width[0] * dx).astype('int')
- py = (res[1] * 0.5 + res[1] / camera.width[1] * dy).astype('int')
+ px = (res[0] * 0.5 + res[0] / camera.width[0].d * dx).astype('int')
+ py = (res[1] * 0.5 + res[1] / camera.width[1].d * dy).astype('int')
+ px = (px * 0.25).astype('int')
+ py = (py * 0.25).astype('int')
return px, py, dz
def __repr__(self):
@@ -363,6 +364,9 @@
if res is None:
res = camera.resolution
+ if self.disparity is None:
+ self.disparity = camera.width[0] / 2.e3
+
px_left, py_left, dz_left = self._get_px_py_dz(camera, pos, res, -self.disparity)
px_right, py_right, dz_right = self._get_px_py_dz(camera, pos, res, self.disparity)
@@ -380,20 +384,19 @@
north_vec = camera.unit_vectors[1]
normal_vec = camera.unit_vectors[2]
- angle_disparity = - np.arctan2(disparity, camera.width[2])
+ angle_disparity = - np.arctan2(disparity.d, camera.width[2].d)
R = get_rotation_matrix(angle_disparity, north_vec)
east_vec_rot = np.dot(R, east_vec)
normal_vec_rot = np.dot(R, normal_vec)
camera_position_shift = camera.position + east_vec * disparity
- sight_vector = pos - camera_position_shift
+ sight_vector = pos - camera_position_shift.d
pos1 = sight_vector
for i in range(0, sight_vector.shape[0]):
sight_vector_norm = np.sqrt(np.dot(sight_vector[i], sight_vector[i]))
sight_vector[i] = sight_vector[i] / sight_vector_norm
- sight_vector = sight_vector.d
sight_center = camera_position_shift + camera.width[2] * normal_vec_rot
for i in range(0, sight_vector.shape[0]):
@@ -408,12 +411,12 @@
np.sqrt(1 - sight_angle_cos**2)
pos1[i] = camera_position_shift + sight_length * sight_vector[i]
- dx = np.dot(pos1 - sight_center, east_vec_rot)
- dy = np.dot(pos1 - sight_center, north_vec)
- dz = np.dot(pos1 - sight_center, normal_vec_rot)
+ dx = np.dot(pos1 - sight_center.d, east_vec_rot)
+ dy = np.dot(pos1 - sight_center.d, north_vec)
+ dz = np.dot(pos1 - sight_center.d, normal_vec_rot)
# Transpose into image coords.
- px = (res0_h * 0.5 + res0_h / camera.width[0] * dx).astype('int')
- py = (res[1] * 0.5 + res[1] / camera.width[1] * dy).astype('int')
+ px = (res0_h * 0.5 + res0_h / camera.width[0].d * dx).astype('int')
+ py = (res[1] * 0.5 + res[1] / camera.width[1].d * dy).astype('int')
return px, py, dz
https://bitbucket.org/yt_analysis/yt/commits/02e556565b5e/
Changeset: 02e556565b5e
Branch: yt
User: jisuoqing
Date: 2015-09-25 03:58:23+00:00
Summary: Fix typo
Affected #: 1 file
diff -r c707b54bcff15dc1d25fdf92bcb13736399b120f -r 02e556565b5efb6e5090c64601b3369fd70412b5 yt/visualization/volume_rendering/lens.py
--- a/yt/visualization/volume_rendering/lens.py
+++ b/yt/visualization/volume_rendering/lens.py
@@ -247,8 +247,6 @@
# Transpose into image coords.
px = (res[0] * 0.5 + res[0] / camera.width[0].d * dx).astype('int')
py = (res[1] * 0.5 + res[1] / camera.width[1].d * dy).astype('int')
- px = (px * 0.25).astype('int')
- py = (py * 0.25).astype('int')
return px, py, dz
def __repr__(self):
https://bitbucket.org/yt_analysis/yt/commits/52b57ac913dd/
Changeset: 52b57ac913dd
Branch: yt
User: ngoldbaum
Date: 2015-10-05 18:55:57+00:00
Summary: Merged in jisuoqing/yt (pull request #1770)
[bugfix, experimental head] Fix the unit error in project_to_plane for (stereo)perspective lens
Affected #: 1 file
diff -r f8934e13abaf349f58c52c076320d44ee4f61a7f -r 52b57ac913dd7e334914c7e8985f35ebb1618346 yt/visualization/volume_rendering/lens.py
--- a/yt/visualization/volume_rendering/lens.py
+++ b/yt/visualization/volume_rendering/lens.py
@@ -222,12 +222,11 @@
def project_to_plane(self, camera, pos, res=None):
if res is None:
res = camera.resolution
- sight_vector = pos - camera.position
+ sight_vector = pos - camera.position.d
pos1 = sight_vector
for i in range(0, sight_vector.shape[0]):
sight_vector_norm = np.sqrt(np.dot(sight_vector[i], sight_vector[i]))
sight_vector[i] = sight_vector[i] / sight_vector_norm
- sight_vector = sight_vector.d
sight_center = camera.position + camera.width[2] * camera.unit_vectors[2]
for i in range(0, sight_vector.shape[0]):
@@ -242,12 +241,12 @@
np.sqrt(1 - sight_angle_cos**2)
pos1[i] = camera.position + sight_length * sight_vector[i]
- dx = np.dot(pos1 - sight_center, camera.unit_vectors[0])
- dy = np.dot(pos1 - sight_center, camera.unit_vectors[1])
- dz = np.dot(pos1 - sight_center, camera.unit_vectors[2])
+ dx = np.dot(pos1 - sight_center.d, camera.unit_vectors[0])
+ dy = np.dot(pos1 - sight_center.d, camera.unit_vectors[1])
+ dz = np.dot(pos1 - sight_center.d, camera.unit_vectors[2])
# Transpose into image coords.
- px = (res[0] * 0.5 + res[0] / camera.width[0] * dx).astype('int')
- py = (res[1] * 0.5 + res[1] / camera.width[1] * dy).astype('int')
+ px = (res[0] * 0.5 + res[0] / camera.width[0].d * dx).astype('int')
+ py = (res[1] * 0.5 + res[1] / camera.width[1].d * dy).astype('int')
return px, py, dz
def __repr__(self):
@@ -363,6 +362,9 @@
if res is None:
res = camera.resolution
+ if self.disparity is None:
+ self.disparity = camera.width[0] / 2.e3
+
px_left, py_left, dz_left = self._get_px_py_dz(camera, pos, res, -self.disparity)
px_right, py_right, dz_right = self._get_px_py_dz(camera, pos, res, self.disparity)
@@ -380,20 +382,19 @@
north_vec = camera.unit_vectors[1]
normal_vec = camera.unit_vectors[2]
- angle_disparity = - np.arctan2(disparity, camera.width[2])
+ angle_disparity = - np.arctan2(disparity.d, camera.width[2].d)
R = get_rotation_matrix(angle_disparity, north_vec)
east_vec_rot = np.dot(R, east_vec)
normal_vec_rot = np.dot(R, normal_vec)
camera_position_shift = camera.position + east_vec * disparity
- sight_vector = pos - camera_position_shift
+ sight_vector = pos - camera_position_shift.d
pos1 = sight_vector
for i in range(0, sight_vector.shape[0]):
sight_vector_norm = np.sqrt(np.dot(sight_vector[i], sight_vector[i]))
sight_vector[i] = sight_vector[i] / sight_vector_norm
- sight_vector = sight_vector.d
sight_center = camera_position_shift + camera.width[2] * normal_vec_rot
for i in range(0, sight_vector.shape[0]):
@@ -408,12 +409,12 @@
np.sqrt(1 - sight_angle_cos**2)
pos1[i] = camera_position_shift + sight_length * sight_vector[i]
- dx = np.dot(pos1 - sight_center, east_vec_rot)
- dy = np.dot(pos1 - sight_center, north_vec)
- dz = np.dot(pos1 - sight_center, normal_vec_rot)
+ dx = np.dot(pos1 - sight_center.d, east_vec_rot)
+ dy = np.dot(pos1 - sight_center.d, north_vec)
+ dz = np.dot(pos1 - sight_center.d, normal_vec_rot)
# Transpose into image coords.
- px = (res0_h * 0.5 + res0_h / camera.width[0] * dx).astype('int')
- py = (res[1] * 0.5 + res[1] / camera.width[1] * dy).astype('int')
+ px = (res0_h * 0.5 + res0_h / camera.width[0].d * dx).astype('int')
+ py = (res[1] * 0.5 + res[1] / camera.width[1].d * dy).astype('int')
return px, py, dz
Repository URL: https://bitbucket.org/yt_analysis/yt/
--
This is a commit notification from bitbucket.org. You are receiving
this because you have the service enabled, addressing the recipient of
this email.
More information about the yt-svn
mailing list