kindred/create
1
1
Fork 0
Code Issues 53 Pull Requests Actions Packages Projects 9 Releases 2 Wiki Activity

Added more cleanup to the pocket shape face before extrusion - greatly improves stability.

Browse Source
This commit is contained in:
Markus Lampert
2017-10-01 13:04:03 -07:00
committed by wmayer
parent f6d4160587
commit af892cc44a
3 changed files with 25 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/Mod/Path/PathScripts/PathGeom.py
View File

@@ -100,11 +100,7 @@ class PathGeom:
Return true if the edges start and end at the same point and have the same type of curve.""" % PathGeomTolerance
if type(e0.Curve) != type(e1.Curve):
return False
if not cls.pointsCoincide(e0.valueAt(e0.FirstParameter), e1.valueAt(e1.FirstParameter)):
return False
if not cls.pointsCoincide(e0.valueAt(e0.LastParameter), e1.valueAt(e1.LastParameter)):
return False
return True
return all(cls.pointsCoincide(e0.Vertexes[i].Point, e1.Vertexes[i].Point) for i in range(len(e0.Vertexes)))
@classmethod
def edgeConnectsTo(cls, edge, vector, error=PathGeomTolerance):
@@ -464,3 +460,11 @@ class PathGeom:
shapes = combined
return shapes
@classmethod
def removeDuplicateEdges(cls, wire):
unique = []
for e in wire.Edges:
if not any(cls.edgesMatch(e, u) for u in unique):
unique.append(e)
return Part.Wire(unique)

2
src/Mod/Path/PathScripts/PathOpGui.py
View File

@@ -48,7 +48,7 @@ __doc__ = "Base classes and framework for Path operation's UI"
TaskPanelLayout = 0
if True:
if False:
PathLog.setLevel(PathLog.Level.DEBUG, PathLog.thisModule())
PathLog.trackModule(PathLog.thisModule())
else:

25
src/Mod/Path/PathScripts/PathPocketShape.py
View File

@@ -67,7 +67,7 @@ class ObjectPocket(PathPocketBase.ObjectPocket):
if obj.Base:
PathLog.debug("base items exist. Processing...")
self.removalshapes = []
horizontal = []
self.horiz = []
vertical = []
for o in obj.Base:
PathLog.debug("Base item: {}".format(o))
@@ -77,14 +77,14 @@ class ObjectPocket(PathPocketBase.ObjectPocket):
face = base.Shape.getElement(sub)
if type(face.Surface) == Part.Plane and PathGeom.isVertical(face.Surface.Axis):
# it's a flat horizontal face
horizontal.append(face)
self.horiz.append(face)
elif type(face.Surface) == Part.Cylinder and PathGeom.isVertical(face.Surface.Axis):
# vertical cylinder wall
if any(e.isClosed() for e in face.Edges):
# complete cylinder
circle = Part.makeCircle(face.Surface.Radius, face.Surface.Center)
disk = Part.Face(Part.Wire(circle))
horizontal.append(disk)
self.horiz.append(disk)
else:
# partial cylinder wall
vertical.append(face)
@@ -94,21 +94,26 @@ class ObjectPocket(PathPocketBase.ObjectPocket):
PathLog.error(translate('PathPocket', "Pocket does not support shape %s.%s") % (base.Label, sub))
self.vertical = PathGeom.combineConnectedShapes(vertical)
vWires = [TechDraw.findShapeOutline(shape, 1, FreeCAD.Vector(0, 0, 1)) for shape in self.vertical]
for wire in vWires:
face = Part.Face(wire)
self.vWires = [TechDraw.findShapeOutline(shape, 1, FreeCAD.Vector(0, 0, 1)) for shape in self.vertical]
for wire in self.vWires:
w = PathGeom.removeDuplicateEdges(wire)
face = Part.Face(w)
face.tessellate(0.1)
if PathGeom.isRoughly(face.Area, 0):
PathLog.error(translate('PathPocket', 'Vertical faces do not form a loop - ignoring'))
else:
horizontal.append(face)
self.horiz.append(face)
# move all horizontal faces to FinalDepth
for face in horizontal:
face.translate(FreeCAD.Vector(0, 0, obj.FinalDepth.Value - face.BoundBox.ZMin))
for f in self.horiz:
f.translate(FreeCAD.Vector(0, 0, obj.FinalDepth.Value - f.BoundBox.ZMin))
# check all faces and see if they are touching/overlapping and combine those into a compound
self.horizontal = PathGeom.combineConnectedShapes(horizontal)
self.horizontal = PathGeom.combineConnectedShapes(self.horiz)
for shape in self.horizontal:
shape.sewShape()
shape.tessellate(0.1)
# extrude all faces up to StartDepth and those are the removal shapes
extent = FreeCAD.Vector(0, 0, obj.StartDepth.Value - obj.FinalDepth.Value)