Fixes for various gcode errors

Some operations were still outputting even if disabled.
Nested comments caused trouble in linuxcnc
Machine was producing an initial move that was potentially dangerous
This commit is contained in:
sliptonic
2016-06-08 08:57:36 -05:00
parent ec5d1150ca
commit 9e3d18f616
7 changed files with 81 additions and 29 deletions

View File

@@ -111,7 +111,7 @@ class ObjectPocket:
obj.setEditorMode('RampSize', 2) # make this hidden
if prop == "UserLabel":
obj.Label = obj.UserLabel + " (" + obj.ToolDescription + ")"
obj.Label = obj.UserLabel + " :" + obj.ToolDescription
def __getstate__(self):
@@ -233,6 +233,9 @@ class ObjectPocket:
# Build up the offset loops
output = ""
if obj.Comment != "":
output += '(' + str(obj.Comment)+')\n'
offsets = []
nextradius = (self.radius * 2) * (float(obj.StepOver)/100)
result = DraftGeomUtils.pocket2d(shape, nextradius)
@@ -374,9 +377,9 @@ class ObjectPocket:
obj.ToolDescription = toolLoad.Name
if obj.UserLabel == "":
obj.Label = obj.Name + " (" + obj.ToolDescription + ")"
obj.Label = obj.Name + " :" + obj.ToolDescription
else:
obj.Label = obj.UserLabel + " (" + obj.ToolDescription + ")"
obj.Label = obj.UserLabel + " :" + obj.ToolDescription
if obj.Base:
for b in obj.Base: