From 2ebc231f6f01ab08bfd00cb20c49d5677cba6673 Mon Sep 17 00:00:00 2001 From: Marius Stanciu Date: Fri, 28 Jan 2022 03:26:22 +0200 Subject: [PATCH] - in camlib.CNCjob.gcode_parse() fixed an assumption that a certain object is present: tool_data["tools_drill_toolchange"] --- CHANGELOG.md | 1 + camlib.py | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 8668fa55..8a80268b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -10,6 +10,7 @@ CHANGELOG for FlatCAM beta 28.01.2022 - in Tcl command `geocutout` fixed an error due of a no longer used parameter +- in camlib.CNCjob.gcode_parse() fixed an assumption that a certain object is present: tool_data["tools_drill_toolchange"] 27.01.2022 diff --git a/camlib.py b/camlib.py index 8bb6c5e2..be513504 100644 --- a/camlib.py +++ b/camlib.py @@ -6570,12 +6570,12 @@ class CNCjob(Geometry): toolchange_xy_mill = self.app.defaults["tools_mill_toolchangexy"] toolchange_xy_drill = self.app.defaults["tools_drill_toolchangexy"] else: - if tool_data["tools_mill_toolchange"] is True: + if "tools_drill_toolchange" in tool_data and tool_data["tools_mill_toolchange"] is True: toolchange_xy_mill = tool_data["tools_mill_toolchangexy"] else: toolchange_xy_mill = (0, 0) - if tool_data["tools_drill_toolchange"] is True: + if "tools_drill_toolchange" in tool_data and tool_data["tools_drill_toolchange"] is True: toolchange_xy_drill = tool_data["tools_drill_toolchangexy"] else: toolchange_xy_drill = (0, 0)