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

clean should be called in case of combine=False

Browse Source
This commit is contained in:
hyOzd 2015-08-02 14:53:41 +03:00
parent 29ef1937ab
commit 2101161af1
1 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
cadquery/CQ.py
View File

@ -1890,9 +1890,11 @@ class Workplane(CQ):
r = r.fuse(thisObj)
if combine:
return self._combineWithBase(r, clean)
newS = self._combineWithBase(r)
else:
return self.newObject([r])
newS = self.newObject([r])
if clean: newS = newS.clean()
return newS
def extrude(self, distance, combine=True, clean=True):
"""
@ -1919,9 +1921,11 @@ class Workplane(CQ):
"""
r = self._extrude(distance) # returns a Solid (or a compound if there were multiple)
if combine:
return self._combineWithBase(r, clean)
newS = self._combineWithBase(r)
else:
return self.newObject([r])
newS = self.newObject([r])
if clean: newS = newS.clean()
return newS
def revolve(self, angleDegrees=360.0, axisStart=None, axisEnd=None, combine=True, clean=True):
"""
@ -1972,11 +1976,13 @@ class Workplane(CQ):
# returns a Solid (or a compound if there were multiple)
r = self._revolve(angleDegrees, axisStart, axisEnd)
if combine:
return self._combineWithBase(r, clean)
newS = self._combineWithBase(r)
else:
return self.newObject([r])
news = self.newObject([r])
if clean: newS = newS.clean()
return newS
def _combineWithBase(self, obj, clean):
def _combineWithBase(self, obj):
"""
Combines the provided object with the base solid, if one can be found.
:param obj:
@ -1989,8 +1995,6 @@ class Workplane(CQ):
r = baseSolid.fuse(obj)
baseSolid.wrapped = r.wrapped
if clean: r = r.clean()
return self.newObject([r])
def combine(self, clean=True):