From 8f1e9fd740c5ec417c543ac69b277be172c6ba71 Mon Sep 17 00:00:00 2001 From: Marius Stanciu Date: Sun, 20 Mar 2022 21:46:16 +0200 Subject: [PATCH] - another fix to make the app save correctly the CNCJob objects when saving a project --- CHANGELOG.md | 1 + appObjects/FlatCAMCNCJob.py | 4 +++- camlib.py | 2 +- 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 4e45312f..9e6e505d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -11,6 +11,7 @@ CHANGELOG for FlatCAM beta - added a last resort option to load old projects; the result is not guaranteed if the differences are too great - updated the code in FlatCAMCNCJob object such that more attributes will be serialized in order for loading a project correctly when it has CNCJob objects +- another fix to make the app save correctly the CNCJob objects when saving a project 19.03.2022 diff --git a/appObjects/FlatCAMCNCJob.py b/appObjects/FlatCAMCNCJob.py index 192ed882..5d59bb15 100644 --- a/appObjects/FlatCAMCNCJob.py +++ b/appObjects/FlatCAMCNCJob.py @@ -149,6 +149,8 @@ class CNCJobObject(FlatCAMObj, CNCjob): # (like the one in the TCL Command), False self.multitool = False + self.multigeo = False + self.coords_decimals = 4 self.fr_decimals = 2 @@ -196,7 +198,7 @@ class CNCJobObject(FlatCAMObj, CNCjob): # from predecessors. self.ser_attrs += [ 'obj_options', 'kind', 'tools', 'multitool', 'append_snippet', 'prepend_snippet', 'gc_header', 'gc_start', - 'multigeo', 'travel_distance', 'routing_time', 'used_tools' + 'multigeo', 'used_tools' ] # this is used, so we don't recreate the GCode for loaded objects in set_ui(), it is already there diff --git a/camlib.py b/camlib.py index 8ac5984d..978d1773 100644 --- a/camlib.py +++ b/camlib.py @@ -2850,7 +2850,7 @@ class CNCjob(Geometry): # from Geometry. self.ser_attrs += ['kind', 'z_cut', 'z_move', 'z_toolchange', 'feedrate', 'z_feedrate', 'feedrate_rapid', 'tooldia', 'gcode', 'input_geometry_bounds', 'gcode_parsed', 'steps_per_circle', - 'z_depthpercut', 'spindlespeed', 'dwell', 'dwelltime'] + 'z_depthpercut', 'spindlespeed', 'dwell', 'dwelltime', 'travel_distance', 'routing_time'] @property def postdata(self):