Added support & tests for diameter arguments to circle, sphere, and cylinder primitives, as in OpenSCAD 2014.03. Closes #26

etjones-erisyon · etjones-erisyon · commit 4519aca9e481 · 2015-02-10T12:31:12.000-08:00
diff --git a/solid/solidpython.py b/solid/solidpython.py
@@ -15,13 +15,13 @@
 openscad_builtins = [
     # 2D primitives
     {'name': 'polygon',         'args': ['points', 'paths'], 'kwargs': []} ,
-    {'name': 'circle',          'args': [],         'kwargs': ['r', 'segments']} ,
+    {'name': 'circle',          'args': [],         'kwargs': ['r', 'd', 'segments']} ,
     {'name': 'square',          'args': [],         'kwargs': ['size', 'center']} ,
     
     # 3D primitives
-    {'name': 'sphere',          'args': [],         'kwargs': ['r', 'segments']} ,
+    {'name': 'sphere',          'args': [],         'kwargs': ['r', 'd', 'segments']} ,
     {'name': 'cube',            'args': [],         'kwargs': ['size', 'center']} ,
-    {'name': 'cylinder',        'args': [],         'kwargs': ['r','h','r1', 'r2', 'center', 'segments']}  ,
+    {'name': 'cylinder',        'args': [],         'kwargs': ['r','h','r1', 'r2', 'd', 'd1', 'd2', 'center', 'segments']}  ,
     {'name': 'polyhedron',      'args': ['points', 'triangles' ], 'kwargs': ['convexity']} ,
     
     # Boolean operations
diff --git a/solid/test/test_solidpython.py b/solid/test/test_solidpython.py
@@ -10,10 +10,13 @@
 scad_test_case_templates = [
 {'name': 'polygon',     'kwargs': {'paths': [[0, 1, 2]]}, 'expected': '\n\npolygon(paths = [[0, 1, 2]], points = [[0, 0, 0], [1, 0, 0], [0, 1, 0]]);', 'args': {'points': [[0, 0, 0], [1, 0, 0], [0, 1, 0]]}, },
 {'name': 'circle',      'kwargs': {'segments': 12, 'r': 1}, 'expected': '\n\ncircle($fn = 12, r = 1);', 'args': {}, },
+{'name': 'circle',      'kwargs': {'segments': 12, 'd': 1}, 'expected': '\n\ncircle($fn = 12, d = 1);', 'args': {}, },
 {'name': 'square',      'kwargs': {'center': False, 'size': 1}, 'expected': '\n\nsquare(center = false, size = 1);', 'args': {}, },
 {'name': 'sphere',      'kwargs': {'segments': 12, 'r': 1}, 'expected': '\n\nsphere($fn = 12, r = 1);', 'args': {}, },
+{'name': 'sphere',      'kwargs': {'segments': 12, 'd': 1}, 'expected': '\n\nsphere($fn = 12, d = 1);', 'args': {}, },
 {'name': 'cube',        'kwargs': {'center': False, 'size': 1}, 'expected': '\n\ncube(center = false, size = 1);', 'args': {}, },
 {'name': 'cylinder',    'kwargs': {'r1': None, 'r2': None, 'h': 1, 'segments': 12, 'r': 1, 'center': False}, 'expected': '\n\ncylinder($fn = 12, center = false, h = 1, r = 1);', 'args': {}, },
+{'name': 'cylinder',    'kwargs': {'d1': 4, 'd2': 2, 'h': 1, 'segments': 12, 'center': False}, 'expected': '\n\ncylinder($fn = 12, center = false, d1 = 4, d2 = 2, h = 1);', 'args': {}, },
 {'name': 'polyhedron',  'kwargs': {'convexity': None}, 'expected': '\n\npolyhedron(points = [[0, 0, 0], [1, 0, 0], [0, 1, 0]], triangles = [[0, 1, 2]]);', 'args': {'points': [[0, 0, 0], [1, 0, 0], [0, 1, 0]], 'triangles': [[0, 1, 2]]}, },
 {'name': 'union',       'kwargs': {}, 'expected': '\n\nunion();', 'args': {}, },
 {'name': 'intersection','kwargs': {}, 'expected': '\n\nintersection();', 'args': {}, },
