Quality-of-life improvements

plato/draw/Arrows2D.py

@@ -1,6 +1,7 @@
 import numpy as np
-from .Polygons import Polygons
+
 from .internal import ShapeDecorator
+from .Polygons import Polygons
 
 @ShapeDecorator
 class Arrows2D(Polygons):

plato/draw/Box.py

@@ -1,6 +1,8 @@
 import functools
 import itertools
+
 import numpy as np
+
 from .. import math
 from .internal import ShapeDecorator, ShapeAttribute
 from .Lines import Lines

plato/draw/ConvexPolyhedra.py

@@ -1,5 +1,7 @@
 import itertools
+
 import numpy as np
+
 from .internal import Shape, ShapeDecorator, ShapeAttribute
 
 @ShapeDecorator

plato/draw/ConvexSpheropolyhedra.py

@@ -1,5 +1,7 @@
 import itertools
+
 import numpy as np
+
 from .internal import Shape, ShapeDecorator, ShapeAttribute
 
 @ShapeDecorator

plato/draw/DiskUnions.py

@@ -1,5 +1,7 @@
 import itertools
+
 import numpy as np
+
 from .internal import Shape, ShapeDecorator, ShapeAttribute
 
 @ShapeDecorator

plato/draw/Disks.py

@@ -1,5 +1,7 @@
 import itertools
+
 import numpy as np
+
 from .internal import Shape, ShapeDecorator, ShapeAttribute
 
 @ShapeDecorator

plato/draw/Ellipsoids.py

@@ -1,5 +1,7 @@
 import itertools
+
 import numpy as np
+
 from .internal import Shape, ShapeDecorator, ShapeAttribute
 
 @ShapeDecorator

plato/draw/Lines.py

@@ -1,5 +1,7 @@
 import itertools
+
 import numpy as np
+
 from .internal import Shape, ShapeDecorator, ShapeAttribute
 
 @ShapeDecorator

plato/draw/Mesh.py

@@ -1,5 +1,7 @@
 import itertools
+
 import numpy as np
+
 from .internal import Shape, ShapeDecorator, ShapeAttribute
 from .. import mesh
 

plato/draw/Polygons.py

@@ -1,5 +1,7 @@
 import itertools
+
 import numpy as np
+
 from .internal import Shape, ShapeDecorator, ShapeAttribute
 
 @ShapeDecorator

plato/draw/Scene.py

@@ -1,5 +1,7 @@
 import logging
+
 import numpy as np
+
 from .internal import Shape
 
 DEFAULT_DIRECTIONAL_LIGHTS = (
@@ -28,6 +30,12 @@ class Scene:
       for prim in scene:
           # (do something with prim)
 
+    Primitives can also be accessed in the order they were added to
+    the scene using list-like syntax::
+
+      first_three_prims = scene[:3]
+      last_prim = scene[-1]
+
     Optional rendering arguments are enabled as *features*, which are
     name-value pairs identifying a feature by name and any
     configuration of the feature in the value.
@@ -83,6 +91,10 @@ def __init__(self, primitives=[], features={}, size=(40, 30),
         for name in kwargs:
             setattr(self, name, kwargs[name])
 
+    def __getitem__(self, key):
+        """Returns the primitive(s) given an integer index or slice."""
+        return self._primitives[key]
+
     def __iter__(self):
         for prim in self._primitives:
             yield prim

plato/draw/SpherePoints.py

@@ -1,5 +1,7 @@
 import itertools
+
 import numpy as np
+
 from .internal import Shape, ShapeDecorator, ShapeAttribute
 
 @ShapeDecorator

plato/draw/SphereUnions.py

@@ -1,5 +1,7 @@
 import itertools
+
 import numpy as np
+
 from .internal import Shape, ShapeDecorator, ShapeAttribute
 
 @ShapeDecorator

plato/draw/Spheres.py

@@ -1,5 +1,7 @@
 import itertools
+
 import numpy as np
+
 from .internal import Shape, ShapeDecorator, ShapeAttribute
 
 @ShapeDecorator

plato/draw/Spheropolygons.py

@@ -1,5 +1,7 @@
 import itertools
+
 import numpy as np
+
 from .internal import Shape, ShapeDecorator, ShapeAttribute
 
 @ShapeDecorator

plato/draw/Voronoi.py

@@ -1,5 +1,7 @@
 import itertools
+
 import numpy as np
+
 from .internal import Shape, ShapeDecorator, ShapeAttribute
 
 @ShapeDecorator

plato/draw/__init__.py

@@ -1,6 +1,5 @@
 from .Scene import Scene
 
-
 from .Arrows2D import Arrows2D
 from .Box import Box
 from .Disks import Disks

plato/draw/blender/ConvexPolyhedra.py

@@ -1,9 +1,10 @@
-import bpy
 import itertools
-from ... import geometry, math
-from ... import draw
+
+import bpy
 import numpy as np
 
+from ... import draw, geometry, math, mesh
+
 class ConvexPolyhedra(draw.ConvexPolyhedra):
 
     def render(self, scene, suffix='', translation=(0, 0, 0),
@@ -22,8 +23,9 @@ def render(self, scene, suffix='', translation=(0, 0, 0),
         group = bpy.data.groups.new(prim_name)
         positions = math.quatrot(rotation[np.newaxis, :], self.positions)
 
-        for (i, position, orientation, color) in zip(
-                itertools.count(), positions, self.orientations, self.colors):
+        particles = zip(*mesh.unfoldProperties([
+            positions, self.orientations, self.colors]))
+        for (i, (position, orientation, color)) in enumerate(particles):
             shape_name = prim_name + '_{}'.format(i)
             shape = bpy.data.objects.new(shape_name, object_data=mesh)
             shape.location = position

plato/draw/blender/Scene.py

@@ -1,6 +1,7 @@
-from ... import draw
-import numpy as np
 import bpy
+import numpy as np
+
+from ... import draw
 
 class Scene(draw.Scene):
     __doc__ = draw.Scene.__doc__

plato/draw/blender/Spheres.py

@@ -1,9 +1,10 @@
-import bpy
 import itertools
-from ... import math
-from ... import draw
+
+import bpy
 import numpy as np
 
+from ... import draw, math, mesh
+
 class Spheres(draw.Spheres):
 
     def render(self, scene, suffix='', translation=(0, 0, 0),
@@ -21,8 +22,9 @@ def render(self, scene, suffix='', translation=(0, 0, 0),
         group = bpy.data.groups.new(prim_name)
         positions = math.quatrot(rotation[np.newaxis, :], self.positions)
 
-        for (i, position, radius, color) in zip(
-                itertools.count(), positions, self.radii, self.colors):
+        particles = zip(*mesh.unfoldProperties([
+            positions, self.radii, self.colors]))
+        for (i, (position, (radius,), color)) in enumerate(particles):
             shape_name = prim_name + '_{}'.format(i)
             shape = bpy.data.objects.new(shape_name, object_data=shape_params)
             shape.location = position

plato/draw/fresnel/ConvexPolyhedra.py

@@ -1,6 +1,8 @@
-import fresnel
 import itertools
+
+import fresnel
 import numpy as np
+
 from ... import draw
 from ..internal import ShapeAttribute, ShapeDecorator
 from .FresnelPrimitive import FresnelPrimitive

plato/draw/fresnel/Disks.py

@@ -1,4 +1,5 @@
 import fresnel
+
 from ... import draw
 from .FresnelPrimitive import FresnelPrimitiveSolid
 

plato/draw/fresnel/Ellipsoids.py

@@ -1,6 +1,8 @@
-import fresnel
 import itertools
+
+import fresnel
 import numpy as np
+
 from ... import draw
 from ...geometry import fibonacciPositions
 from ..internal import ShapeAttribute, ShapeDecorator

plato/draw/fresnel/Lines.py

@@ -1,6 +1,8 @@
-import fresnel
 import itertools
+
+import fresnel
 import numpy as np
+
 from ... import draw
 from ..internal import ShapeAttribute, ShapeDecorator
 from .FresnelPrimitive import FresnelPrimitiveSolid

plato/draw/fresnel/Polygons.py

@@ -1,7 +1,8 @@
 import fresnel
+import rowan
+
 from ... import draw
 from .FresnelPrimitive import FresnelPrimitiveSolid
-import rowan
 
 class Polygons(FresnelPrimitiveSolid, draw.Polygons):
     __doc__ = draw.Polygons.__doc__

plato/draw/fresnel/Scene.py

@@ -1,8 +1,8 @@
 import fresnel
 import numpy as np
 import rowan
-from ... import draw
 
+from ... import draw
 
 class Scene(draw.Scene):
     __doc__ = (draw.Scene.__doc__ or '') + """
@@ -31,7 +31,7 @@ def show(self):
         import IPython
         if self._output is None:
             self.render()
-        IPython.display.display(self._output)
+        IPython.display.display(self._output, display_id=str(id(self)))
 
     def save(self, filename):
         """Render and save an image of this Scene.

plato/draw/fresnel/SphereUnions.py

@@ -1,8 +1,9 @@
 import fresnel
+import numpy as np
+
 from ... import draw
 from ... import math
 from .FresnelPrimitive import FresnelPrimitive
-import numpy as np
 
 class SphereUnions(FresnelPrimitive, draw.SphereUnions):
     __doc__ = draw.SphereUnions.__doc__

plato/draw/fresnel/Spheres.py

@@ -1,4 +1,5 @@
 import fresnel
+
 from ... import draw
 from .FresnelPrimitive import FresnelPrimitive
 

plato/draw/fresnel/Spheropolygons.py

@@ -1,7 +1,8 @@
 import fresnel
+import rowan
+
 from ... import draw
 from .FresnelPrimitive import FresnelPrimitiveSolid
-import rowan
 
 class Spheropolygons(FresnelPrimitiveSolid, draw.Spheropolygons):
     __doc__ = draw.Spheropolygons.__doc__

plato/draw/internal.py

@@ -1,6 +1,7 @@
+from collections import namedtuple
 import functools
 import inspect
-from collections import namedtuple
+
 import numpy as np
 
 ATTRIBUTE_DOCSTRING_HEADER = '\n\nThis primitive has the following attributes:'

plato/draw/matplotlib/ConvexPolyhedra.py

@@ -1,10 +1,11 @@
 import numpy as np
+from matplotlib.path import Path
+from matplotlib.patches import PathPatch, Polygon
+
 from ... import math
 from ... import geometry
 from ... import draw
 from .internal import PatchUser
-from matplotlib.path import Path
-from matplotlib.patches import PathPatch, Polygon
 
 class ConvexPolyhedra(draw.ConvexPolyhedra, PatchUser):
     __doc__ = draw.ConvexPolyhedra.__doc__

plato/draw/matplotlib/DiskUnions.py

@@ -1,8 +1,9 @@
+from matplotlib.patches import Circle, Wedge
+from matplotlib.transforms import Affine2D
 import numpy as np
+
 from ... import draw
 from .internal import PatchUser
-from matplotlib.patches import Circle, Wedge
-from matplotlib.transforms import Affine2D
 
 class DiskUnions(draw.DiskUnions, PatchUser):
     __doc__ = draw.DiskUnions.__doc__

plato/draw/matplotlib/Disks.py

@@ -1,7 +1,8 @@
+from matplotlib.patches import Circle, Wedge
 import numpy as np
+
 from ... import draw
 from .internal import PatchUser
-from matplotlib.patches import Circle, Wedge
 
 class Disks(draw.Disks, PatchUser):
     __doc__ = draw.Disks.__doc__

plato/draw/matplotlib/Polygons.py

@@ -1,10 +1,11 @@
+from matplotlib.path import Path
+from matplotlib.patches import PathPatch, Polygon
+from matplotlib.transforms import Affine2D
 import numpy as np
+
 from ... import geometry
 from ... import draw
 from .internal import PatchUser
-from matplotlib.path import Path
-from matplotlib.patches import PathPatch, Polygon
-from matplotlib.transforms import Affine2D
 
 class Polygons(draw.Polygons, PatchUser):
     __doc__ = draw.Polygons.__doc__