- updated the 'Default_no_M6' preprocessor by removing the Tx command in the Toolchange section to make it compatible with GRBL controllers
- added a new preprocessor named 'Check_points' which is to be used to check if the PCB is well aligned in position (used by at least the Corners Tool) - Tool Corners - added a new feature that creates a verification GCode by moving in the locations positions; modfied the UI a bit - Drilling Tool - removed the mandatory Toolchange event added even if the Toolchange was not selected - Excellon and Geometry objects no longer have the self.options dict overwritten with the application defaults - Drilling Tool - first tool that benefit from using the object options instead of application defaults; this is useful if an object is recreated on project load - Drilling Tool - fixed it to update the UI form also for common parameters on object change
This commit is contained in:
@@ -520,18 +520,15 @@ class GeometryObject(FlatCAMObj, Geometry):
|
||||
# store here the default data for Geometry Data
|
||||
self.default_data = {}
|
||||
|
||||
for opt_key, opt_val in self.app.options.items():
|
||||
if opt_key.find('geometry' + "_") == 0:
|
||||
oname = opt_key[len('geometry') + 1:]
|
||||
self.default_data[oname] = self.app.options[opt_key]
|
||||
elif opt_key.find('tools_') == 0:
|
||||
self.default_data[opt_key] = self.app.options[opt_key]
|
||||
# for opt_key, opt_val in self.options.items():
|
||||
# if opt_key.find('geometry' + "_") == 0:
|
||||
# oname = opt_key[len('geometry') + 1:]
|
||||
# self.default_data[oname] = self.app.options[opt_key]
|
||||
# elif opt_key.find('tools_') == 0:
|
||||
# self.default_data[opt_key] = self.app.options[opt_key]
|
||||
|
||||
# fill in self.default_data values from self.options
|
||||
for def_key in self.default_data:
|
||||
for opt_key, opt_val in self.options.items():
|
||||
if def_key == opt_key:
|
||||
self.default_data[def_key] = deepcopy(opt_val)
|
||||
self.default_data.update(self.options)
|
||||
|
||||
if type(self.options["tools_mill_tooldia"]) == float:
|
||||
tools_list = [self.options["tools_mill_tooldia"]]
|
||||
|
||||
Reference in New Issue
Block a user