- another fix to make the app save correctly the CNCJob objects when saving a project
This commit is contained in:
@@ -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
|
- 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
|
- 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
|
19.03.2022
|
||||||
|
|
||||||
|
|||||||
@@ -149,6 +149,8 @@ class CNCJobObject(FlatCAMObj, CNCjob):
|
|||||||
# (like the one in the TCL Command), False
|
# (like the one in the TCL Command), False
|
||||||
self.multitool = False
|
self.multitool = False
|
||||||
|
|
||||||
|
self.multigeo = False
|
||||||
|
|
||||||
self.coords_decimals = 4
|
self.coords_decimals = 4
|
||||||
self.fr_decimals = 2
|
self.fr_decimals = 2
|
||||||
|
|
||||||
@@ -196,7 +198,7 @@ class CNCJobObject(FlatCAMObj, CNCjob):
|
|||||||
# from predecessors.
|
# from predecessors.
|
||||||
self.ser_attrs += [
|
self.ser_attrs += [
|
||||||
'obj_options', 'kind', 'tools', 'multitool', 'append_snippet', 'prepend_snippet', 'gc_header', 'gc_start',
|
'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
|
# this is used, so we don't recreate the GCode for loaded objects in set_ui(), it is already there
|
||||||
|
|||||||
@@ -2850,7 +2850,7 @@ class CNCjob(Geometry):
|
|||||||
# from Geometry.
|
# from Geometry.
|
||||||
self.ser_attrs += ['kind', 'z_cut', 'z_move', 'z_toolchange', 'feedrate', 'z_feedrate', 'feedrate_rapid',
|
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',
|
'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
|
@property
|
||||||
def postdata(self):
|
def postdata(self):
|
||||||
|
|||||||
Reference in New Issue
Block a user