Fixed contour naming;

only touch dependent TC objects if the tool number changed;
changed formatting of intermediate path representation to be valid g-code and not use exponents.
This commit is contained in:
Markus Lampert
2016-12-11 15:33:56 -08:00
parent 0074f7c352
commit d32b92d00d
3 changed files with 18 additions and 15 deletions
+8 -5
View File
@@ -120,9 +120,15 @@ class ObjectContour:
def __setstate__(self, state):
return None
def setLabel(self, obj):
if not obj.UserLabel:
obj.Label = obj.Name + " :" + obj.ToolDescription
else:
obj.Label = obj.UserLabel + " :" + obj.ToolDescription
def onChanged(self, obj, prop):
if prop == "UserLabel":
obj.Label = obj.UserLabel + " :" + obj.ToolDescription
self.setLabel(obj)
def setDepths(proxy, obj):
parentJob = PathUtils.findParentJob(obj)
@@ -231,10 +237,7 @@ class ObjectContour:
obj.ToolNumber = toolLoad.ToolNumber
obj.ToolDescription = toolLoad.Name
if obj.UserLabel == "":
obj.Label = obj.Name + " :" + obj.ToolDescription
else:
obj.Label = obj.UserLabel + " :" + obj.ToolDescription
self.setLabel(obj)
output += "(" + obj.Label + ")"
if not obj.UseComp:
+6 -9
View File
@@ -58,7 +58,6 @@ class LoadTool():
obj.setEditorMode('Placement', mode)
def execute(self, obj):
tool = PathUtils.getTool(obj, obj.ToolNumber)
if tool is not None:
obj.Label = obj.Name + ": " + tool.Name
@@ -86,14 +85,12 @@ class LoadTool():
obj.ViewObject.Visibility = True
def onChanged(self, obj, prop):
mode = 2
obj.setEditorMode('Placement', mode)
# if prop == "ToolNumber":
job = PathUtils.findParentJob(obj)
if job is not None:
for g in job.Group:
if not(isinstance(g.Proxy, PathScripts.PathLoadTool.LoadTool)):
g.touch()
if prop == "ToolNumber" and not 'Restore' in obj.State:
job = PathUtils.findParentJob(obj)
if job is not None:
for g in job.Group:
if not(isinstance(g.Proxy, PathScripts.PathLoadTool.LoadTool)):
g.touch()
class _ViewProviderLoadTool: