suzanne.soy/cadquery-freecad-module
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed comments on code that was changed.

Browse Source
This commit is contained in:
Jeremy Wright 2014-10-17 23:01:57 -04:00
parent 55d659fa9c
commit af386836a6
2 changed files with 23 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
cadquery/CQ.py
View File

@ -1868,15 +1868,18 @@ class Workplane(CQ):
else:
return self.newObject([r])
def revolve(self,angleDegrees=360,axisStart=None,axisEnd=None,combine=True):
def revolve(self, angleDegrees=360.0, axisStart=None, axisEnd=None, combine=True):
"""
Use all un-revolved wires in the parent chain to create a solid.
:param angleDegrees: the angle to revolve through.
:type angleDegrees: float, anything less than 360 degrees will leave the shape open
:param axisStart: the origin of the center of rotation
:param axisEnd: a vector aligned with the the axis of rotation
:param boolean combine: True to combine the resulting solid with parent solids if found.
:param axisStart: the start point of the axis of rotation
:type axisStart: tuple, a two tuple
:param axisEnd: the end point of the axis of rotation
:type axisEnd: tuple, a two tuple
:param combine: True to combine the resulting solid with parent solids if found.
:type combine: boolean, combine with parent solid
:return: a CQ object with the resulting solid selected.
The returned object is always a CQ object, and depends on wither combine is True, and
@ -1887,10 +1890,10 @@ class Workplane(CQ):
and the resulting solid becomes the new context solid.
"""
#Make sure we account for users specifying angles larger than 360 degrees
angleDegrees = angleDegrees % 360
angleDegrees = angleDegrees % 360.0
#Compensate for FreeCAD not assuming that a 0 degree revolve means a 360 degree revolve
angleDegrees = 360 if angleDegrees == 0 else angleDegrees
angleDegrees = 360.0 if angleDegrees == 0 else angleDegrees
#The default start point of the vector defining the axis of rotation will be the origin of the workplane
if axisStart is None:
@ -2147,13 +2150,16 @@ class Workplane(CQ):
return Compound.makeCompound(toFuse)
def _revolve(self,angleDegrees,axisStart,axisEnd):
def _revolve(self, angleDegrees, axisStart, axisEnd):
"""
Make a solid from the existing set of pending wires.
:param angleDegrees: the angle to revolve through
:param axisStart: the origin of the center of rotation
:param axisEnd: a vector aligned with the the axis of rotation
:param angleDegrees: the angle to revolve through.
:type angleDegrees: float, anything less than 360 degrees will leave the shape open
:param axisStart: the start point of the axis of rotation
:type axisStart: tuple, a two tuple
:param axisEnd: the end point of the axis of rotation
:type axisEnd: tuple, a two tuple
:return: a FreeCAD solid, suitable for boolean operations.
This method is a utility method, primarily for plugin and internal use.

9
cadquery/freecad_impl/shapes.py
View File

@ -751,7 +751,12 @@ class Solid(Shape):
:param outerWire: the outermost wire
:param innerWires: a list of inner wires
:param angleDegrees: the angle through which to revolve the wires
:param angleDegrees: the angle to revolve through.
:type angleDegrees: float, anything less than 360 degrees will leave the shape open
:param axisStart: the start point of the axis of rotation
:type axisStart: tuple, a two tuple
:param axisEnd: the end point of the axis of rotation
:type axisEnd: tuple, a two tuple
:return: a Solid object
The wires must not intersect
@ -779,7 +784,7 @@ class Solid(Shape):
rotateAxis[0] = 0.0 if axisStart[0] == axisEnd[0] else axisEnd[0]
rotateAxis[1] = 0.0 if axisStart[1] == axisEnd[1] else axisEnd[1]
rotateAxis[2] = 0.0 if axisStart[2] == axisEnd[2] else axisEnd[2]
print angleDegrees
#FreeCAD wants a rotation center and then an axis to rotate around rather than an axis of rotation
result = f.revolve(rotateCenter, rotateAxis, angleDegrees)