Fixed coolant with dressup

This commit is contained in:
Patrick Felixberger
2020-03-02 21:17:19 +01:00
parent 51c1897a3a
commit fefc725903

View File

@@ -258,6 +258,17 @@ def export(objectslist, filename, argstring):
if not hasattr(obj, "Path"):
print("The object " + obj.Name + " is not a path. Please select only path and Compounds.")
return
isActive = True
if hasattr(obj, "Active") or hasattr(obj, 'Base') and hasattr(obj.Base, "Active"):
if hasattr(obj, "Active"):
isActive = obj.Active
else:
isActive = obj.Base.Active
if isActive:
print("obj.Base.active true")
else:
print("obj.active false")
# do the pre_op
if OUTPUT_BCNC:
@@ -269,16 +280,22 @@ def export(objectslist, filename, argstring):
for line in PRE_OPERATION.splitlines(True):
gcode += linenumber() + line
# get coolant mode
coolantMode = 'None'
if hasattr(obj, "CoolantMode") or hasattr(obj, 'Base') and hasattr(obj.Base, "CoolantMode"):
if hasattr(obj, "CoolantMode"):
coolantMode = obj.CoolantMode
else:
coolantMode = obj.Base.CoolantMode
# turn coolant on if required
if hasattr(obj, "CoolantMode"):
coolantMode = obj.CoolantMode
if OUTPUT_COMMENTS:
if not coolantMode == 'None':
gcode += linenumber() + '(Coolant On:' + coolantMode + ')\n'
if coolantMode == 'Flood':
gcode += linenumber() + 'M8' + '\n'
if coolantMode == 'Mist':
gcode += linenumber() + 'M7' + '\n'
if OUTPUT_COMMENTS and isActive:
if not coolantMode == 'None':
gcode += linenumber() + '(Coolant On:' + coolantMode + ')\n'
if coolantMode == 'Flood' and isActive:
gcode += linenumber() + 'M8' + '\n'
if coolantMode == 'Mist' and isActive:
gcode += linenumber() + 'M7' + '\n'
# Parse the op
gcode += parse(obj)
@@ -290,12 +307,11 @@ def export(objectslist, filename, argstring):
gcode += linenumber() + line
# turn coolant off if required
if hasattr(obj, "CoolantMode"):
coolantMode = obj.CoolantMode
if not coolantMode == 'None':
if OUTPUT_COMMENTS:
gcode += linenumber() + '(Coolant Off:' + coolantMode + ')\n'
gcode += linenumber() +'M9' + '\n'
if not coolantMode == 'None':
if OUTPUT_COMMENTS and isActive:
gcode += linenumber() + '(Coolant Off:' + coolantMode + ')\n'
if isActive:
gcode += linenumber() +'M9' + '\n'
# do the post_amble
if OUTPUT_BCNC: