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

- some reformatting and class rename

Browse Source 
- when clicking the coordinates toolbars in the status bar now the Distance Plugin is shown and if already displayed, it is closed (toggle action)
This commit is contained in:
Marius Stanciu
2022-04-03 15:06:36 +03:00
committed by Marius
parent 1b9e2feb75
commit a59f996819
90 changed files with 569 additions and 470 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
appGUI/preferences/gerber/GerberAdvOptPrefGroupUI.py
View File

@@ -1,6 +1,6 @@
from PyQt6 import QtWidgets
from appGUI.GUIElements import FCCheckBox, RadioSet, FCDoubleSpinner, FCLabel, OptionalInputSection, FCGridLayout, \
from appGUI.GUIElements import FCCheckBox, RadioSet, FCDoubleSpinner, FCLabel, OptionalInputSection, GLay, \
FCFrame
from appGUI.preferences.OptionsGroupUI import OptionsGroupUI
@@ -28,7 +28,7 @@ class GerberAdvOptPrefGroupUI(OptionsGroupUI):
adv_frame = FCFrame()
self.layout.addWidget(adv_frame)
adv_grid = FCGridLayout(v_spacing=5, h_spacing=3)
adv_grid = GLay(v_spacing=5, h_spacing=3)
adv_frame.setLayout(adv_grid)
# Follow Attribute

16
appGUI/preferences/gerber/GerberEditorPrefGroupUI.py
View File

@@ -1,7 +1,7 @@
from PyQt6 import QtWidgets
from appGUI.GUIElements import FCSpinner, FCDoubleSpinner, FCComboBox, FCLabel, RadioSet, NumericalEvalTupleEntry, \
FCGridLayout, FCFrame
GLay, FCFrame
from appGUI.preferences.OptionsGroupUI import OptionsGroupUI
import gettext
@@ -35,7 +35,7 @@ class GerberEditorPrefGroupUI(OptionsGroupUI):
par_frame = FCFrame()
self.layout.addWidget(par_frame)
param_grid = FCGridLayout(v_spacing=5, h_spacing=3)
param_grid = GLay(v_spacing=5, h_spacing=3)
par_frame.setLayout(param_grid)
# Selection Limit
@@ -125,7 +125,7 @@ class GerberEditorPrefGroupUI(OptionsGroupUI):
self.layout.addWidget(lin_frame)
# ## Grid Layout
lin_grid = FCGridLayout(v_spacing=5, h_spacing=3)
lin_grid = GLay(v_spacing=5, h_spacing=3)
lin_frame.setLayout(lin_grid)
# Linear Pad Array direction
@@ -179,7 +179,7 @@ class GerberEditorPrefGroupUI(OptionsGroupUI):
self.layout.addWidget(circ_frame)
# ## Grid Layout
circ_grid = FCGridLayout(v_spacing=5, h_spacing=3)
circ_grid = GLay(v_spacing=5, h_spacing=3)
circ_frame.setLayout(circ_grid)
# Circular Pad Array direction
@@ -219,7 +219,7 @@ class GerberEditorPrefGroupUI(OptionsGroupUI):
self.layout.addWidget(buff_frame)
# ## Grid Layout
buf_grid = FCGridLayout(v_spacing=5, h_spacing=3)
buf_grid = GLay(v_spacing=5, h_spacing=3)
buff_frame.setLayout(buf_grid)
# Buffer Distance
@@ -244,7 +244,7 @@ class GerberEditorPrefGroupUI(OptionsGroupUI):
self.layout.addWidget(scale_frame)
# ## Grid Layout
scale_grid = FCGridLayout(v_spacing=5, h_spacing=3)
scale_grid = GLay(v_spacing=5, h_spacing=3)
scale_frame.setLayout(scale_grid)
# Scale Factor
@@ -269,7 +269,7 @@ class GerberEditorPrefGroupUI(OptionsGroupUI):
self.layout.addWidget(ma_frame)
# ## Grid Layout
ma_grid = FCGridLayout(v_spacing=5, h_spacing=3)
ma_grid = GLay(v_spacing=5, h_spacing=3)
ma_frame.setLayout(ma_grid)
# Mark area Tool low threshold
@@ -296,6 +296,6 @@ class GerberEditorPrefGroupUI(OptionsGroupUI):
ma_grid.addWidget(self.grb_ma_high_label, 2, 0)
ma_grid.addWidget(self.grb_ma_high_entry, 2, 1)
FCGridLayout.set_common_column_size([param_grid, lin_grid, circ_grid, buf_grid, scale_grid, ma_grid], 0)
GLay.set_common_column_size([param_grid, lin_grid, circ_grid, buf_grid, scale_grid, ma_grid], 0)
self.layout.addStretch()

4
appGUI/preferences/gerber/GerberExpPrefGroupUI.py
View File

@@ -1,6 +1,6 @@
from PyQt6 import QtWidgets, QtCore
from appGUI.GUIElements import RadioSet, FCSpinner, FCLabel, FCGridLayout, FCFrame
from appGUI.GUIElements import RadioSet, FCSpinner, FCLabel, GLay, FCFrame
from appGUI.preferences.OptionsGroupUI import OptionsGroupUI
import gettext
@@ -28,7 +28,7 @@ class GerberExpPrefGroupUI(OptionsGroupUI):
self.layout.addWidget(exp_frame)
# ## Grid Layout
exp_grid = FCGridLayout(v_spacing=5, h_spacing=3)
exp_grid = GLay(v_spacing=5, h_spacing=3)
exp_frame.setLayout(exp_grid)
# Gerber Units

18
appGUI/preferences/gerber/GerberGenPrefGroupUI.py
View File

@@ -1,7 +1,7 @@
from PyQt6 import QtCore, QtGui, QtWidgets
from appGUI.GUIElements import FCCheckBox, FCSpinner, RadioSet, FCButton, FCSliderWithSpinner, FCLabel, \
FCGridLayout, FCFrame, FCTable, FCColorEntry, OptionalInputSection
GLay, FCFrame, FCTable, FCColorEntry, OptionalInputSection
from appGUI.preferences.OptionsGroupUI import OptionsGroupUI
from copy import deepcopy
@@ -36,7 +36,7 @@ class GerberGenPrefGroupUI(OptionsGroupUI):
self.layout.addWidget(plot_frame)
# ## Grid Layout
plot_grid = FCGridLayout(v_spacing=5, h_spacing=3)
plot_grid = GLay(v_spacing=5, h_spacing=3)
plot_frame.setLayout(plot_grid)
# Plot CB
@@ -89,7 +89,7 @@ class GerberGenPrefGroupUI(OptionsGroupUI):
self.layout.addWidget(def_frame)
# ## Grid Layout
def_grid = FCGridLayout(v_spacing=5, h_spacing=3)
def_grid = GLay(v_spacing=5, h_spacing=3)
def_frame.setLayout(def_grid)
# Gerber Units
@@ -141,7 +141,7 @@ class GerberGenPrefGroupUI(OptionsGroupUI):
self.layout.addWidget(par_frame)
# ## Grid Layout
param_grid = FCGridLayout(v_spacing=5, h_spacing=3)
param_grid = GLay(v_spacing=5, h_spacing=3)
par_frame.setLayout(param_grid)
# Apertures Cleaning
@@ -180,7 +180,7 @@ class GerberGenPrefGroupUI(OptionsGroupUI):
self.layout.addWidget(layers_frame)
# ## Grid Layout
layers_grid = FCGridLayout(v_spacing=5, h_spacing=3)
layers_grid = GLay(v_spacing=5, h_spacing=3)
layers_frame.setLayout(layers_grid)
# Store colors
@@ -227,7 +227,7 @@ class GerberGenPrefGroupUI(OptionsGroupUI):
self.layout.addWidget(obj_frame)
# ## Grid Layout
obj_grid = FCGridLayout(v_spacing=5, h_spacing=3)
obj_grid = GLay(v_spacing=5, h_spacing=3)
obj_frame.setLayout(obj_grid)
# Enable Outline plotting
@@ -272,7 +272,7 @@ class GerberGenPrefGroupUI(OptionsGroupUI):
obj_grid.addWidget(self.gerber_alpha_label, 6, 0)
obj_grid.addWidget(self.gerber_alpha_entry, 6, 1, 1, 2)
FCGridLayout.set_common_column_size([plot_grid, param_grid, def_grid, obj_grid], 0)
GLay.set_common_column_size([plot_grid, param_grid, def_grid, obj_grid], 0)
self.layout.addStretch()
@@ -362,7 +362,7 @@ class ColorsManager(QtWidgets.QDialog):
layers_frame.setSizePolicy(QtWidgets.QSizePolicy.Policy.MinimumExpanding, QtWidgets.QSizePolicy.Policy.Expanding)
self.layout.addWidget(layers_frame)
layers_grid = FCGridLayout(v_spacing=5, h_spacing=3)
layers_grid = GLay(v_spacing=5, h_spacing=3)
layers_frame.setLayout(layers_grid)
# Layers Colors Table
@@ -406,7 +406,7 @@ class ColorsManager(QtWidgets.QDialog):
# #############################################################################################################
# ######################################## Button Grid ########################################################
# #############################################################################################################
button_grid = FCGridLayout(h_spacing=5, v_spacing=5)
button_grid = GLay(h_spacing=5, v_spacing=5)
self.layout.addLayout(button_grid)
self.button_box = QtWidgets.QDialogButtonBox(QtWidgets.QDialogButtonBox.StandardButton.Ok |

8
appGUI/preferences/gerber/GerberOptPrefGroupUI.py
View File

@@ -1,6 +1,6 @@
from PyQt6 import QtWidgets
from appGUI.GUIElements import FCDoubleSpinner, FCCheckBox, FCLabel, FCGridLayout, FCFrame
from appGUI.GUIElements import FCDoubleSpinner, FCCheckBox, FCLabel, GLay, FCFrame
from appGUI.preferences.OptionsGroupUI import OptionsGroupUI
import gettext
@@ -39,7 +39,7 @@ class GerberOptPrefGroupUI(OptionsGroupUI):
self.layout.addWidget(ncc_frame)
# ## Grid Layout
ncc_grid = FCGridLayout(v_spacing=5, h_spacing=3)
ncc_grid = GLay(v_spacing=5, h_spacing=3)
ncc_frame.setLayout(ncc_grid)
# Margin
@@ -74,7 +74,7 @@ class GerberOptPrefGroupUI(OptionsGroupUI):
bb_frame = FCFrame()
self.layout.addWidget(bb_frame)
bb_grid = FCGridLayout(v_spacing=5, h_spacing=3)
bb_grid = GLay(v_spacing=5, h_spacing=3)
bb_frame.setLayout(bb_grid)
bbmargin = FCLabel('%s:' % _('Boundary Margin'))
@@ -99,6 +99,6 @@ class GerberOptPrefGroupUI(OptionsGroupUI):
)
bb_grid.addWidget(self.bbrounded_cb, 2, 0, 1, 2)
FCGridLayout.set_common_column_size([ncc_grid, bb_grid], 0)
GLay.set_common_column_size([ncc_grid, bb_grid], 0)
self.layout.addStretch()