Merge branch 'develop' of https://github.com/hiaselhans/OpenGlider in…

…to develop
hiaselhans · Feb 2, 2016 · 2ae75b6 · 2ae75b6
2 parents 1505c21 + c2a416e
commit 2ae75b6
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/openglider/glider/cell/elements.py b/openglider/glider/cell/elements.py
@@ -216,6 +216,7 @@ def get_mesh(self, cell, numribs=0):
         :param numribs: number of miniribs to calculate
         :return: mesh
         """
+        numribs += 1
         # TODO: doesnt work for numribs=0?
         xvalues = cell.rib1.profile_2d.x_values
         ribs = []

diff --git a/openglider/glider/parametric/shape.py b/openglider/glider/parametric/shape.py
@@ -57,7 +57,7 @@ def fast_interpolation(self):
         return np.interp(positions, data[1], data[0])
 
 
-### besser mit spezieller bezier?
+    ### besser mit spezieller bezier?
     @property
     def rib_dist_controlpoints(self):
         return self.rib_distribution.controlpoints[1:-1]
@@ -122,9 +122,8 @@ def set_const_cell_dist(self):
         num_pts = len(self.rib_distribution.controlpoints)
         self.rib_distribution.fit(const_dist, numpoints=num_pts)
 
-############################################################################
-# scaling stuff
-
+    ############################################################################
+    # scaling stuff
     def scale(self, x=1., y=1.):
         self.front_curve.scale(x, y)
 

diff --git a/openglider/mesh/__init__.py b/openglider/mesh/__init__.py
@@ -117,7 +117,7 @@ def triangularize(self):
     def __json__(self):
         return {
             "vertices": self.vertices.tolist(),
-            "faces": self.polygons
+            "polygons": self.polygons
         }
 
     def __add__(self, other):