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

- added fuse tools control in Preferences UI for the Excellon objects: if checked the app will try to see if there are tools with same diameter and merge the drills for those tools; if not the tools will just be added to the new combined Excellon

Browse Source
This commit is contained in:
Marius Stanciu
2020-06-17 10:36:02 +03:00
committed by Marius
parent c839428a83
commit c9d66381bf
10 changed files with 44 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
appGUI/GUIElements.py
View File

@@ -659,7 +659,7 @@ class EvalEntry2(QtWidgets.QLineEdit):
return QtCore.QSize(EDIT_SIZE_HINT, default_hint_size.height())
class NumericalEvalEntry(EvalEntry):
class NumericalEvalEntry(FCEntry):
"""
Will evaluate the input and return a value. Accepts only float numbers and formulas using the operators: /,*,+,-,%
"""

1
appGUI/preferences/PreferencesUIManager.py
View File

@@ -171,6 +171,7 @@ class PreferencesUIManager:
"excellon_plot": self.ui.excellon_defaults_form.excellon_gen_group.plot_cb,
"excellon_solid": self.ui.excellon_defaults_form.excellon_gen_group.solid_cb,
"excellon_multicolored": self.ui.excellon_defaults_form.excellon_gen_group.multicolored_cb,
"excellon_merge_fuse_tools": self.ui.excellon_defaults_form.excellon_gen_group.fuse_tools_cb,
"excellon_format_upper_in":
self.ui.excellon_defaults_form.excellon_gen_group.excellon_format_upper_in_entry,
"excellon_format_lower_in":

30
appGUI/preferences/excellon/ExcellonGenPrefGroupUI.py
View File

@@ -263,9 +263,25 @@ class ExcellonGenPrefGroupUI(OptionsGroupUI):
separator_line.setFrameShadow(QtWidgets.QFrame.Sunken)
grid2.addWidget(separator_line, 11, 0, 1, 2)
# Fuse Tools
self.join_geo_label = QtWidgets.QLabel('<b>%s</b>:' % _('Join Option'))
grid2.addWidget(self.join_geo_label, 12, 0, 1, 2)
self.fuse_tools_cb = FCCheckBox(_("Fuse Tools"))
self.fuse_tools_cb.setToolTip(
_("When checked the joined (merged) object tools\n"
"will be merged also but only if they share some of their attributes.")
)
grid2.addWidget(self.fuse_tools_cb, 13, 0, 1, 2)
separator_line = QtWidgets.QFrame()
separator_line.setFrameShape(QtWidgets.QFrame.HLine)
separator_line.setFrameShadow(QtWidgets.QFrame.Sunken)
grid2.addWidget(separator_line, 14, 0, 1, 2)
# Excellon Object Color
self.gerber_color_label = QtWidgets.QLabel('<b>%s</b>' % _('Object Color'))
grid2.addWidget(self.gerber_color_label, 12, 0, 1, 2)
grid2.addWidget(self.gerber_color_label, 17, 0, 1, 2)
# Plot Line Color
self.line_color_label = QtWidgets.QLabel('%s:' % _('Outline'))
@@ -274,8 +290,8 @@ class ExcellonGenPrefGroupUI(OptionsGroupUI):
)
self.line_color_entry = FCColorEntry()
grid2.addWidget(self.line_color_label, 13, 0)
grid2.addWidget(self.line_color_entry, 13, 1)
grid2.addWidget(self.line_color_label, 19, 0)
grid2.addWidget(self.line_color_entry, 19, 1)
# Plot Fill Color
self.fill_color_label = QtWidgets.QLabel('%s:' % _('Fill'))
@@ -286,8 +302,8 @@ class ExcellonGenPrefGroupUI(OptionsGroupUI):
)
self.fill_color_entry = FCColorEntry()
grid2.addWidget(self.fill_color_label, 14, 0)
grid2.addWidget(self.fill_color_entry, 14, 1)
grid2.addWidget(self.fill_color_label, 22, 0)
grid2.addWidget(self.fill_color_entry, 22, 1)
# Plot Fill Transparency Level
self.excellon_alpha_label = QtWidgets.QLabel('%s:' % _('Alpha'))
@@ -296,8 +312,8 @@ class ExcellonGenPrefGroupUI(OptionsGroupUI):
)
self.excellon_alpha_entry = FCSliderWithSpinner(0, 255, 1)
grid2.addWidget(self.excellon_alpha_label, 15, 0)
grid2.addWidget(self.excellon_alpha_entry, 15, 1)
grid2.addWidget(self.excellon_alpha_label, 24, 0)
grid2.addWidget(self.excellon_alpha_entry, 24, 1)
self.layout.addStretch()

7
appGUI/preferences/geometry/GeometryGenPrefGroupUI.py
View File

@@ -87,14 +87,13 @@ class GeometryGenPrefGroupUI(OptionsGroupUI):
grid0.addWidget(separator_line, 9, 0, 1, 2)
# Fuse Tools
self.join_geo_label = QtWidgets.QLabel('<b>%s</b>:' % _('Join Geometry'))
self.join_geo_label = QtWidgets.QLabel('<b>%s</b>:' % _('Join Option'))
grid0.addWidget(self.join_geo_label, 10, 0, 1, 2)
self.fuse_tools_cb = FCCheckBox(_("Fuse Tools"))
self.fuse_tools_cb.setToolTip(
_("When checked the joined (merged) geometry object tools\n"
"will be merged also but only if they share the same attributes,\n"
"like diameter, tool_type or type.")
_("When checked the joined (merged) object tools\n"
"will be merged also but only if they share some of their attributes.")
)
grid0.addWidget(self.fuse_tools_cb, 11, 0, 1, 2)