[yt-svn] commit/yt: 6 new changesets
commits-noreply at bitbucket.org
commits-noreply at bitbucket.org
Wed Oct 21 18:19:37 PDT 2015
6 new commits in yt:
https://bitbucket.org/yt_analysis/yt/commits/50840f4bb9ce/
Changeset: 50840f4bb9ce
Branch: yt
User: jisuoqing
Date: 2015-10-17 18:00:58+00:00
Summary: Reshape array before being passed to zlines
Affected #: 1 file
diff -r a1857fbd7d50ee6060bb8e2b0a74ceb6baf118a7 -r 50840f4bb9ce21f4c51ed5f2a6623a00c3d94c68 yt/visualization/volume_rendering/render_source.py
--- a/yt/visualization/volume_rendering/render_source.py
+++ b/yt/visualization/volume_rendering/render_source.py
@@ -654,8 +654,15 @@
z = zbuffer.z
# Draw the vectors
+
+ empty.shape = (camera.resolution[0], camera.resolution[1], 4)
+ z.shape = (camera.resolution[0], camera.resolution[1])
+
zlines(empty, z, px.d, py.d, dz.d, self.colors, self.color_stride)
+ empty.shape = (camera.resolution[0] * camera.resolution[1], 1, 4)
+ z.shape = (camera.resolution[0] * camera.resolution[1], 1)
+
# Set the new zbuffer
self.zbuffer = zbuffer
return zbuffer
https://bitbucket.org/yt_analysis/yt/commits/2f2132337544/
Changeset: 2f2132337544
Branch: yt
User: jisuoqing
Date: 2015-10-18 06:01:18+00:00
Summary: Reshape zbuffer for non-plane-parallel lens
Affected #: 1 file
diff -r 50840f4bb9ce21f4c51ed5f2a6623a00c3d94c68 -r 2f2132337544d4c957c16a5df1dc1dd45753fee3 yt/visualization/volume_rendering/render_source.py
--- a/yt/visualization/volume_rendering/render_source.py
+++ b/yt/visualization/volume_rendering/render_source.py
@@ -465,8 +465,17 @@
# DRAW SOME LINES
camera.lens.setup_box_properties(camera)
px, py, dz = camera.lens.project_to_plane(camera, vertices)
+
+ if 'plane-parallel' not in str(camera.lens):
+ empty.shape = (camera.resolution[0], camera.resolution[1], 4)
+ z.shape = (camera.resolution[0], camera.resolution[1])
+
zlines(empty, z, px.d, py.d, dz.d, self.colors, self.color_stride)
+ if 'plane-parallel' not in str(camera.lens):
+ empty.shape = (camera.resolution[0] * camera.resolution[1], 1, 4)
+ z.shape = (camera.resolution[0] * camera.resolution[1], 1)
+
self.zbuffer = zbuffer
return zbuffer
@@ -655,16 +664,19 @@
# Draw the vectors
- empty.shape = (camera.resolution[0], camera.resolution[1], 4)
- z.shape = (camera.resolution[0], camera.resolution[1])
+ if 'plane-parallel' not in str(camera.lens):
+ empty.shape = (camera.resolution[0], camera.resolution[1], 4)
+ z.shape = (camera.resolution[0], camera.resolution[1])
zlines(empty, z, px.d, py.d, dz.d, self.colors, self.color_stride)
- empty.shape = (camera.resolution[0] * camera.resolution[1], 1, 4)
- z.shape = (camera.resolution[0] * camera.resolution[1], 1)
+ if 'plane-parallel' not in str(camera.lens):
+ empty.shape = (camera.resolution[0] * camera.resolution[1], 1, 4)
+ z.shape = (camera.resolution[0] * camera.resolution[1], 1)
# Set the new zbuffer
self.zbuffer = zbuffer
+
return zbuffer
def __repr__(self):
https://bitbucket.org/yt_analysis/yt/commits/a8db0c0155c0/
Changeset: a8db0c0155c0
Branch: yt
User: jisuoqing
Date: 2015-10-18 20:51:48+00:00
Summary: Convert zbuffer shape before and after zpoints call
Affected #: 1 file
diff -r 2f2132337544d4c957c16a5df1dc1dd45753fee3 -r a8db0c0155c0abf421d793b8f6ab6b4eff46d5f8 yt/visualization/volume_rendering/render_source.py
--- a/yt/visualization/volume_rendering/render_source.py
+++ b/yt/visualization/volume_rendering/render_source.py
@@ -390,8 +390,17 @@
# DRAW SOME POINTS
camera.lens.setup_box_properties(camera)
px, py, dz = camera.lens.project_to_plane(camera, vertices)
+
+ if 'plane-parallel' not in str(camera.lens):
+ empty.shape = (camera.resolution[0], camera.resolution[1], 4)
+ z.shape = (camera.resolution[0], camera.resolution[1])
+
zpoints(empty, z, px.d, py.d, dz.d, self.colors, self.color_stride)
+ if 'plane-parallel' not in str(camera.lens):
+ empty.shape = (camera.resolution[0] * camera.resolution[1], 1, 4)
+ z.shape = (camera.resolution[0] * camera.resolution[1], 1)
+
self.zbuffer = zbuffer
return zbuffer
https://bitbucket.org/yt_analysis/yt/commits/32fc56584134/
Changeset: 32fc56584134
Branch: yt
User: jisuoqing
Date: 2015-10-20 08:17:07+00:00
Summary: Delete empty line
Affected #: 1 file
diff -r a8db0c0155c0abf421d793b8f6ab6b4eff46d5f8 -r 32fc565841344a31069b5e2cd8661b2f363ba52a yt/visualization/volume_rendering/render_source.py
--- a/yt/visualization/volume_rendering/render_source.py
+++ b/yt/visualization/volume_rendering/render_source.py
@@ -685,7 +685,6 @@
# Set the new zbuffer
self.zbuffer = zbuffer
-
return zbuffer
def __repr__(self):
https://bitbucket.org/yt_analysis/yt/commits/8fa92276c8f9/
Changeset: 8fa92276c8f9
Branch: yt
User: jisuoqing
Date: 2015-10-20 16:26:49+00:00
Summary: Add comments
Affected #: 1 file
diff -r 32fc565841344a31069b5e2cd8661b2f363ba52a -r 8fa92276c8f9c71859cab0d8c1ecf66b7ce85196 yt/visualization/volume_rendering/render_source.py
--- a/yt/visualization/volume_rendering/render_source.py
+++ b/yt/visualization/volume_rendering/render_source.py
@@ -391,6 +391,8 @@
camera.lens.setup_box_properties(camera)
px, py, dz = camera.lens.project_to_plane(camera, vertices)
+ # Non-plane-parallel lenses only support 1D array
+ # 1D array needs to be transformed to 2D to get points plotted
if 'plane-parallel' not in str(camera.lens):
empty.shape = (camera.resolution[0], camera.resolution[1], 4)
z.shape = (camera.resolution[0], camera.resolution[1])
@@ -475,6 +477,8 @@
camera.lens.setup_box_properties(camera)
px, py, dz = camera.lens.project_to_plane(camera, vertices)
+ # Non-plane-parallel lenses only support 1D array
+ # 1D array needs to be transformed to 2D to get lines plotted
if 'plane-parallel' not in str(camera.lens):
empty.shape = (camera.resolution[0], camera.resolution[1], 4)
z.shape = (camera.resolution[0], camera.resolution[1])
@@ -673,6 +677,8 @@
# Draw the vectors
+ # Non-plane-parallel lenses only support 1D array
+ # 1D array needs to be transformed to 2D to get lines plotted
if 'plane-parallel' not in str(camera.lens):
empty.shape = (camera.resolution[0], camera.resolution[1], 4)
z.shape = (camera.resolution[0], camera.resolution[1])
https://bitbucket.org/yt_analysis/yt/commits/1d18fbb16ffd/
Changeset: 1d18fbb16ffd
Branch: yt
User: chummels
Date: 2015-10-21 19:57:29+00:00
Summary: Merged in jisuoqing/yt (pull request #1819)
[experimental] [bugfix] Reshape zbuffer for non-plane-parallel lenses, fix #1122
Affected #: 1 file
diff -r e0ba8789d21ad41eb928ce34296ae4677e8d4a33 -r 1d18fbb16ffdb55b98e4cd4b1feed099da4bb6c9 yt/visualization/volume_rendering/render_source.py
--- a/yt/visualization/volume_rendering/render_source.py
+++ b/yt/visualization/volume_rendering/render_source.py
@@ -501,8 +501,19 @@
# DRAW SOME POINTS
camera.lens.setup_box_properties(camera)
px, py, dz = camera.lens.project_to_plane(camera, vertices)
+
+ # Non-plane-parallel lenses only support 1D array
+ # 1D array needs to be transformed to 2D to get points plotted
+ if 'plane-parallel' not in str(camera.lens):
+ empty.shape = (camera.resolution[0], camera.resolution[1], 4)
+ z.shape = (camera.resolution[0], camera.resolution[1])
+
zpoints(empty, z, px.d, py.d, dz.d, self.colors, self.color_stride)
+ if 'plane-parallel' not in str(camera.lens):
+ empty.shape = (camera.resolution[0] * camera.resolution[1], 1, 4)
+ z.shape = (camera.resolution[0] * camera.resolution[1], 1)
+
self.zbuffer = zbuffer
return zbuffer
@@ -616,8 +627,19 @@
# DRAW SOME LINES
camera.lens.setup_box_properties(camera)
px, py, dz = camera.lens.project_to_plane(camera, vertices)
+
+ # Non-plane-parallel lenses only support 1D array
+ # 1D array needs to be transformed to 2D to get lines plotted
+ if 'plane-parallel' not in str(camera.lens):
+ empty.shape = (camera.resolution[0], camera.resolution[1], 4)
+ z.shape = (camera.resolution[0], camera.resolution[1])
+
zlines(empty, z, px.d, py.d, dz.d, self.colors, self.color_stride)
+ if 'plane-parallel' not in str(camera.lens):
+ empty.shape = (camera.resolution[0] * camera.resolution[1], 1, 4)
+ z.shape = (camera.resolution[0] * camera.resolution[1], 1)
+
self.zbuffer = zbuffer
return zbuffer
@@ -884,8 +906,19 @@
z = zbuffer.z
# Draw the vectors
+
+ # Non-plane-parallel lenses only support 1D array
+ # 1D array needs to be transformed to 2D to get lines plotted
+ if 'plane-parallel' not in str(camera.lens):
+ empty.shape = (camera.resolution[0], camera.resolution[1], 4)
+ z.shape = (camera.resolution[0], camera.resolution[1])
+
zlines(empty, z, px.d, py.d, dz.d, self.colors, self.color_stride)
+ if 'plane-parallel' not in str(camera.lens):
+ empty.shape = (camera.resolution[0] * camera.resolution[1], 1, 4)
+ z.shape = (camera.resolution[0] * camera.resolution[1], 1)
+
# Set the new zbuffer
self.zbuffer = zbuffer
return zbuffer
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