- in ParseDXF file fixed import of module due of changes in the latest version of ezdxf module

- changes in Milling Plugin in the selection in the Tools Table
- some updates of milling data structure
- changes in handling the tool shape due of moving the parameter from the tool table in the tool parameters section
This commit is contained in:
Marius Stanciu
2021-07-21 00:46:55 +03:00
committed by Marius
parent d4d2a93c4e
commit 29988a622e
13 changed files with 108 additions and 148 deletions

View File

@@ -240,9 +240,9 @@ class CNCJobObject(FlatCAMObj, CNCjob):
job_item = QtWidgets.QTableWidgetItem(job_item_txt)
try:
tool_shape_item_txt = tool_shape_options[dia_value['data']['tools_mill_shape']]
tool_shape_item_txt = tool_shape_options[dia_value['data']['tools_mill_tool_shape']]
except TypeError:
tool_shape_item_txt = dia_value['data']['tools_mill_shape']
tool_shape_item_txt = dia_value['data']['tools_mill_tool_shape']
tool_shape_item = QtWidgets.QTableWidgetItem(tool_shape_item_txt)
t_id.setFlags(QtCore.Qt.ItemIsEnabled)