[yt-svn] commit/yt: 2 new changesets
commits-noreply at bitbucket.org
commits-noreply at bitbucket.org
Thu Jul 7 13:52:05 PDT 2016
2 new commits in yt:
https://bitbucket.org/yt_analysis/yt/commits/51b358fcd602/
Changeset: 51b358fcd602
Branch: yt
User: MatthewTurk
Date: 2016-07-07 18:23:26+00:00
Summary: Changing some names to be more descriptive and privatizing some methods.
Affected #: 4 files
diff -r d7f213e1752e7db1bc4ae5b37c1b9acdaa080a48 -r 51b358fcd602fcf608e0c0dbb3337e6c6d9a5340 yt/visualization/volume_rendering/camera.py
--- a/yt/visualization/volume_rendering/camera.py
+++ b/yt/visualization/volume_rendering/camera.py
@@ -136,7 +136,7 @@
self._resolution = (512, 512)
if self.data_source is not None:
- self.scene.set_new_unit_registry(self.data_source.ds.unit_registry)
+ self.scene._set_new_unit_registry(self.data_source.ds.unit_registry)
self._focus = self.data_source.ds.domain_center
self._position = self.data_source.ds.domain_right_edge
self._width = self.data_source.ds.arr(
diff -r d7f213e1752e7db1bc4ae5b37c1b9acdaa080a48 -r 51b358fcd602fcf608e0c0dbb3337e6c6d9a5340 yt/visualization/volume_rendering/lens.py
--- a/yt/visualization/volume_rendering/lens.py
+++ b/yt/visualization/volume_rendering/lens.py
@@ -33,7 +33,6 @@
self.viewpoint = None
self.sub_samples = 5
self.num_threads = 0
- self.double_check = False
self.box_vectors = None
self.origin = None
self.back_center = None
diff -r d7f213e1752e7db1bc4ae5b37c1b9acdaa080a48 -r 51b358fcd602fcf608e0c0dbb3337e6c6d9a5340 yt/visualization/volume_rendering/render_source.py
--- a/yt/visualization/volume_rendering/render_source.py
+++ b/yt/visualization/volume_rendering/render_source.py
@@ -136,7 +136,7 @@
self.field = field
self.volume = None
self.current_image = None
- self.double_check = False
+ self.check_nans = False
self.num_threads = 0
self.num_samples = 10
self.sampler_type = 'volume-render'
@@ -275,7 +275,7 @@
mylog.debug("Casting rays")
total_cells = 0
- if self.double_check:
+ if self.check_nans:
for brick in self.volume.bricks:
for data in brick.my_data:
if np.any(np.isnan(data)):
@@ -292,7 +292,7 @@
call_from_VR=True)
if zbuffer is None:
self.zbuffer = ZBuffer(self.current_image,
- np.inf*np.ones(self.current_image.shape[:2]))
+ np.full(self.current_image.shape[:2], np.inf))
return self.current_image
def finalize_image(self, camera, image, call_from_VR=False):
diff -r d7f213e1752e7db1bc4ae5b37c1b9acdaa080a48 -r 51b358fcd602fcf608e0c0dbb3337e6c6d9a5340 yt/visualization/volume_rendering/scene.py
--- a/yt/visualization/volume_rendering/scene.py
+++ b/yt/visualization/volume_rendering/scene.py
@@ -91,7 +91,7 @@
r"""Create a new Scene instance"""
super(Scene, self).__init__()
self.sources = OrderedDict()
- self.last_render = None
+ self._last_render = None
# A non-public attribute used to get around the fact that we can't
# pass kwargs into _repr_png_()
self._sigma_clip = None
@@ -100,7 +100,13 @@
"""Returns the volume rendering source indexed by ``source_num``"""
return list(itervalues(self.sources))[source_num]
- def _iter_opaque_sources(self):
+ def __getitem__(self, item):
+ if item in self.sources:
+ return self.sources[item]
+ return self.get_source(source_num)
+
+ @property
+ def opaque_sources(self):
"""
Iterate over opaque RenderSource objects,
returning a tuple of (key, source)
@@ -110,7 +116,8 @@
issubclass(OpaqueSource, type(source)):
yield k, source
- def _iter_transparent_sources(self):
+ @property
+ def transparent_sources(self):
"""
Iterate over transparent RenderSource objects,
returning a tuple of (key, source)
@@ -139,7 +146,7 @@
data_sources = (VolumeSource, MeshSource, GridSource)
if isinstance(render_source, data_sources):
- self.set_new_unit_registry(
+ self._set_new_unit_registry(
render_source.data_source.ds.unit_registry)
line_annotation_sources = (GridSource, BoxSource, CoordinateVectorSource)
@@ -155,7 +162,10 @@
return self
- def set_new_unit_registry(self, input_registry):
+ def __setitem__(self, key, value):
+ return self.add_source(value, key)
+
+ def _set_new_unit_registry(self, input_registry):
self.unit_registry = UnitRegistry(
add_default_symbols=False,
lut=input_registry.lut)
@@ -210,7 +220,7 @@
assert(camera is not None)
self._validate()
bmp = self.composite(camera=camera)
- self.last_render = bmp
+ self._last_render = bmp
return bmp
def save(self, fname=None, sigma_clip=None):
@@ -282,11 +292,11 @@
suffix = '.png'
fname = '%s%s' % (fname, suffix)
- if self.last_render is None:
+ if self._last_render is None:
self.render()
mylog.info("Saving render %s", fname)
- self.last_render.write_png(fname, sigma_clip=sigma_clip)
+ self._last_render.write_png(fname, sigma_clip=sigma_clip)
def save_annotated(self, fname=None, label_fmt=None,
@@ -338,13 +348,13 @@
--------
>>> sc.save_annotated("fig.png",
- >>> text_annotate=[[(0.05, 0.05),
- >>> "t = {}".format(ds.current_time.d),
- >>> dict(horizontalalignment="left")],
- >>> [(0.5,0.95),
- >>> "simulation title",
- >>> dict(color="y", fontsize="24",
- >>> horizontalalignment="center")]])
+ ... text_annotate=[[(0.05, 0.05),
+ ... "t = {}".format(ds.current_time.d),
+ ... dict(horizontalalignment="left")],
+ ... [(0.5,0.95),
+ ... "simulation title",
+ ... dict(color="y", fontsize="24",
+ ... horizontalalignment="center")]])
"""
import matplotlib.pyplot as plt
@@ -370,7 +380,7 @@
suffix = '.png'
fname = '%s%s' % (fname, suffix)
- if self.last_render is None:
+ if self._last_render is None:
self.render()
# which transfer function?
@@ -380,7 +390,7 @@
if rs.data_source.ds._get_field_info(rs.field).take_log:
label = r'$\rm{log}\ $' + label
- ax = self._show_mpl(self.last_render.swapaxes(0,1),
+ ax = self._show_mpl(self._last_render.swapaxes(0, 1),
sigma_clip=sigma_clip, dpi=dpi)
self._annotate(ax.axes, tf, label=label, label_fmt=label_fmt)
plt.tight_layout()
@@ -476,13 +486,13 @@
if camera is None:
camera = self.camera
empty = camera.lens.new_image(camera)
- opaque = ZBuffer(empty, np.ones(empty.shape[:2]) * np.inf)
+ opaque = ZBuffer(empty, np.full(empty.shape[:2], np.inf))
- for k, source in self._iter_opaque_sources():
+ for k, source in self.opaque_sources:
source.render(camera, zbuffer=opaque)
im = source.zbuffer.rgba
- for k, source in self._iter_transparent_sources():
+ for k, source in self.transparent_sources:
im = source.render(camera, zbuffer=opaque)
return im
@@ -702,7 +712,7 @@
The opacity of the mesh lines. Default is 255 (solid).
"""
- for k, source in self._iter_opaque_sources():
+ for k, source in self.opaque_sources:
if isinstance(source, MeshSource):
source.annotate_mesh_lines(color=color, alpha=alpha)
return self
@@ -853,11 +863,11 @@
return self._quan
def _repr_png_(self):
- if self.last_render is None:
+ if self._last_render is None:
self.render()
- png = self.last_render.write_png(filename=None,
- sigma_clip=self._sigma_clip,
- background='black')
+ png = self._last_render.write_png(filename=None,
+ sigma_clip=self._sigma_clip,
+ background='black')
self._sigma_clip = None
return png
https://bitbucket.org/yt_analysis/yt/commits/b264176ae152/
Changeset: b264176ae152
Branch: yt
User: MatthewTurk
Date: 2016-07-07 18:38:08+00:00
Summary: Fixing typo
Affected #: 1 file
diff -r 51b358fcd602fcf608e0c0dbb3337e6c6d9a5340 -r b264176ae1527a32714dbd782c7f5a3e79dc993a yt/visualization/volume_rendering/scene.py
--- a/yt/visualization/volume_rendering/scene.py
+++ b/yt/visualization/volume_rendering/scene.py
@@ -103,7 +103,7 @@
def __getitem__(self, item):
if item in self.sources:
return self.sources[item]
- return self.get_source(source_num)
+ return self.get_source(item)
@property
def opaque_sources(self):
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