diff --git a/FlatCAMObj.py b/FlatCAMObj.py index c56751e9..b658b63b 100644 --- a/FlatCAMObj.py +++ b/FlatCAMObj.py @@ -1288,6 +1288,8 @@ class FlatCAMGerber(FlatCAMObj, Gerber): def iso_init(geo_obj, app_obj): # Propagate options geo_obj.options["cnctooldia"] = str(self.options["isotooldia"]) + geo_obj.tool_type = self.ui.tool_type_radio.get_value().upper() + geo_obj.solid_geometry = [] for i in range(passes): iso_offset = dia * ((2 * i + 1) / 2.0) - (i * (overlap / 100) * dia) @@ -1417,6 +1419,7 @@ class FlatCAMGerber(FlatCAMObj, Gerber): def iso_init(geo_obj, app_obj): # Propagate options geo_obj.options["cnctooldia"] = str(self.options["isotooldia"]) + geo_obj.tool_type = self.ui.tool_type_radio.get_value().upper() # if milling type is climb then the move is counter-clockwise around features mill_t = 1 if milling_type == 'cl' else 0 @@ -3603,6 +3606,9 @@ class FlatCAMGeometry(FlatCAMObj, Geometry): self.old_toolchangeg_state = self.app.defaults["geometry_toolchange"] self.units_found = self.app.defaults['units'] + # this variable can be updated by the Object that generates the geometry + self.tool_type = 'C1' + # Attributes to be included in serialization # Always append to it because it carries contents # from predecessors. @@ -3859,7 +3865,7 @@ class FlatCAMGeometry(FlatCAMObj, Geometry): 'offset': 'Path', 'offset_value': 0.0, 'type': _('Rough'), - 'tool_type': 'C1', + 'tool_type': self.tool_type, 'data': new_data, 'solid_geometry': self.solid_geometry } diff --git a/README.md b/README.md index 19f46ccc..d8f09119 100644 --- a/README.md +++ b/README.md @@ -15,6 +15,7 @@ CAD program, and create G-Code for Isolation routing. - optimizations in Paint Tool - maximum range for Cut Z is now zero to deal with the situation when using V-shape with tip-dia same value with cut width - modified QValidator in FCDoubleSpinner() GUI element to allow entering the minus sign when the range maximum is set as 0.0; also for positive numbers allowed entering the symbol plus +- made sure that if in Gerber UI the isolation is made with a V-Shape tool then the tool type is automatically updated on the generated Geometry Object 16.12.2019