From a702f750b2c13b7110fb655c21112c397717dad8 Mon Sep 17 00:00:00 2001 From: Marius Stanciu Date: Wed, 25 Nov 2020 23:22:33 +0200 Subject: [PATCH] - in Tools Database added a 3rd column showing the Tool Diameter --- CHANGELOG.md | 1 + appDatabase.py | 9 ++++++--- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 8071bc33..aed25a30 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -22,6 +22,7 @@ CHANGELOG for FlatCAM beta - using 'Escape' key shortcut while the focus is in the Tcl Shell command line will set focus on the main canvas - in Tools Database added a new column showing the intended target and also added in the context menu an entry that will sort the tools by tool diameter - fixed in Tools Database the message pop-up that tools are modified but not saved on Toos Database tab closing +- in Tools Database added a 3rd column showing the Tool Diameter 24.11.2020 diff --git a/appDatabase.py b/appDatabase.py index 3fddeed9..9454726c 100644 --- a/appDatabase.py +++ b/appDatabase.py @@ -40,8 +40,8 @@ class ToolsDB2UI: tree_layout = QtWidgets.QVBoxLayout() self.g_lay.addLayout(tree_layout, 0, 0) - self.tree_widget = FCTree(columns=3, header_hidden=False, protected_column=[0, 2]) - self.tree_widget.setHeaderLabels([_("ID"), _("Tool Name"), _("Target")]) + self.tree_widget = FCTree(columns=3, header_hidden=False, protected_column=[0, 2, 3]) + self.tree_widget.setHeaderLabels([_("ID"), _("Name"), _("Target"), _("Diameter")]) self.tree_widget.setIndentation(0) self.tree_widget.setContextMenuPolicy(QtCore.Qt.CustomContextMenu) self.tree_widget.setSelectionMode(QtWidgets.QAbstractItemView.ExtendedSelection) @@ -1792,12 +1792,15 @@ class ToolsDB2(QtWidgets.QWidget): 5: _('NCC'), 6: _('Cutout') }[dict_val['data']['tool_target']] + + dia = dict_val['tooldia'] + try: # self.add_tool_table_line(row, name=t_name, tooldict=dict_val) self.ui.tree_widget.blockSignals(True) try: self.ui.tree_widget.addParentEditable( - parent=parent, title=[str(row+1), t_name, op_name], editable=True) + parent=parent, title=[str(row+1), t_name, op_name, str(dia)], editable=True) except Exception as e: print('FlatCAMCoomn.ToolDB2.build_db_ui() -> ', str(e)) self.ui.tree_widget.blockSignals(False)