From 3624d20b188337c65302f2da068b3ccbf52ab1b7 Mon Sep 17 00:00:00 2001 From: Marius Stanciu Date: Sun, 3 Oct 2021 00:01:54 +0300 Subject: [PATCH] - upgraded Optimal and Calibration Plugins Preferences UI --- CHANGELOG.md | 3 +- .../preferences/tools/Tools2CalPrefGroupUI.py | 111 +++++++++++------- .../tools/Tools2OptimalPrefGroupUI.py | 19 +-- .../preferences/tools/ToolsFilmPrefGroupUI.py | 4 +- 4 files changed, 82 insertions(+), 55 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 8553b6af..e4cb24de 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -16,7 +16,8 @@ CHANGELOG for FlatCAM beta - for Transform and SolderPaste Plugins upgraded the UI - in SolderPaste Plugin now the paste is dispensed only on the pads/Gerber flashes - fixed Find Optimal Plugin: there was an error triggered after finding the minimum distance -- upgraded the FInd Optimal Plugin UI +- upgraded the Find Optimal Plugin UI +- upgraded Optimal and Calibration Plugins Preferences UI 1.10.2021 diff --git a/appGUI/preferences/tools/Tools2CalPrefGroupUI.py b/appGUI/preferences/tools/Tools2CalPrefGroupUI.py index 90601823..91f4d06e 100644 --- a/appGUI/preferences/tools/Tools2CalPrefGroupUI.py +++ b/appGUI/preferences/tools/Tools2CalPrefGroupUI.py @@ -1,6 +1,7 @@ from PyQt6 import QtWidgets -from appGUI.GUIElements import RadioSet, FCDoubleSpinner, FCCheckBox, NumericalEvalTupleEntry, FCLabel, FCGridLayout +from appGUI.GUIElements import RadioSet, FCDoubleSpinner, FCCheckBox, NumericalEvalTupleEntry, FCLabel, \ + FCGridLayout, FCFrame from appGUI.preferences.OptionsGroupUI import OptionsGroupUI import gettext @@ -21,18 +22,24 @@ class Tools2CalPrefGroupUI(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('%s:' % _('Parameters')) + # ############################################################################################################# + # Parameters Frame + # ############################################################################################################# + self.param_label = FCLabel('%s' % _('Parameters')) self.param_label.setToolTip( _("Parameters used for this tool.") ) - grid_lay.addWidget(self.param_label, 0, 0, 1, 2) + + par_frame = FCFrame() + self.layout.addWidget(par_frame) + + param_grid = FCGridLayout(v_spacing=5, h_spacing=3) + par_frame.setLayout(param_grid) + + param_grid.addWidget(self.param_label, 0, 0, 1, 2) # Calibration source - self.cal_source_lbl = FCLabel("%s:" % _("Source Type")) + self.cal_source_lbl = FCLabel("%s:" % _("Source Type")) self.cal_source_lbl.setToolTip(_("The source of calibration points.\n" "It can be:\n" "- Object -> click a hole geo for Excellon or a pad for Gerber\n" @@ -41,13 +48,13 @@ class Tools2CalPrefGroupUI(OptionsGroupUI): {'label': _('Free'), 'value': 'free'}], compact=True) - grid_lay.addWidget(self.cal_source_lbl, 1, 0) - grid_lay.addWidget(self.cal_source_radio, 1, 1, 1, 2) + param_grid.addWidget(self.cal_source_lbl, 2, 0) + param_grid.addWidget(self.cal_source_radio, 2, 1, 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, 2, 0, 1, 2) + param_grid.addWidget(separator_line, 4, 0, 1, 2) # Travel Z entry travelz_lbl = FCLabel('%s:' % _("Travel Z")) @@ -60,8 +67,8 @@ class Tools2CalPrefGroupUI(OptionsGroupUI): self.travelz_entry.set_precision(self.decimals) self.travelz_entry.setSingleStep(0.1) - grid_lay.addWidget(travelz_lbl, 3, 0) - grid_lay.addWidget(self.travelz_entry, 3, 1, 1, 2) + param_grid.addWidget(travelz_lbl, 6, 0) + param_grid.addWidget(self.travelz_entry, 6, 1, 1, 2) # Verification Z entry verz_lbl = FCLabel('%s:' % _("Verification Z")) @@ -74,8 +81,8 @@ class Tools2CalPrefGroupUI(OptionsGroupUI): self.verz_entry.set_precision(self.decimals) self.verz_entry.setSingleStep(0.1) - grid_lay.addWidget(verz_lbl, 4, 0) - grid_lay.addWidget(self.verz_entry, 4, 1, 1, 2) + param_grid.addWidget(verz_lbl, 8, 0) + param_grid.addWidget(self.verz_entry, 8, 1, 1, 2) # Zero the Z of the verification tool self.zeroz_cb = FCCheckBox('%s' % _("Zero Z tool")) @@ -84,34 +91,7 @@ class Tools2CalPrefGroupUI(OptionsGroupUI): "of the verification tool.") ) - grid_lay.addWidget(self.zeroz_cb, 5, 0, 1, 3) - - # Toochange Z entry - toolchangez_lbl = FCLabel('%s:' % _("Toolchange Z")) - toolchangez_lbl.setToolTip( - _("Height (Z) for mounting the verification probe.") - ) - - self.toolchangez_entry = FCDoubleSpinner() - self.toolchangez_entry.set_range(0.0000, 10000.0000) - self.toolchangez_entry.set_precision(self.decimals) - self.toolchangez_entry.setSingleStep(0.1) - - grid_lay.addWidget(toolchangez_lbl, 6, 0) - grid_lay.addWidget(self.toolchangez_entry, 6, 1, 1, 2) - - # Toolchange X-Y entry - toolchangexy_lbl = FCLabel('%s:' % _('Toolchange X-Y')) - toolchangexy_lbl.setToolTip( - _("Toolchange X,Y position.\n" - "If no value is entered then the current\n" - "(x, y) point will be used,") - ) - - self.toolchange_xy_entry = NumericalEvalTupleEntry(border_color='#0069A9') - - grid_lay.addWidget(toolchangexy_lbl, 7, 0) - grid_lay.addWidget(self.toolchange_xy_entry, 7, 1, 1, 2) + param_grid.addWidget(self.zeroz_cb, 10, 0, 1, 3) # Second point choice second_point_lbl = FCLabel('%s:' % _("Second point")) @@ -124,7 +104,48 @@ class Tools2CalPrefGroupUI(OptionsGroupUI): {'label': _('Bottom Right'), 'value': 'br'}], orientation='vertical') - grid_lay.addWidget(second_point_lbl, 8, 0) - grid_lay.addWidget(self.second_point_radio, 8, 1, 1, 2) + param_grid.addWidget(second_point_lbl, 16, 0) + param_grid.addWidget(self.second_point_radio, 16, 1, 1, 2) + + # ############################################################################################################# + # Tool change Frame + # ############################################################################################################# + tc_lbl = FCLabel('%s' % _("Tool change")) + self.layout.addWidget(tc_lbl) + + tc_frame = FCFrame() + self.layout.addWidget(tc_frame) + + tc_grid = FCGridLayout(v_spacing=5, h_spacing=3) + tc_frame.setLayout(tc_grid) + + # Toolchange X-Y entry + toolchangexy_lbl = FCLabel('%s:' % "X-Y") + toolchangexy_lbl.setToolTip( + _("Toolchange X,Y position.\n" + "If no value is entered then the current\n" + "(x, y) point will be used,") + ) + + self.toolchange_xy_entry = NumericalEvalTupleEntry(border_color='#0069A9') + + tc_grid.addWidget(toolchangexy_lbl, 0, 0) + tc_grid.addWidget(self.toolchange_xy_entry, 0, 1) + + # Toochange Z entry + toolchangez_lbl = FCLabel('%s:' % "Z") + toolchangez_lbl.setToolTip( + _("Height (Z) for mounting the verification probe.") + ) + + self.toolchangez_entry = FCDoubleSpinner() + self.toolchangez_entry.set_range(0.0000, 10000.0000) + self.toolchangez_entry.set_precision(self.decimals) + self.toolchangez_entry.setSingleStep(0.1) + + tc_grid.addWidget(toolchangez_lbl, 2, 0) + tc_grid.addWidget(self.toolchangez_entry, 2, 1) + + FCGridLayout.set_common_column_size([param_grid, tc_grid], 0) self.layout.addStretch() diff --git a/appGUI/preferences/tools/Tools2OptimalPrefGroupUI.py b/appGUI/preferences/tools/Tools2OptimalPrefGroupUI.py index 1b993910..ee0bc095 100644 --- a/appGUI/preferences/tools/Tools2OptimalPrefGroupUI.py +++ b/appGUI/preferences/tools/Tools2OptimalPrefGroupUI.py @@ -1,6 +1,6 @@ from PyQt6 import QtWidgets -from appGUI.GUIElements import FCSpinner, FCLabel, FCGridLayout +from appGUI.GUIElements import FCSpinner, FCLabel, FCGridLayout, FCFrame from appGUI.preferences.OptionsGroupUI import OptionsGroupUI import gettext @@ -21,16 +21,21 @@ class Tools2OptimalPrefGroupUI(OptionsGroupUI): self.decimals = decimals self.defaults = defaults - # ## Parameters - self.optlabel = FCLabel("%s:" % _("Parameters")) + # ############################################################################################################# + # Parameters Frame + # ############################################################################################################# + self.optlabel = FCLabel('%s' % _("Parameters")) self.optlabel.setToolTip( _("A tool to find the minimum distance between\n" "every two Gerber geometric elements") ) self.layout.addWidget(self.optlabel) - grid0 = FCGridLayout(v_spacing=5, h_spacing=3) - self.layout.addLayout(grid0) + par_frame = FCFrame() + self.layout.addWidget(par_frame) + + param_grid = FCGridLayout(v_spacing=5, h_spacing=3) + par_frame.setLayout(param_grid) self.precision_sp = FCSpinner() self.precision_sp.set_range(2, 10) @@ -42,7 +47,7 @@ class Tools2OptimalPrefGroupUI(OptionsGroupUI): _("Number of decimals for the distances and coordinates in this tool.") ) - grid0.addWidget(self.precision_lbl, 0, 0) - grid0.addWidget(self.precision_sp, 0, 1) + param_grid.addWidget(self.precision_lbl, 0, 0) + param_grid.addWidget(self.precision_sp, 0, 1) self.layout.addStretch() diff --git a/appGUI/preferences/tools/ToolsFilmPrefGroupUI.py b/appGUI/preferences/tools/ToolsFilmPrefGroupUI.py index 59420d2f..0d19aa26 100644 --- a/appGUI/preferences/tools/ToolsFilmPrefGroupUI.py +++ b/appGUI/preferences/tools/ToolsFilmPrefGroupUI.py @@ -208,8 +208,8 @@ class ToolsFilmPrefGroupUI(OptionsGroupUI): grid_par.addWidget(self.rounded_cb, 2, 1) # Polarity - self.film_type_radio = RadioSet([{'label': 'Pos', 'value': 'pos'}, - {'label': 'Neg', 'value': 'neg'}], compact=True) + self.film_type_radio = RadioSet([{'label': _('Positive'), 'value': 'pos'}, + {'label': _('Negative'), 'value': 'neg'}], compact=True) ftypelbl = FCLabel('%s:' % _('Polarity')) ftypelbl.setToolTip( _("Generate a Positive black film or a Negative film.")