Removed F words.

Various fixes from code review
This commit is contained in:
sliptonic
2022-01-16 09:50:06 -06:00
parent 95a83c811b
commit 97e9438960
2 changed files with 17 additions and 19 deletions

View File

@@ -144,9 +144,7 @@ class ObjectDrilling(PathCircularHoleBase.ObjectOp):
self.commandlist.append(Path.Command("(Begin Drilling)"))
# rapid to clearance height
command = Path.Command(
"G0", {"Z": obj.ClearanceHeight.Value, "F": self.vertRapid}
)
command = Path.Command("G0", {"Z": obj.ClearanceHeight.Value})
machine.addCommand(command)
self.commandlist.append(command)
@@ -184,19 +182,15 @@ class ObjectDrilling(PathCircularHoleBase.ObjectOp):
# move to hole location
command = Path.Command(
"G0", {"X": hole["x"], "Y": hole["y"], "F": self.horizRapid}
)
command = Path.Command("G0", {"X": hole["x"], "Y": hole["y"]})
self.commandlist.append(command)
machine.addCommand(command)
command = Path.Command("G0", {"Z": startHeight, "F": self.vertRapid})
command = Path.Command("G0", {"Z": startHeight})
self.commandlist.append(command)
machine.addCommand(command)
command = Path.Command(
"G1", {"Z": obj.StartDepth.Value, "F": self.vertFeed}
)
command = Path.Command("G1", {"Z": obj.StartDepth.Value})
self.commandlist.append(command)
machine.addCommand(command)
@@ -216,7 +210,9 @@ class ObjectDrilling(PathCircularHoleBase.ObjectOp):
PathLog.info(e)
continue
self.commandlist.extend(drillcommands)
for command in drillcommands:
self.commandlist.append(command)
machine.addCommand(command)
# Cancel canned drilling cycle
self.commandlist.append(Path.Command("G80"))

View File

@@ -10,6 +10,7 @@ if False:
else:
PathLog.setLevel(PathLog.Level.INFO, PathLog.thisModule())
def isDrillableCylinder(obj, candidate, tooldiameter=None, vector=App.Vector(0, 0, 1)):
"""
checks if a candidate cylindrical face is drillable
@@ -55,7 +56,7 @@ def isDrillableCylinder(obj, candidate, tooldiameter=None, vector=App.Vector(0,
if not candidate.ShapeType == "Face":
raise TypeError("expected a Face")
if not str(candidate.Surface) == "<Cylinder object>":
if not isinstance(candidate.Surface, Part.Cylinder):
raise TypeError("expected a cylinder")
if len(candidate.Edges) != 3:
@@ -174,9 +175,8 @@ def isDrillable(obj, candidate, tooldiameter=None, vector=App.Vector(0, 0, 1)):
raise TypeError("expected a Face or Edge. Got a {}".format(candidate.ShapeType))
try:
if (
candidate.ShapeType == "Face"
and str(candidate.Surface) == "<Cylinder object>"
if candidate.ShapeType == "Face" and isinstance(
candidate.Surface, Part.Cylinder
):
return isDrillableCylinder(obj, candidate, tooldiameter, vector)
else:
@@ -215,21 +215,23 @@ def getDrillableTargets(obj, ToolDiameter=None, vector=App.Vector(0, 0, 1)):
results = []
for i in range(1, len(shp.Faces)):
fname = 'Face{}'.format(i)
fname = "Face{}".format(i)
PathLog.debug(fname)
candidate = obj.getSubObject(fname)
if not str(candidate.Surface) == '<Cylinder object>':
if not isinstance(candidate.Surface, Part.Cylinder):
continue
try:
drillable = isDrillable(shp, candidate, tooldiameter=ToolDiameter, vector=vector)
drillable = isDrillable(
shp, candidate, tooldiameter=ToolDiameter, vector=vector
)
PathLog.debug("fname: {} : drillable {}".format(fname, drillable))
except Exception as e:
PathLog.debug(e)
continue
if drillable:
results.append((obj,fname))
results.append((obj, fname))
return results