bartool/flatcam-wsl
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

- in Tools Database added a 3rd column showing the Tool Diameter

Browse Source
This commit is contained in:
Marius Stanciu
2020-11-25 23:22:33 +02:00
committed by Marius Stanciu
parent d49f8a87e6
commit a702f750b2
2 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@@ -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 - 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 - 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 - 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 24.11.2020

9
appDatabase.py
View File

@@ -40,8 +40,8 @@ class ToolsDB2UI:
tree_layout = QtWidgets.QVBoxLayout() tree_layout = QtWidgets.QVBoxLayout()
self.g_lay.addLayout(tree_layout, 0, 0) self.g_lay.addLayout(tree_layout, 0, 0)
self.tree_widget = FCTree(columns=3, header_hidden=False, protected_column=[0, 2]) self.tree_widget = FCTree(columns=3, header_hidden=False, protected_column=[0, 2, 3])
self.tree_widget.setHeaderLabels([_("ID"), _("Tool Name"), _("Target")]) self.tree_widget.setHeaderLabels([_("ID"), _("Name"), _("Target"), _("Diameter")])
self.tree_widget.setIndentation(0) self.tree_widget.setIndentation(0)
self.tree_widget.setContextMenuPolicy(QtCore.Qt.CustomContextMenu) self.tree_widget.setContextMenuPolicy(QtCore.Qt.CustomContextMenu)
self.tree_widget.setSelectionMode(QtWidgets.QAbstractItemView.ExtendedSelection) self.tree_widget.setSelectionMode(QtWidgets.QAbstractItemView.ExtendedSelection)
@@ -1792,12 +1792,15 @@ class ToolsDB2(QtWidgets.QWidget):
5: _('NCC'), 5: _('NCC'),
6: _('Cutout') 6: _('Cutout')
}[dict_val['data']['tool_target']] }[dict_val['data']['tool_target']]
dia = dict_val['tooldia']
try: try:
# self.add_tool_table_line(row, name=t_name, tooldict=dict_val) # self.add_tool_table_line(row, name=t_name, tooldict=dict_val)
self.ui.tree_widget.blockSignals(True) self.ui.tree_widget.blockSignals(True)
try: try:
self.ui.tree_widget.addParentEditable( 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: except Exception as e:
print('FlatCAMCoomn.ToolDB2.build_db_ui() -> ', str(e)) print('FlatCAMCoomn.ToolDB2.build_db_ui() -> ', str(e))
self.ui.tree_widget.blockSignals(False) self.ui.tree_widget.blockSignals(False)