suzanne.soy/FreeCAD
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

0001143: Boolean Cut Fails with Extruded Shapestring

Browse Source
This commit is contained in:
wmayer 2013-06-12 17:01:55 +02:00
parent 7e792ef761
commit 2282b72025
1 changed files with 28 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
src/Mod/Draft/Draft.py
View File

@ -3764,13 +3764,34 @@ class _ShapeString(_DraftObject):
# whitespace (ex: ' ') has no faces. This breaks OpenSCAD2Dgeom... # whitespace (ex: ' ') has no faces. This breaks OpenSCAD2Dgeom...
if CharFaces: if CharFaces:
# s = OpenSCAD2Dgeom.Overlappingfaces(CharFaces).makeshape() # s = OpenSCAD2Dgeom.Overlappingfaces(CharFaces).makeshape()
s = self.makeGlyph(CharFaces) #s = self.makeGlyph(CharFaces)
s = self.makeFaces(char)
SSChars.append(s) SSChars.append(s)
shape = Part.Compound(SSChars) shape = Part.Compound(SSChars)
fp.Shape = shape fp.Shape = shape
if plm: if plm:
fp.Placement = plm fp.Placement = plm
def makeFaces(self, wireChar):
import Part
compFaces=[]
wirelist=sorted(wireChar,key=(lambda shape: shape.BoundBox.DiagonalLength),reverse=True)
wire2Face = [wirelist[0]]
face = Part.Face(wirelist[0])
for w in wirelist[1:]:
p = w.Vertexes[0].Point
u,v = face.Surface.parameter(p)
if face.isPartOfDomain(u,v):
if face.Orientation == w.Orientation:
w.reverse()
wire2Face.append(w)
else:
compFaces.append(Part.Face(w))
face = Part.Face(wire2Face)
compFaces.append(face)
ret = Part.Compound(compFaces)
return ret
def makeGlyph(self, facelist): def makeGlyph(self, facelist):
''' turn list of simple contour faces into a compound shape representing a glyph ''' ''' turn list of simple contour faces into a compound shape representing a glyph '''
''' remove cuts, fuse overlapping contours, retain islands ''' ''' remove cuts, fuse overlapping contours, retain islands '''
@ -3799,7 +3820,11 @@ class _ShapeString(_DraftObject):
else: else:
# partial overlap - (font designer error?) # partial overlap - (font designer error?)
result = result.fuse(face) result = result.fuse(face)
glyphfaces = [result] #glyphfaces = [result]
wl = result.Wires
for w in wl:
w.fixWire()
glyphfaces = [Part.Face(wl)]
glyphfaces.extend(islands) glyphfaces.extend(islands)
ret = Part.Compound(glyphfaces) # should we fuse these instead of making compound? ret = Part.Compound(glyphfaces) # should we fuse these instead of making compound?
return ret return ret