- made the Gerber aperture table hidden by default and added a checkbox to show it

This commit is contained in:
Marius Stanciu
2019-02-13 22:34:56 +02:00
committed by Marius S
parent f3b1b45968
commit 53e8e4d486
2 changed files with 21 additions and 4 deletions

View File

@@ -473,6 +473,7 @@ class FlatCAMGerber(FlatCAMObj, Gerber):
self.ui.generate_cutout_button.clicked.connect(self.app.cutout_tool.run) self.ui.generate_cutout_button.clicked.connect(self.app.cutout_tool.run)
self.ui.generate_bb_button.clicked.connect(self.on_generatebb_button_click) self.ui.generate_bb_button.clicked.connect(self.on_generatebb_button_click)
self.ui.generate_noncopper_button.clicked.connect(self.on_generatenoncopper_button_click) self.ui.generate_noncopper_button.clicked.connect(self.on_generatenoncopper_button_click)
self.ui.aperture_table_visibility_cb.stateChanged.connect(self.on_aperture_table_visibility_change)
self.build_ui() self.build_ui()
@@ -862,6 +863,12 @@ class FlatCAMGerber(FlatCAMObj, Gerber):
self.read_form_item('multicolored') self.read_form_item('multicolored')
self.plot() self.plot()
def on_aperture_table_visibility_change(self):
if self.ui.aperture_table_visibility_cb.isChecked():
self.ui.apertures_table.setVisible(True)
else:
self.ui.apertures_table.setVisible(False)
def convert_units(self, units): def convert_units(self, units):
""" """
Converts the units of the object by scaling dimensions in all geometry Converts the units of the object by scaling dimensions in all geometry

View File

@@ -151,6 +151,10 @@ class GerberObjectUI(ObjectUI):
) )
hlay_plot.addWidget(self.apertures_table_label) hlay_plot.addWidget(self.apertures_table_label)
# Aperture Table Visibility CB
self.aperture_table_visibility_cb = FCCheckBox()
hlay_plot.addWidget(self.aperture_table_visibility_cb)
# Plot CB # Plot CB
self.plot_cb = FCCheckBox('Plot Object') self.plot_cb = FCCheckBox('Plot Object')
self.plot_cb.setToolTip( self.plot_cb.setToolTip(
@@ -164,7 +168,7 @@ class GerberObjectUI(ObjectUI):
self.custom_box.addWidget(self.apertures_table) self.custom_box.addWidget(self.apertures_table)
self.apertures_table.setColumnCount(6) self.apertures_table.setColumnCount(6)
self.apertures_table.setHorizontalHeaderLabels(['#', 'D', 'Type', 'Size', 'Dim', 'P']) self.apertures_table.setHorizontalHeaderLabels(['#', 'Code', 'Type', 'Size', 'Dim', 'P'])
self.apertures_table.setSortingEnabled(False) self.apertures_table.setSortingEnabled(False)
self.apertures_table.horizontalHeaderItem(0).setToolTip( self.apertures_table.horizontalHeaderItem(0).setToolTip(
@@ -182,8 +186,14 @@ class GerberObjectUI(ObjectUI):
self.apertures_table.horizontalHeaderItem(5).setToolTip( self.apertures_table.horizontalHeaderItem(5).setToolTip(
"Toggle display of the aperture instances.") "Toggle display of the aperture instances.")
self.empty_label = QtWidgets.QLabel('') # start with apertures table hidden
self.custom_box.addWidget(self.empty_label) self.apertures_table.setVisible(False)
# hide the plot column. for now I can't plot individually the apertures without making the plot really ugly
self.apertures_table.setColumnHidden(5, True)
#
# self.empty_label = QtWidgets.QLabel('')
# self.custom_box.addWidget(self.empty_label)
# Isolation Routing # Isolation Routing
self.isolation_routing_label = QtWidgets.QLabel("<b>Isolation Routing:</b>") self.isolation_routing_label = QtWidgets.QLabel("<b>Isolation Routing:</b>")
@@ -318,7 +328,7 @@ class GerberObjectUI(ObjectUI):
) )
grid2.addWidget(self.clearcopper_label, 0, 0) grid2.addWidget(self.clearcopper_label, 0, 0)
self.generate_ncc_button = QtWidgets.QPushButton('Non-Copper Clear Tool') self.generate_ncc_button = QtWidgets.QPushButton('NCC Tool')
self.generate_ncc_button.setToolTip( self.generate_ncc_button.setToolTip(
"Create the Geometry Object\n" "Create the Geometry Object\n"
"for non-copper routing." "for non-copper routing."