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

Fixes for various gcode errors

Browse Source 
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
Download Patch File Download Diff File Expand all files Collapse all files

11
src/Mod/Path/PathScripts/PathProfile.py
View File

@@ -127,7 +127,7 @@ class ObjectProfile:
def onChanged(self, obj, prop):
if prop == "UserLabel":
obj.Label = obj.UserLabel + " (" + obj.ToolDescription + ")"
obj.Label = obj.UserLabel + " :" + obj.ToolDescription
def addprofilebase(self, obj, ss, sub=""):
baselist = obj.Base
@@ -171,7 +171,8 @@ class ObjectProfile:
def _buildPathOCC(self, obj, wire):
import DraftGeomUtils
output = ""
output += '(' + str(obj.Comment)+')\n'
if obj.Comment != "":
output += '(' + str(obj.Comment)+')\n'
if obj.Direction == 'CCW':
clockwise = False
@@ -194,6 +195,8 @@ class ObjectProfile:
import math
import area
output = ""
if obj.Comment != "":
output += '(' + str(obj.Comment)+')\n'
if obj.StartPoint and obj.UseStartPoint:
startpoint = obj.StartPoint
@@ -280,9 +283,9 @@ print "y - " + str(point.y)
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: