Merge branch 'master' into fix/urdf_updates

Author: gonzalocasas

docs/environments/blender.rst

@@ -4,13 +4,14 @@ Working in Blender
 
 Blender ships with its own embedded version of Python but it is relatively
 simple to replace it with the one you have **COMPAS** installed on.
-
 It is recommended to create a new ``conda`` environment to make sure the python
 version matches exactly what Blender expects.
-
 The following instructions are for Blender 2.79 which ships with
 **Pyhton 3.5.3**, for other versions, update the python version accordingly.
 
+On Windows
+==========
+
 Open the command prompt and type the following to install a new python
 environment with **COMPAS**:
 
@@ -22,9 +23,6 @@ environment with **COMPAS**:
     $ conda install COMPAS
 
 
-On Windows
-==========
-
 Now configure Blender to use the newly installed environment:
 
 ::
@@ -37,10 +35,34 @@ Now configure Blender to use the newly installed environment:
 On Mac
 ======
 
+Open the Terminal and type the following to install a new python
+environment with **COMPAS**:
+
+::
+
+    $ conda create -n blender-279 python=3.5.3
+    $ source activate blender-279
+    $ conda config --add channels conda-forge
+    $ conda install COMPAS
+
+
+Now configure Blender to use the newly installed environment:
+
+::
+
+    $ cd /Applications/blender.app/Contents/Resources/2.78
+    $ mv python original_python
+    $ ln -s $CONDA_PREFIX python
+
 
 Using the built-in script editor
 ================================
 
+coming soon...
+
 
 Using an external editor
 ========================
+
+coming soon...
+

docs/test.rst

@@ -2,9 +2,53 @@
 Testing heroku app integration
 ********************************************************************************
 
-.. raw:: html
+.. .. raw:: html
 
-    <div class="embed-responsive embed-responsive-1by1">
-        <iframe src="https://compasapp-test.herokuapp.com/" class="embed-responsive-item"></iframe>
-    </div
+..     <div class="embed-responsive embed-responsive-1by1">
+..         <iframe src="https://compasapp-test.herokuapp.com/" class="embed-responsive-item"></iframe>
+..     </div
+
+
+.. code-block:: python
+
+    pass
+
+
+.. code-block:: none
+    
+    $
+
+
+.. code-block:: ruby
+
+    //
+
+
+.. code-block:: c
+
+    //
+
+
+.. code-block:: console
+
+    $ test
+
+
+.. code-block:: bash
+
+    $ test
+
+
+.. highlight:: bash
+
+::
+
+    $ test
+
+
+.. highlight:: python
+
+::
+
+    def function(): pass
 

src/compas_ghpython/utilities/drawing.py

@@ -148,7 +148,6 @@ def xdraw_cylinders(cylinders, cap=False):
 
 
 def xdraw_pipes(pipes, cap=2, fit=1.0):
-    rg_pipes = []
     abs_tol = TOL
     ang_tol = sc.doc.ModelAngleToleranceRadians
     for p in pipes:
@@ -159,12 +158,12 @@ def xdraw_pipes(pipes, cap=2, fit=1.0):
         if type(radius) in (int, float):
             radius = [radius] * 2
         radius = [float(r) for r in radius]
+
         rail = Curve.CreateControlPointCurve([Point3d(*xyz) for xyz in points])
         breps = Brep.CreatePipe(rail, params, radius, 1, cap, fit, abs_tol,
                                 ang_tol)
-        rg_pipes += breps
-    return rg_pipes
-
+        for brep in breps:
+            yield brep
 
 def xdraw_spheres(spheres):
     rg_sheres = []

src/compas_rhino/helpers/mesh.py

@@ -38,19 +38,22 @@
     'mesh_from_surface',
     'mesh_from_surface_uv',
     'mesh_from_surface_heightfield',
+
     'mesh_draw',
     'mesh_draw_vertices',
     'mesh_draw_edges',
     'mesh_draw_faces',
     'mesh_draw_vertex_labels',
     'mesh_draw_edge_labels',
     'mesh_draw_face_labels',
+
     'mesh_select_vertices',
     'mesh_select_vertex',
     'mesh_select_edges',
     'mesh_select_edge',
     'mesh_select_faces',
     'mesh_select_face',
+
     'mesh_update_vertex_attributes',
     'mesh_update_edge_attributes',
     'mesh_update_face_attributes',

src/compas_rhino/helpers/network.py

@@ -20,15 +20,19 @@
     'network_draw_edges',
     'network_draw_vertex_labels',
     'network_draw_edge_labels',
+
     'network_select_vertices',
     'network_select_vertex',
     'network_select_edges',
     'network_select_edge',
+
     'network_update_attributes',
     'network_update_vertex_attributes',
     'network_update_edge_attributes',
+
     'network_move',
     'network_move_vertex',
+
     'network_draw_reaction_forces',
     'network_draw_loads',
     'network_draw_axial_forces'

src/compas_rhino/helpers/volmesh.py

@@ -29,11 +29,13 @@
 __all__ = [
     'volmesh_from_polysurfaces',
     'volmesh_from_wireframe',
+
     'volmesh_draw',
     'volmesh_draw_vertices',
     'volmesh_draw_edges',
     'volmesh_draw_faces',
     'volmesh_draw_cells',
+
     'volmesh_select_vertex',
     'volmesh_select_vertices',
     'volmesh_select_edge',