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

- renamed the Corner Markers Plugin in Markers Plugin

Browse Source 
- added a new feature in Markers Plugin: now the Margin parameter can be set for both axis: X and Y or both
This commit is contained in:
Marius Stanciu
2021-10-09 22:45:09 +03:00
parent b49b2dd24e
commit 1c42efdcdf
10 changed files with 155 additions and 90 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
appGUI/MainGUI.py
View File

@@ -1133,7 +1133,7 @@ class MainGUI(QtWidgets.QMainWindow):
self.copperfill_btn = self.toolbarplugins.addAction(
QtGui.QIcon(self.app.resource_location + '/copperfill32.png'), _("Copper Thieving"))
self.corners_tool_btn = self.toolbarplugins.addAction(
QtGui.QIcon(self.app.resource_location + '/corners_32.png'), _("Corner Markers"))
QtGui.QIcon(self.app.resource_location + '/corners_32.png'), _("Markers"))
self.punch_btn = self.toolbarplugins.addAction(
QtGui.QIcon(self.app.resource_location + '/punch32.png'), _("Punch Gerber"))
self.calculators_btn = self.toolbarplugins.addAction(
@@ -2477,7 +2477,7 @@ class MainGUI(QtWidgets.QMainWindow):
self.copperfill_btn = self.toolbarplugins.addAction(
QtGui.QIcon(self.app.resource_location + '/copperfill32.png'), _("Copper Thieving"))
self.corners_tool_btn = self.toolbarplugins.addAction(
QtGui.QIcon(self.app.resource_location + '/corners_32.png'), _("Corner Markers"))
QtGui.QIcon(self.app.resource_location + '/corners_32.png'), _("Markers"))
self.punch_btn = self.toolbarplugins.addAction(
QtGui.QIcon(self.app.resource_location + '/punch32.png'), _("Punch Gerber"))
self.calculators_btn = self.toolbarplugins.addAction(
@@ -4890,7 +4890,7 @@ class ShortcutsTab(QtWidgets.QWidget):
# ALT section
_('Alt+A'), _("Align Objects"),
_('Alt+B'), _("Corner Markers"),
_('Alt+B'), _("Markers"),
_('Alt+C'), _("Calculators"),
_('Alt+D'), _("2-Sided PCB"),
_('Alt+E'), _("Extract"),

11
appGUI/preferences/PreferencesUIManager.py
View File

@@ -564,11 +564,12 @@ class PreferencesUIManager:
"tools_sub_delete_sources": self.ui.plugin_pref_form.tools_sub_group.delete_sources_cb,
# Corner Markers Tool
"tools_corners_type": self.ui.plugin_pref_form.tools_corners_group.type_radio,
"tools_corners_thickness": self.ui.plugin_pref_form.tools_corners_group.thick_entry,
"tools_corners_length": self.ui.plugin_pref_form.tools_corners_group.l_entry,
"tools_corners_margin": self.ui.plugin_pref_form.tools_corners_group.margin_entry,
"tools_corners_drill_dia": self.ui.plugin_pref_form.tools_corners_group.drill_dia_entry,
"tools_markers_type": self.ui.plugin_pref_form.tools_markers_group.type_radio,
"tools_markers_thickness": self.ui.plugin_pref_form.tools_markers_group.thick_entry,
"tools_markers_length": self.ui.plugin_pref_form.tools_markers_group.l_entry,
"tools_markers_marginx": self.ui.plugin_pref_form.tools_markers_group.marginx_entry,
"tools_markers_marginy": self.ui.plugin_pref_form.tools_markers_group.marginy_entry,
"tools_markers_drill_dia": self.ui.plugin_pref_form.tools_markers_group.drill_dia_entry,
# #######################################################################################################
# ########################################## PLUGINS 2 ##################################################

8
appGUI/preferences/tools/PluginsPreferencesUI.py
View File

@@ -2,7 +2,7 @@ from PyQt6 import QtWidgets
from appGUI.preferences.tools.ToolsSubPrefGroupUI import ToolsSubPrefGroupUI
from appGUI.preferences.tools.ToolsSolderpastePrefGroupUI import ToolsSolderpastePrefGroupUI
from appGUI.preferences.tools.ToolsCornersPrefGroupUI import ToolsCornersPrefGroupUI
from appGUI.preferences.tools.ToolsMarkersPrefGroupUI import ToolsMarkersPrefGroupUI
from appGUI.preferences.tools.ToolsTransformPrefGroupUI import ToolsTransformPrefGroupUI
from appGUI.preferences.tools.ToolsCalculatorsPrefGroupUI import ToolsCalculatorsPrefGroupUI
@@ -55,8 +55,8 @@ class PluginsPreferencesUI(QtWidgets.QWidget):
self.tools_solderpaste_group = ToolsSolderpastePrefGroupUI(decimals=self.decimals, defaults=self.defaults)
self.tools_solderpaste_group.setMinimumWidth(200)
self.tools_corners_group = ToolsCornersPrefGroupUI(decimals=self.decimals, defaults=self.defaults)
self.tools_corners_group.setMinimumWidth(200)
self.tools_markers_group = ToolsMarkersPrefGroupUI(decimals=self.decimals, defaults=self.defaults)
self.tools_markers_group.setMinimumWidth(200)
self.tools_sub_group = ToolsSubPrefGroupUI(decimals=self.decimals, defaults=self.defaults)
self.tools_sub_group.setMinimumWidth(200)
@@ -77,7 +77,7 @@ class PluginsPreferencesUI(QtWidgets.QWidget):
self.vlay4 = QtWidgets.QVBoxLayout()
self.vlay4.addWidget(self.tools_solderpaste_group)
self.vlay4.addWidget(self.tools_corners_group)
self.vlay4.addWidget(self.tools_markers_group)
self.vlay4.addWidget(self.tools_calculators_group)
self.vlay4.addWidget(self.tools_sub_group)

45
appGUI/preferences/tools/ToolsCornersPrefGroupUI.py → appGUI/preferences/tools/ToolsMarkersPrefGroupUI.py
View File

@@ -12,12 +12,12 @@ if '_' not in builtins.__dict__:
_ = gettext.gettext
class ToolsCornersPrefGroupUI(OptionsGroupUI):
class ToolsMarkersPrefGroupUI(OptionsGroupUI):
def __init__(self, defaults, decimals=4, parent=None):
# OptionsGroupUI.__init__(self, "Calculators Plugin", parent=parent)
super(ToolsCornersPrefGroupUI, self).__init__(self, parent=parent)
super(ToolsMarkersPrefGroupUI, self).__init__(self, parent=parent)
self.setTitle(str(_("Corner Markers Options")))
self.setTitle(str(_("Markers Options")))
self.decimals = decimals
self.defaults = defaults
@@ -64,18 +64,31 @@ class ToolsCornersPrefGroupUI(OptionsGroupUI):
param_grid.addWidget(self.thick_label, 4, 0)
param_grid.addWidget(self.thick_entry, 4, 1)
# Margin #
self.margin_label = FCLabel('%s:' % _("Margin"))
self.margin_label.setToolTip(
# Margin X #
self.marginx_label = FCLabel('%s X:' % _("Margin"))
self.marginx_label.setToolTip(
_("Bounding box margin.")
)
self.margin_entry = FCDoubleSpinner()
self.margin_entry.set_range(-10000.0000, 10000.0000)
self.margin_entry.set_precision(self.decimals)
self.margin_entry.setSingleStep(0.1)
self.marginx_entry = FCDoubleSpinner()
self.marginx_entry.set_range(-10000.0000, 10000.0000)
self.marginx_entry.set_precision(self.decimals)
self.marginx_entry.setSingleStep(0.1)
param_grid.addWidget(self.margin_label, 6, 0)
param_grid.addWidget(self.margin_entry, 6, 1)
param_grid.addWidget(self.marginx_label, 6, 0)
param_grid.addWidget(self.marginx_entry, 6, 1)
# Margin Y #
self.marginy_label = FCLabel('%s Y:' % _("Margin"))
self.marginy_label.setToolTip(
_("Bounding box margin.")
)
self.marginy_entry = FCDoubleSpinner()
self.marginy_entry.set_range(-10000.0000, 10000.0000)
self.marginy_entry.set_precision(self.decimals)
self.marginy_entry.setSingleStep(0.1)
param_grid.addWidget(self.marginy_label, 8, 0)
param_grid.addWidget(self.marginy_entry, 8, 1)
# Length #
self.l_label = FCLabel('%s:' % _("Length"))
@@ -87,8 +100,8 @@ class ToolsCornersPrefGroupUI(OptionsGroupUI):
self.l_entry.set_precision(self.decimals)
self.l_entry.setSingleStep(10 ** -self.decimals)
param_grid.addWidget(self.l_label, 8, 0)
param_grid.addWidget(self.l_entry, 8, 1)
param_grid.addWidget(self.l_label, 10, 0)
param_grid.addWidget(self.l_entry, 10, 1)
# Drill Tool Diameter
self.drill_dia_label = FCLabel('%s:' % _("Drill Dia"))
@@ -100,7 +113,7 @@ class ToolsCornersPrefGroupUI(OptionsGroupUI):
self.drill_dia_entry.set_precision(self.decimals)
self.drill_dia_entry.setWrapping(True)
param_grid.addWidget(self.drill_dia_label, 10, 0)
param_grid.addWidget(self.drill_dia_entry, 10, 1)
param_grid.addWidget(self.drill_dia_label, 12, 0)
param_grid.addWidget(self.drill_dia_entry, 12, 1)
self.layout.addStretch()