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

Forgot the first level code that calls _revolve.

Browse Source
This commit is contained in:
Jeremy Wright 2014-09-30 14:26:21 -04:00
parent e57b36c58c
commit a5923cfbed
1 changed files with 16 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
cadquery/CQ.py
View File

@ -1861,7 +1861,7 @@ class Workplane(CQ):
FutureEnhancement: FutureEnhancement:
Support for non-prismatic extrusion ( IE, sweeping along a profile, not just perpendicular to the plane Support for non-prismatic extrusion ( IE, sweeping along a profile, not just perpendicular to the plane
extrude to surface. this is quite tricky since the surface selected may not be planar extrude to surface. this is quite tricky since the surface selected may not be planar
""" """
r = self._extrude(distance) #returns a Solid ( or a compound if there were multiple ) r = self._extrude(distance) #returns a Solid ( or a compound if there were multiple )
if combine: if combine:
return self._combineWithBase(r) return self._combineWithBase(r)
@ -1870,21 +1870,25 @@ class Workplane(CQ):
def revolve(self,angleDegrees,combine=True): def revolve(self,angleDegrees,combine=True):
""" """
Use all un-revolved wires in the parent chain to create a solid. Use all un-revolved wires in the parent chain to create a solid.
:param angleDegrees: the angle to revolve through. :param angleDegrees: the angle to revolve through.
:type angleDegrees: float, anything less than 360 degrees will leave the shape open :type angleDegrees: float, anything less than 360 degrees will leave the shape open
:param boolean combine: True to combine the resulting solid with parent solids if found. :param boolean combine: True to combine the resulting solid with parent solids if found.
:return: a CQ object with the resulting solid selected. :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 The returned object is always a CQ object, and depends on wither combine is True, and
whether a context solid is already defined: whether a context solid is already defined:
* if combine is False, the new value is pushed onto the stack. * if combine is False, the new value is pushed onto the stack.
* if combine is true, the value is combined with the context solid if it exists, * if combine is true, the value is combined with the context solid if it exists,
and the resulting solid becomes the new context solid. and the resulting solid becomes the new context solid.
""" """
r = self._extrude(angleDegrees) #returns a Solid ( or a compound if there were multiple )
if combine:
return self._combineWithBase(r)
else:
return self.newObject([r])
def _combineWithBase2(self,obj): def _combineWithBase2(self,obj):
""" """
@ -2141,8 +2145,6 @@ class Workplane(CQ):
#Revolve the wires, make a compound out of them and then fuse them #Revolve the wires, make a compound out of them and then fuse them
toFuse = [] toFuse = []
for ws in wireSets: for ws in wireSets:
#TODO: Replace the line below with the equivalent revolve function
#thisObj = Solid.extrudeLinear(ws[0], ws[1:], eDir)
thisObj = Solid.revolve(ws[0], ws[1:], angleDegrees) thisObj = Solid.revolve(ws[0], ws[1:], angleDegrees)
toFuse.append(thisObj) toFuse.append(thisObj)