Swapped cylinder height and radius parameters to match cone.

Author: martinbudden

cadquery/cq.py

@@ -3802,8 +3802,8 @@ def sphere(
 
     def cylinder(
         self: T,
-        radius: float,
         height: float,
+        radius: float,
         direct: Vector = Vector(0, 0, 1),
         angle: float = 360,
         centered: Union[bool, Tuple[bool, bool, bool]] = True,
@@ -3813,10 +3813,10 @@ def cylinder(
         """
         Returns a cylinder with the specified radius and height for each point on the stack
 
-        :param radius: The radius of the cylinder
-        :type radius: float > 0
         :param height: The height of the cylinder
         :type height: float > 0
+        :param radius: The radius of the cylinder
+        :type radius: float > 0
         :param direct: The direction axis for the creation of the cylinder
         :type direct: A three-tuple
         :param angle: The angle to sweep the cylinder arc through

doc/roadmap.rst

@@ -81,9 +81,8 @@ rotation/transform that return a copy
 primitive creation
     Need primitive creation for:
         * cone
-        * cylinder
         * torus
         * wedge
 
 extrude/cut up to surface
-    allow a cut or extrude to terminate at another surface, rather than either through all or a fixed distance
+    allow a cut or extrude to terminate at another surface, rather than either through all or a fixed distance

tests/test_cadquery.py

@@ -2444,7 +2444,7 @@ def testSphereCombine(self):
         self.assertEqual(4, s.faces().size())
 
     def testCylinderDefaults(self):
-        s = Workplane("XY").cylinder(10, 20)
+        s = Workplane("XY").cylinder(20, 10)
         self.saveModel(s)
         self.assertEqual(1, s.size())
         self.assertEqual(1, s.solids().size())
@@ -2462,16 +2462,16 @@ def testCylinderCentering(self):
         for (xopt, xval), (yopt, yval), (zopt, zval) in product(
             zip(b, expected_x), zip(b, expected_y), zip(b, expected_z)
         ):
-            s = Workplane("XY").cylinder(radius, height, centered=(xopt, yopt, zopt))
+            s = Workplane("XY").cylinder(height, radius, centered=(xopt, yopt, zopt))
             self.assertEqual(1, s.size())
             self.assertTupleAlmostEquals(
                 s.val().Center().toTuple(), (xval, yval, zval), 3
             )
         # check centered=True produces the same result as centered=(True, True, True)
         for val in b:
-            s0 = Workplane("XY").cylinder(radius, height, centered=val)
+            s0 = Workplane("XY").cylinder(height, radius, centered=val)
             self.assertEqual(s0.size(), 1)
-            s1 = Workplane("XY").cylinder(radius, height, centered=(val, val, val))
+            s1 = Workplane("XY").cylinder(height, radius, centered=(val, val, val))
             self.assertEqual(s1.size(), 1)
             self.assertTupleAlmostEquals(
                 s0.val().Center().toTuple(), s1.val().Center().toTuple(), 3