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

- when building the UI for the CNCJob first clear the CNCJob Tools Table

Browse Source
This commit is contained in:
Marius Stanciu
2021-11-22 13:16:32 +02:00
committed by Marius
parent 822df5ba92
commit ee913e16a5
2 changed files with 13 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
appObjects/FlatCAMCNCJob.py
View File

@@ -192,18 +192,21 @@ class CNCJobObject(FlatCAMObj, CNCjob):
self.ui.exc_cnc_tools_table.hide()
if self.options['type'].lower() == 'geometry':
self.ui.cnc_tools_table.show()
self.build_cnc_tools_table()
self.ui.cnc_tools_table.show()
if self.options['type'].lower() == 'excellon':
self.ui.exc_cnc_tools_table.show()
self.build_excellon_cnc_tools()
self.ui.exc_cnc_tools_table.show()
self.ui_connect()
def build_cnc_tools_table(self):
tool_idx = 0
# reset the Tools Table
self.ui.cnc_tools_table.setRowCount(0)
# for the case when self.tools is empty: it can happen for old projects who stored the data elsewhere
if not self.tools:
self.ui.cnc_tools_table.setRowCount(1)
@@ -321,6 +324,9 @@ class CNCJobObject(FlatCAMObj, CNCjob):
if not self.tools:
return
# reset the Tools Table
self.ui.exc_cnc_tools_table.setRowCount(0)
n = len(self.tools)
self.ui.exc_cnc_tools_table.setRowCount(n)
@@ -329,16 +335,15 @@ class CNCJobObject(FlatCAMObj, CNCjob):
tooldia = self.tools[t_id]['tooldia']
row_no = t_id - 1
t_id_item = QtWidgets.QTableWidgetItem('%d' % int(t_id))
dia_item = QtWidgets.QTableWidgetItem('%.*f' % (self.decimals, float(tooldia)))
nr_drills_item = QtWidgets.QTableWidgetItem('%d' % int(dia_value['nr_drills']))
nr_slots_item = QtWidgets.QTableWidgetItem('%d' % int(dia_value['nr_slots']))
try:
offset_val = self.app.dec_format(float(dia_value['offset']), self.decimals) + self.z_cut
except KeyError:
offset_val = self.app.dec_format(float(dia_value['offset_z']), self.decimals) + self.z_cut
t_id_item = QtWidgets.QTableWidgetItem('%d' % int(t_id))
dia_item = QtWidgets.QTableWidgetItem('%.*f' % (self.decimals, float(tooldia)))
nr_drills_item = QtWidgets.QTableWidgetItem('%d' % int(dia_value['nr_drills']))
nr_slots_item = QtWidgets.QTableWidgetItem('%d' % int(dia_value['nr_slots']))
cutz_item = QtWidgets.QTableWidgetItem('%f' % offset_val)
t_id_item.setFlags(QtCore.Qt.ItemFlag.ItemIsEnabled)
@@ -347,17 +352,6 @@ class CNCJobObject(FlatCAMObj, CNCjob):
nr_slots_item.setFlags(QtCore.Qt.ItemFlag.ItemIsEnabled)
cutz_item.setFlags(QtCore.Qt.ItemFlag.ItemIsEnabled)
# hack so the checkbox stay centered in the table cell
# used this:
# https://stackoverflow.com/questions/32458111/pyqt-allign-checkbox-and-put-it-in-every-row
# plot_item = QtWidgets.QWidget()
# checkbox = FCCheckBox()
# checkbox.setCheckState(QtCore.Qt.Checked)
# qhboxlayout = QtWidgets.QHBoxLayout(plot_item)
# qhboxlayout.addWidget(checkbox)
# qhboxlayout.setAlignment(QtCore.Qt.AlignCenter)
# qhboxlayout.setContentsMargins(0, 0, 0, 0)
plot_item = FCCheckBox()
plot_item.setLayoutDirection(QtCore.Qt.LayoutDirection.RightToLeft)