From 5f2516a2bd0b2c267e0540f6065168d9592116be Mon Sep 17 00:00:00 2001 From: Markus Lampert Date: Tue, 10 Oct 2017 16:30:06 -0700 Subject: [PATCH] Using the template attribute encoding/decoding. --- src/Mod/Path/PathScripts/PathJob.py | 1 + src/Mod/Path/PathScripts/PathJobCmd.py | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/src/Mod/Path/PathScripts/PathJob.py b/src/Mod/Path/PathScripts/PathJob.py index 7f909f4289..456365768e 100644 --- a/src/Mod/Path/PathScripts/PathJob.py +++ b/src/Mod/Path/PathScripts/PathJob.py @@ -208,6 +208,7 @@ class ObjectJob: if attrs.get(JobTemplate.Version) and 1 == int(attrs[JobTemplate.Version]): if attrs.get(JobTemplate.SetupSheet): self.setupSheet.setFromTemplate(attrs[JobTemplate.SetupSheet]) + attrs = self.setupSheet.decodeTemplateAttributes(attrs) if attrs.get(JobTemplate.GeometryTolerance): obj.GeometryTolerance = float(attrs.get(JobTemplate.GeometryTolerance)) diff --git a/src/Mod/Path/PathScripts/PathJobCmd.py b/src/Mod/Path/PathScripts/PathJobCmd.py index 2e2f545e91..151b64f928 100644 --- a/src/Mod/Path/PathScripts/PathJobCmd.py +++ b/src/Mod/Path/PathScripts/PathJobCmd.py @@ -261,9 +261,10 @@ class CommandJobTemplateExport: if setupSheetAttrs: attrs[PathJob.JobTemplate.SetupSheet] = setupSheetAttrs + encoded = job.Proxy.setupSheet.encodeTemplateAttributes(attrs) # write template with open(unicode(path), 'wb') as fp: - json.dump(attrs, fp, sort_keys=True, indent=2) + json.dump(encoded, fp, sort_keys=True, indent=2) if FreeCAD.GuiUp: # register the FreeCAD command