- in NCC and Paint Tool fixed some issues with missing keys in the tool data dictionary
This commit is contained in:
parent
d4555c02d0
commit
738cda0de5
|
@ -10,6 +10,7 @@ CHANGELOG for FlatCAM beta
|
|||
21.10.2020
|
||||
|
||||
- in Geometry Object fixed the issue with not using the End X-Y value and also made some other updates here
|
||||
- in NCC and Paint Tool fixed some issues with missing keys in the tool data dictionary
|
||||
|
||||
20.10.2020
|
||||
|
||||
|
|
|
@ -548,6 +548,7 @@ class NonCopperClear(AppTool, Gerber):
|
|||
"area_shape": self.app.defaults["geometry_area_shape"],
|
||||
"area_strategy": self.app.defaults["geometry_area_strategy"],
|
||||
"area_overz": float(self.app.defaults["geometry_area_overz"]),
|
||||
"optimization_type": self.app.defaults["geometry_optimization_type"],
|
||||
|
||||
"tools_nccoperation": self.app.defaults["tools_nccoperation"],
|
||||
"tools_nccmargin": self.app.defaults["tools_nccmargin"],
|
||||
|
|
|
@ -466,6 +466,7 @@ class ToolPaint(AppTool, Gerber):
|
|||
"area_shape": self.app.defaults["geometry_area_shape"],
|
||||
"area_strategy": self.app.defaults["geometry_area_strategy"],
|
||||
"area_overz": float(self.app.defaults["geometry_area_overz"]),
|
||||
"optimization_type": self.app.defaults["geometry_optimization_type"],
|
||||
|
||||
"tooldia": self.app.defaults["tools_painttooldia"],
|
||||
"tools_paintoffset": self.app.defaults["tools_paintoffset"],
|
||||
|
|
|
@ -5301,7 +5301,11 @@ class CNCjob(Geometry):
|
|||
self.feedrate_rapid = float(tool_dict['feedrate_rapid'])
|
||||
|
||||
self.spindlespeed = float(tool_dict['spindlespeed'])
|
||||
self.spindledir = tool_dict['spindledir']
|
||||
try:
|
||||
self.spindledir = tool_dict['spindledir']
|
||||
except KeyError:
|
||||
self.spindledir = self.app.defaults["geometry_spindledir"]
|
||||
|
||||
self.dwell = tool_dict['dwell']
|
||||
self.dwelltime = float(tool_dict['dwelltime'])
|
||||
|
||||
|
|
Loading…
Reference in New Issue