fix for b- splines as lines

Author: mikedh

tests/test_transformations.py

@@ -7,12 +7,15 @@
 class TransformTest(g.unittest.TestCase):
 
     def test_doctest(self):
-        '''
-        Run doctests on transformations, which checks docstrings for
-        interactive sessions and then verifies they execute correctly.
+        """
+        Run doctests on transformations, which checks docstrings
+        for interactive sessions and then verifies they execute 
+        correctly.
 
-        This is how the upstream transformations unit tests.
-        '''
+        This is how the upstream transformations unit tests,
+        but it depends on numpy string formatting and is very
+        flaky.
+        """
         import trimesh
         import random
         import doctest
@@ -31,10 +34,10 @@ def test_doctest(self):
         g.log.info('transformations {}'.format(str(results)))
 
     def test_downstream(self):
-        '''
-        Run tests on functions that were added downstream of the original
-        transformations.py
-        '''
+        """
+        Run tests on functions that were added by us to the
+        original transformations.py
+        """
         tr = g.trimesh.transformations
 
         assert not tr.is_rigid(g.np.ones((4, 4)))

trimesh/path/curve.py

@@ -48,7 +48,10 @@ def compute(t):
     return result
 
 
-def discretize_bspline(control, knots, count=None, scale=1.0):
+def discretize_bspline(control,
+                       knots,
+                       count=None,
+                       scale=1.0):
     """
     Given a B-Splines control points and knot vector, return
     a sampled version of the curve.

trimesh/path/io/dxf.py

@@ -328,6 +328,16 @@ def convert_bspline(e):
                                   e['20'])).astype(np.float64)
         knots = np.array(e['40']).astype(np.float64)
 
+        # if there are only two points, save it as a line
+        if len(points) == 2:
+            # create a single Line entity
+            entities.append(Line(points=len(vertices) +
+                                 np.arange(2),
+                             **info(e)))
+            # add the vertices to our collection
+            vertices.extend(points)
+            return
+
         # check bit coded flag for closed
         # closed = bool(int(e['70'][0]) & 1)
         # check euclidean distance to see if closed
@@ -525,9 +535,9 @@ def format_points(points,
         points = np.asanyarray(points, dtype=np.float64)
         three = util.three_dimensionalize(points, return_2D=False)
         if increment:
-            group = np.tile(np.arange(len(three),
-                                      dtype=np.int).reshape((-1, 1)),
-                            (1, 3))
+            group = np.tile(
+                np.arange(len(three), dtype=np.int).reshape((-1, 1)),
+                (1, 3))
         else:
             group = np.zeros((len(three), 3), dtype=np.int)
         group += [10, 20, 30]

trimesh/version.py

@@ -1 +1 @@
-__version__ = '2.33.36'
+__version__ = '2.33.37'