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

fix for drilling in Compound objects.

Browse Source 
Better check of hole face ordering.
This commit is contained in:
sliptonic 2016-11-06 17:42:50 -06:00
parent fe11942afb
commit 18ea91cc25
2 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/Mod/Path/PathScripts/PathDrilling.py
View File

@ -189,15 +189,26 @@ class ObjectDrilling:
drillable = False drillable = False
if obj.ShapeType == 'Vertex': if obj.ShapeType == 'Vertex':
drillable = True drillable = True
elif obj.ShapeType == 'Solid': elif obj.ShapeType in['Solid', 'Compound']:
if sub[0:4] == 'Face': if sub[0:4] == 'Face':
subobj = obj.getElement(sub) subobj = obj.getElement(sub)
if isinstance(subobj.Edges[0].Curve, Part.Circle): if isinstance(subobj.Edges[0].Curve, Part.Circle):
drillable = True drillable = True
if str(subobj.Surface) == "<Cylinder object>": if str(subobj.Surface) == "<Cylinder object>":
drillable = True drillable = True
if len(subobj.Edges[0].Vertexes) > 1: if len(subobj.Edges) == 3:
drillable = False cedge = []
ledge = []
for e in subobj.Edges:
if isinstance (e.Curve, Part.Circle):
cedge.append(e)
elif isinstance (e.Curve, Part.Line):
ledge.append(e)
if len(cedge) == 2 and len(ledge) == 1:
drillable = True
else:
#if len(subobj.Edges[0].Vertexes) > 1:
drillable = False
if sub[0:4] == 'Edge': if sub[0:4] == 'Edge':
o = obj.getElement(sub) o = obj.getElement(sub)
if isinstance(o.Curve, Part.Circle) and len(o.Vertexes) == 1: if isinstance(o.Curve, Part.Circle) and len(o.Vertexes) == 1:

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

@ -100,7 +100,7 @@ class DRILLGate:
return False return False
if obj.ShapeType == 'Vertex': if obj.ShapeType == 'Vertex':
drillable = True drillable = True
elif obj.ShapeType == 'Solid': elif obj.ShapeType in['Solid', 'Compound']:
if sub[0:4] == 'Face': if sub[0:4] == 'Face':
subobj = obj.getElement(sub) subobj = obj.getElement(sub)
drillable = isinstance(subobj.Edges[0].Curve, Part.Circle) drillable = isinstance(subobj.Edges[0].Curve, Part.Circle)