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

- in Preferences, more Plugins preferences UI is upgraded to the new look

Browse Source 
- In Paint Plugin fixed the Area select mode to work with Geometry object created by the Geometry Editor
- in Paint Plugin some changes in the way the source object is autoloaded
- in Paint, NCC and Cutout Plugins when using a mode that require to be terminated (by mouse RMB or ESC key) the notebook UI element is disabled until this is done
This commit is contained in:
Marius Stanciu
2021-10-02 18:02:27 +03:00
committed by Marius
parent a1530963f5
commit bc2f31aa90
13 changed files with 380 additions and 283 deletions
Download Patch File Download Diff File Expand all files Collapse all files

181
appGUI/preferences/tools/Tools2ExtractPrefGroupUI.py
View File

@@ -1,6 +1,6 @@
from PyQt6 import QtWidgets
from appGUI.GUIElements import FCCheckBox, RadioSet, FCDoubleSpinner, FCLabel, FCGridLayout
from appGUI.GUIElements import FCCheckBox, RadioSet, FCDoubleSpinner, FCLabel, FCGridLayout, FCFrame
from appGUI.preferences.OptionsGroupUI import OptionsGroupUI
import gettext
@@ -21,24 +21,23 @@ class Tools2EDrillsPrefGroupUI(OptionsGroupUI):
self.decimals = decimals
self.defaults = defaults
# ## Grid Layout
grid_lay = FCGridLayout(v_spacing=5, h_spacing=3)
self.layout.addLayout(grid_lay)
self.param_label = FCLabel('<b>%s:</b>' % _('Parameters'))
self.param_label.setToolTip(
_("Parameters used for this tool.")
)
grid_lay.addWidget(self.param_label, 0, 0, 1, 2)
self.padt_label = FCLabel("%s:" % _("Processed Pads Type"))
# #############################################################################################################
# PARAMETERS Frame
# #############################################################################################################
self.padt_label = FCLabel('<span style="color:blue;"><b>%s</b></span>' % _("Processed Pads Type"))
self.padt_label.setToolTip(
_("The type of pads shape to be processed.\n"
"If the PCB has many SMD pads with rectangular pads,\n"
"disable the Rectangular aperture.")
)
grid_lay.addWidget(self.padt_label, 2, 0, 1, 2)
self.layout.addWidget(self.padt_label)
param_frame = FCFrame()
self.layout.addWidget(param_frame)
param_grid = FCGridLayout(v_spacing=5, h_spacing=3)
param_frame.setLayout(param_grid)
# Circular Aperture Selection
self.circular_cb = FCCheckBox('%s' % _("Circular"))
@@ -46,7 +45,7 @@ class Tools2EDrillsPrefGroupUI(OptionsGroupUI):
_("Process Circular Pads.")
)
grid_lay.addWidget(self.circular_cb, 3, 0, 1, 2)
param_grid.addWidget(self.circular_cb, 3, 0, 1, 2)
# Oblong Aperture Selection
self.oblong_cb = FCCheckBox('%s' % _("Oblong"))
@@ -54,7 +53,7 @@ class Tools2EDrillsPrefGroupUI(OptionsGroupUI):
_("Process Oblong Pads.")
)
grid_lay.addWidget(self.oblong_cb, 4, 0, 1, 2)
param_grid.addWidget(self.oblong_cb, 4, 0, 1, 2)
# Square Aperture Selection
self.square_cb = FCCheckBox('%s' % _("Square"))
@@ -62,7 +61,7 @@ class Tools2EDrillsPrefGroupUI(OptionsGroupUI):
_("Process Square Pads.")
)
grid_lay.addWidget(self.square_cb, 5, 0, 1, 2)
param_grid.addWidget(self.square_cb, 5, 0, 1, 2)
# Rectangular Aperture Selection
self.rectangular_cb = FCCheckBox('%s' % _("Rectangular"))
@@ -70,7 +69,7 @@ class Tools2EDrillsPrefGroupUI(OptionsGroupUI):
_("Process Rectangular Pads.")
)
grid_lay.addWidget(self.rectangular_cb, 6, 0, 1, 2)
param_grid.addWidget(self.rectangular_cb, 6, 0, 1, 2)
# Others type of Apertures Selection
self.other_cb = FCCheckBox('%s' % _("Others"))
@@ -78,14 +77,22 @@ class Tools2EDrillsPrefGroupUI(OptionsGroupUI):
_("Process pads not in the categories above.")
)
grid_lay.addWidget(self.other_cb, 7, 0, 1, 2)
param_grid.addWidget(self.other_cb, 7, 0, 1, 2)
separator_line = QtWidgets.QFrame()
separator_line.setFrameShape(QtWidgets.QFrame.Shape.HLine)
separator_line.setFrameShadow(QtWidgets.QFrame.Shadow.Sunken)
grid_lay.addWidget(separator_line, 8, 0, 1, 2)
# separator_line = QtWidgets.QFrame()
# separator_line.setFrameShape(QtWidgets.QFrame.Shape.HLine)
# separator_line.setFrameShadow(QtWidgets.QFrame.Shadow.Sunken)
# param_grid.addWidget(separator_line, 8, 0, 1, 2)
# #############################################################################################################
# Method Frame
# #############################################################################################################
met_frame = FCFrame()
self.layout.addWidget(met_frame)
met_grid = FCGridLayout(v_spacing=5, h_spacing=3)
met_frame.setLayout(met_grid)
# Method of extraction
self.method_radio = RadioSet(
[
{'label': _("Fixed Diameter"), 'value': 'fixed'},
@@ -94,26 +101,32 @@ class Tools2EDrillsPrefGroupUI(OptionsGroupUI):
],
orientation='vertical',
compact=True)
self.method_label = FCLabel('<b>%s:</b>' % _("Method"))
self.method_label = FCLabel('<span style="color:green;"><b>%s:</b></span>' % _("Method"))
self.method_label.setToolTip(
_("The method for processing pads. Can be:\n"
"- Fixed Diameter -> all holes will have a set size\n"
"- Fixed Annular Ring -> all holes will have a set annular ring\n"
"- Proportional -> each hole size will be a fraction of the pad size"))
grid_lay.addWidget(self.method_label, 9, 0)
grid_lay.addWidget(self.method_radio, 9, 1)
met_grid.addWidget(self.method_label, 0, 0)
met_grid.addWidget(self.method_radio, 0, 1)
# grid_lay1.addWidget(FCLabel(''))
# separator_line = QtWidgets.QFrame()
# separator_line.setFrameShape(QtWidgets.QFrame.Shape.HLine)
# separator_line.setFrameShadow(QtWidgets.QFrame.Shadow.Sunken)
# param_grid.addWidget(separator_line, 10, 0, 1, 2)
separator_line = QtWidgets.QFrame()
separator_line.setFrameShape(QtWidgets.QFrame.Shape.HLine)
separator_line.setFrameShadow(QtWidgets.QFrame.Shadow.Sunken)
grid_lay.addWidget(separator_line, 10, 0, 1, 2)
# #############################################################################################################
# Fixed Diameter Frame
# #############################################################################################################
self.fixed_label = FCLabel('<span style="color:teal;"><b>%s</b></span>' % _("Fixed Diameter"))
self.layout.addWidget(self.fixed_label)
# Annular Ring
self.fixed_label = FCLabel('<b>%s</b>' % _("Fixed Diameter"))
grid_lay.addWidget(self.fixed_label, 11, 0, 1, 2)
fix_frame = FCFrame()
self.layout.addWidget(fix_frame)
fix_grid = FCGridLayout(v_spacing=5, h_spacing=3)
fix_frame.setLayout(fix_grid)
# Diameter value
self.dia_entry = FCDoubleSpinner()
@@ -125,17 +138,25 @@ class Tools2EDrillsPrefGroupUI(OptionsGroupUI):
_("Fixed hole diameter.")
)
grid_lay.addWidget(self.dia_label, 12, 0)
grid_lay.addWidget(self.dia_entry, 12, 1)
fix_grid.addWidget(self.dia_label, 0, 0)
fix_grid.addWidget(self.dia_entry, 0, 1)
# Annular Ring value
self.ring_label = FCLabel('<b>%s</b>' % _("Fixed Annular Ring"))
# #############################################################################################################
# Annular ring Frame
# #############################################################################################################
self.ring_label = FCLabel('<span style="color:darkorange;"><b>%s</b></span>' % _("Fixed Annular Ring"))
self.ring_label.setToolTip(
_("The size of annular ring.\n"
"The copper sliver between the hole exterior\n"
"and the margin of the copper pad.")
)
grid_lay.addWidget(self.ring_label, 13, 0, 1, 2)
self.layout.addWidget(self.ring_label)
ring_frame = FCFrame()
self.layout.addWidget(ring_frame)
ring_grid = FCGridLayout(v_spacing=5, h_spacing=3)
ring_frame.setLayout(ring_grid)
# Circular Annular Ring Value
self.circular_ring_label = FCLabel('%s:' % _("Circular"))
@@ -147,8 +168,8 @@ class Tools2EDrillsPrefGroupUI(OptionsGroupUI):
self.circular_ring_entry.set_precision(self.decimals)
self.circular_ring_entry.set_range(0.0000, 10000.0000)
grid_lay.addWidget(self.circular_ring_label, 14, 0)
grid_lay.addWidget(self.circular_ring_entry, 14, 1)
ring_grid.addWidget(self.circular_ring_label, 0, 0)
ring_grid.addWidget(self.circular_ring_entry, 0, 1)
# Oblong Annular Ring Value
self.oblong_ring_label = FCLabel('%s:' % _("Oblong"))
@@ -160,8 +181,8 @@ class Tools2EDrillsPrefGroupUI(OptionsGroupUI):
self.oblong_ring_entry.set_precision(self.decimals)
self.oblong_ring_entry.set_range(0.0000, 10000.0000)
grid_lay.addWidget(self.oblong_ring_label, 15, 0)
grid_lay.addWidget(self.oblong_ring_entry, 15, 1)
ring_grid.addWidget(self.oblong_ring_label, 2, 0)
ring_grid.addWidget(self.oblong_ring_entry, 2, 1)
# Square Annular Ring Value
self.square_ring_label = FCLabel('%s:' % _("Square"))
@@ -173,8 +194,8 @@ class Tools2EDrillsPrefGroupUI(OptionsGroupUI):
self.square_ring_entry.set_precision(self.decimals)
self.square_ring_entry.set_range(0.0000, 10000.0000)
grid_lay.addWidget(self.square_ring_label, 16, 0)
grid_lay.addWidget(self.square_ring_entry, 16, 1)
ring_grid.addWidget(self.square_ring_label, 4, 0)
ring_grid.addWidget(self.square_ring_entry, 4, 1)
# Rectangular Annular Ring Value
self.rectangular_ring_label = FCLabel('%s:' % _("Rectangular"))
@@ -186,8 +207,8 @@ class Tools2EDrillsPrefGroupUI(OptionsGroupUI):
self.rectangular_ring_entry.set_precision(self.decimals)
self.rectangular_ring_entry.set_range(0.0000, 10000.0000)
grid_lay.addWidget(self.rectangular_ring_label, 17, 0)
grid_lay.addWidget(self.rectangular_ring_entry, 17, 1)
ring_grid.addWidget(self.rectangular_ring_label, 6, 0)
ring_grid.addWidget(self.rectangular_ring_entry, 6, 1)
# Others Annular Ring Value
self.other_ring_label = FCLabel('%s:' % _("Others"))
@@ -199,11 +220,20 @@ class Tools2EDrillsPrefGroupUI(OptionsGroupUI):
self.other_ring_entry.set_precision(self.decimals)
self.other_ring_entry.set_range(0.0000, 10000.0000)
grid_lay.addWidget(self.other_ring_label, 18, 0)
grid_lay.addWidget(self.other_ring_entry, 18, 1)
ring_grid.addWidget(self.other_ring_label, 8, 0)
ring_grid.addWidget(self.other_ring_entry, 8, 1)
self.prop_label = FCLabel('<b>%s</b>' % _("Proportional Diameter"))
grid_lay.addWidget(self.prop_label, 19, 0, 1, 2)
# #############################################################################################################
# Proportional Diameter Frame
# #############################################################################################################
self.prop_label = FCLabel('<span style="color:indigo;"><b>%s</b></span>' % _("Proportional Diameter"))
self.layout.addWidget(self.prop_label)
prop_frame = FCFrame()
self.layout.addWidget(prop_frame)
prop_grid = FCGridLayout(v_spacing=5, h_spacing=3)
prop_frame.setLayout(prop_grid)
# Factor value
self.factor_entry = FCDoubleSpinner(suffix='%')
@@ -217,14 +247,22 @@ class Tools2EDrillsPrefGroupUI(OptionsGroupUI):
"The hole diameter will be a fraction of the pad size.")
)
grid_lay.addWidget(self.factor_label, 20, 0)
grid_lay.addWidget(self.factor_entry, 20, 1)
prop_grid.addWidget(self.factor_label, 0, 0)
prop_grid.addWidget(self.factor_entry, 0, 1)
# EXTRACT SOLDERMASK
self.extract_sm_label = FCLabel('<b>%s</b>' % _("Extract Soldermask"))
# #############################################################################################################
# Extract Soldermask Frame
# #############################################################################################################
self.extract_sm_label = FCLabel('<span style="color:magenta;"><b>%s</b></span>' % _("Extract Soldermask"))
self.extract_sm_label.setToolTip(
_("Extract soldermask from a given Gerber file."))
grid_lay.addWidget(self.extract_sm_label, 22, 0, 1, 2)
self.layout.addWidget(self.extract_sm_label)
solder_frame = FCFrame()
self.layout.addWidget(solder_frame)
solder_grid = FCGridLayout(v_spacing=5, h_spacing=3)
solder_frame.setLayout(solder_grid)
# CLEARANCE soldermask extraction
self.clearance_label = FCLabel('%s:' % _("Clearance"))
@@ -237,14 +275,22 @@ class Tools2EDrillsPrefGroupUI(OptionsGroupUI):
self.clearance_entry.set_precision(self.decimals)
self.clearance_entry.setSingleStep(0.1)
grid_lay.addWidget(self.clearance_label, 24, 0)
grid_lay.addWidget(self.clearance_entry, 24, 1)
solder_grid.addWidget(self.clearance_label, 0, 0)
solder_grid.addWidget(self.clearance_entry, 0, 1)
# EXTRACT CUTOUT
self.extract_cut_label = FCLabel('<b>%s</b>' % _("Extract Cutout"))
# #############################################################################################################
# Extract CutOut Frame
# #############################################################################################################
self.extract_cut_label = FCLabel('<span style="color:brown;"><b>%s</b></span>' % _("Extract Cutout"))
self.extract_cut_label.setToolTip(
_("Extract a cutout from a given Gerber file."))
grid_lay.addWidget(self.extract_cut_label, 26, 0, 1, 2)
self.layout.addWidget(self.extract_cut_label)
ecut_frame = FCFrame()
self.layout.addWidget(ecut_frame)
ecut_grid = FCGridLayout(v_spacing=5, h_spacing=3)
ecut_frame.setLayout(ecut_grid)
# Margin Cutout
self.margin_cut_label = FCLabel('%s:' % _("Margin"))
@@ -258,8 +304,8 @@ class Tools2EDrillsPrefGroupUI(OptionsGroupUI):
self.margin_cut_entry.set_precision(self.decimals)
self.margin_cut_entry.setSingleStep(0.1)
grid_lay.addWidget(self.margin_cut_label, 28, 0)
grid_lay.addWidget(self.margin_cut_entry, 28, 1)
ecut_grid.addWidget(self.margin_cut_label, 0, 0)
ecut_grid.addWidget(self.margin_cut_entry, 0, 1)
# Thickness Cutout
self.thick_cut_label = FCLabel('%s:' % _("Thickness"))
@@ -271,7 +317,10 @@ class Tools2EDrillsPrefGroupUI(OptionsGroupUI):
self.thick_cut_entry.set_precision(self.decimals)
self.thick_cut_entry.setSingleStep(0.1)
grid_lay.addWidget(self.thick_cut_label, 30, 0)
grid_lay.addWidget(self.thick_cut_entry, 30, 1)
ecut_grid.addWidget(self.thick_cut_label, 2, 0)
ecut_grid.addWidget(self.thick_cut_entry, 2, 1)
FCGridLayout.set_common_column_size(
[param_grid, ring_grid, fix_grid, prop_grid, met_grid, solder_grid, ecut_grid], 0)
self.layout.addStretch()