Using the template attribute encoding/decoding.

This commit is contained in:
Markus Lampert
2017-10-10 16:30:06 -07:00
parent f4405d51d5
commit 5f2516a2bd
2 changed files with 3 additions and 1 deletions

View File

@@ -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))

View File

@@ -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