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

16
appGUI/preferences/tools/Tools2CThievingPrefGroupUI.py
View File

@@ -1,6 +1,6 @@
from PyQt6 import QtWidgets
from appGUI.GUIElements import FCSpinner, FCDoubleSpinner, RadioSet, FCLabel, FCCheckBox, FCGridLayout, FCFrame, \
from appGUI.GUIElements import FCSpinner, FCDoubleSpinner, RadioSet, FCLabel, FCCheckBox, GLay, FCFrame, \
FCComboBox2
from appGUI.preferences.OptionsGroupUI import OptionsGroupUI
@@ -36,7 +36,7 @@ class Tools2CThievingPrefGroupUI(OptionsGroupUI):
self.layout.addWidget(par_frame)
# ## Grid Layout
grid_par = FCGridLayout(v_spacing=5, h_spacing=3)
grid_par = GLay(v_spacing=5, h_spacing=3)
par_frame.setLayout(grid_par)
# CIRCLE STEPS - to be used when buffering
@@ -149,7 +149,7 @@ class Tools2CThievingPrefGroupUI(OptionsGroupUI):
self.layout.addWidget(dots_frame)
# ## Grid Layout
grid_dots = FCGridLayout(v_spacing=5, h_spacing=3)
grid_dots = GLay(v_spacing=5, h_spacing=3)
dots_frame.setLayout(grid_dots)
# Dot diameter #
@@ -188,7 +188,7 @@ class Tools2CThievingPrefGroupUI(OptionsGroupUI):
self.layout.addWidget(square_frame)
# ## Grid Layout
grid_square = FCGridLayout(v_spacing=5, h_spacing=3)
grid_square = GLay(v_spacing=5, h_spacing=3)
square_frame.setLayout(grid_square)
# Square Size #
@@ -227,7 +227,7 @@ class Tools2CThievingPrefGroupUI(OptionsGroupUI):
self.layout.addWidget(line_frame)
# ## Grid Layout
grid_line = FCGridLayout(v_spacing=5, h_spacing=3)
grid_line = GLay(v_spacing=5, h_spacing=3)
line_frame.setLayout(grid_line)
# Line Size #
@@ -270,7 +270,7 @@ class Tools2CThievingPrefGroupUI(OptionsGroupUI):
self.layout.addWidget(rob_frame)
# ## Grid Layout
grid_robber = FCGridLayout(v_spacing=5, h_spacing=3)
grid_robber = GLay(v_spacing=5, h_spacing=3)
rob_frame.setLayout(grid_robber)
# ROBBER BAR MARGIN #
@@ -312,7 +312,7 @@ class Tools2CThievingPrefGroupUI(OptionsGroupUI):
self.layout.addWidget(ppm_frame)
# ## Grid Layout
grid_ppm = FCGridLayout(v_spacing=5, h_spacing=3)
grid_ppm = GLay(v_spacing=5, h_spacing=3)
ppm_frame.setLayout(grid_ppm)
# Use Only Pads
@@ -346,7 +346,7 @@ class Tools2CThievingPrefGroupUI(OptionsGroupUI):
grid_ppm.addWidget(self.ppm_choice_label, 4, 0)
grid_ppm.addWidget(self.ppm_choice_combo, 4, 1)
FCGridLayout.set_common_column_size(
GLay.set_common_column_size(
[grid_par, grid_ppm, grid_line, grid_dots, grid_robber, grid_square], 0)
self.layout.addStretch()

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

@@ -1,7 +1,7 @@
from PyQt6 import QtWidgets
from appGUI.GUIElements import RadioSet, FCDoubleSpinner, FCCheckBox, NumericalEvalTupleEntry, FCLabel, \
FCGridLayout, FCFrame
GLay, FCFrame
from appGUI.preferences.OptionsGroupUI import OptionsGroupUI
import gettext
@@ -33,7 +33,7 @@ class Tools2CalPrefGroupUI(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)
param_grid.addWidget(self.param_label, 0, 0, 1, 2)
@@ -116,7 +116,7 @@ class Tools2CalPrefGroupUI(OptionsGroupUI):
tc_frame = FCFrame()
self.layout.addWidget(tc_frame)
tc_grid = FCGridLayout(v_spacing=5, h_spacing=3)
tc_grid = GLay(v_spacing=5, h_spacing=3)
tc_frame.setLayout(tc_grid)
# Toolchange X-Y entry
@@ -146,6 +146,6 @@ class Tools2CalPrefGroupUI(OptionsGroupUI):
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)
GLay.set_common_column_size([param_grid, tc_grid], 0)
self.layout.addStretch()

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

@@ -1,6 +1,6 @@
from PyQt6 import QtWidgets
from appGUI.GUIElements import FCCheckBox, RadioSet, FCDoubleSpinner, FCLabel, FCGridLayout, FCFrame
from appGUI.GUIElements import FCCheckBox, RadioSet, FCDoubleSpinner, FCLabel, GLay, FCFrame
from appGUI.preferences.OptionsGroupUI import OptionsGroupUI
import gettext
@@ -36,7 +36,7 @@ class Tools2EDrillsPrefGroupUI(OptionsGroupUI):
param_frame = FCFrame()
self.layout.addWidget(param_frame)
param_grid = FCGridLayout(v_spacing=5, h_spacing=3)
param_grid = GLay(v_spacing=5, h_spacing=3)
param_frame.setLayout(param_grid)
# Circular Aperture Selection
@@ -90,7 +90,7 @@ class Tools2EDrillsPrefGroupUI(OptionsGroupUI):
met_frame = FCFrame()
self.layout.addWidget(met_frame)
met_grid = FCGridLayout(v_spacing=5, h_spacing=3)
met_grid = GLay(v_spacing=5, h_spacing=3)
met_frame.setLayout(met_grid)
self.method_radio = RadioSet(
@@ -125,7 +125,7 @@ class Tools2EDrillsPrefGroupUI(OptionsGroupUI):
fix_frame = FCFrame()
self.layout.addWidget(fix_frame)
fix_grid = FCGridLayout(v_spacing=5, h_spacing=3)
fix_grid = GLay(v_spacing=5, h_spacing=3)
fix_frame.setLayout(fix_grid)
# Diameter value
@@ -155,7 +155,7 @@ class Tools2EDrillsPrefGroupUI(OptionsGroupUI):
ring_frame = FCFrame()
self.layout.addWidget(ring_frame)
ring_grid = FCGridLayout(v_spacing=5, h_spacing=3)
ring_grid = GLay(v_spacing=5, h_spacing=3)
ring_frame.setLayout(ring_grid)
# Circular Annular Ring Value
@@ -232,7 +232,7 @@ class Tools2EDrillsPrefGroupUI(OptionsGroupUI):
prop_frame = FCFrame()
self.layout.addWidget(prop_frame)
prop_grid = FCGridLayout(v_spacing=5, h_spacing=3)
prop_grid = GLay(v_spacing=5, h_spacing=3)
prop_frame.setLayout(prop_grid)
# Factor value
@@ -261,7 +261,7 @@ class Tools2EDrillsPrefGroupUI(OptionsGroupUI):
solder_frame = FCFrame()
self.layout.addWidget(solder_frame)
solder_grid = FCGridLayout(v_spacing=5, h_spacing=3)
solder_grid = GLay(v_spacing=5, h_spacing=3)
solder_frame.setLayout(solder_grid)
# CLEARANCE soldermask extraction
@@ -289,7 +289,7 @@ class Tools2EDrillsPrefGroupUI(OptionsGroupUI):
ecut_frame = FCFrame()
self.layout.addWidget(ecut_frame)
ecut_grid = FCGridLayout(v_spacing=5, h_spacing=3)
ecut_grid = GLay(v_spacing=5, h_spacing=3)
ecut_frame.setLayout(ecut_grid)
# Margin Cutout
@@ -320,7 +320,7 @@ class Tools2EDrillsPrefGroupUI(OptionsGroupUI):
ecut_grid.addWidget(self.thick_cut_label, 2, 0)
ecut_grid.addWidget(self.thick_cut_entry, 2, 1)
FCGridLayout.set_common_column_size(
GLay.set_common_column_size(
[param_grid, ring_grid, fix_grid, prop_grid, met_grid, solder_grid, ecut_grid], 0)
self.layout.addStretch()

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

@@ -1,6 +1,6 @@
from PyQt6 import QtWidgets
from appGUI.GUIElements import FCDoubleSpinner, RadioSet, FCLabel, FCGridLayout, FCComboBox2, FCFrame
from appGUI.GUIElements import FCDoubleSpinner, RadioSet, FCLabel, GLay, FCComboBox2, FCFrame
from appGUI.preferences.OptionsGroupUI import OptionsGroupUI
import gettext
@@ -33,7 +33,7 @@ class Tools2FiducialsPrefGroupUI(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)
# DIAMETER #
@@ -124,7 +124,7 @@ class Tools2FiducialsPrefGroupUI(OptionsGroupUI):
self.layout.addWidget(s_frame)
# Grid Layout
grid_sel = FCGridLayout(v_spacing=5, h_spacing=3)
grid_sel = GLay(v_spacing=5, h_spacing=3)
s_frame.setLayout(grid_sel)
# Mode #
@@ -140,6 +140,6 @@ class Tools2FiducialsPrefGroupUI(OptionsGroupUI):
grid_sel.addWidget(self.mode_label, 0, 0)
grid_sel.addWidget(self.mode_radio, 0, 1)
FCGridLayout.set_common_column_size([param_grid, grid_sel], 0)
GLay.set_common_column_size([param_grid, grid_sel], 0)
self.layout.addStretch(1)

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

@@ -1,6 +1,6 @@
from PyQt6 import QtWidgets
from appGUI.GUIElements import FCDoubleSpinner, RadioSet, FCLabel, FCGridLayout, FCFrame
from appGUI.GUIElements import FCDoubleSpinner, RadioSet, FCLabel, GLay, FCFrame
from appGUI.preferences.OptionsGroupUI import OptionsGroupUI
import gettext
@@ -34,7 +34,7 @@ class Tools2InvertPrefGroupUI(OptionsGroupUI):
param_frame = FCFrame()
self.layout.addWidget(param_frame)
param_grid = FCGridLayout(v_spacing=5, h_spacing=3)
param_grid = GLay(v_spacing=5, h_spacing=3)
param_frame.setLayout(param_grid)
# Margin
@@ -67,7 +67,7 @@ class Tools2InvertPrefGroupUI(OptionsGroupUI):
join_frame = FCFrame()
self.layout.addWidget(join_frame)
join_grid = FCGridLayout(v_spacing=5, h_spacing=3)
join_grid = GLay(v_spacing=5, h_spacing=3)
join_frame.setLayout(join_grid)
line_join_lbl = FCLabel('%s:' % _("Value"))
@@ -81,6 +81,6 @@ class Tools2InvertPrefGroupUI(OptionsGroupUI):
join_grid.addWidget(line_join_lbl, 0, 0)
join_grid.addWidget(self.join_radio, 0, 1)
FCGridLayout.set_common_column_size([param_grid, join_grid], 0)
GLay.set_common_column_size([param_grid, join_grid], 0)
self.layout.addStretch()

4
appGUI/preferences/tools/Tools2OptimalPrefGroupUI.py
View File

@@ -1,6 +1,6 @@
from PyQt6 import QtWidgets
from appGUI.GUIElements import FCSpinner, FCLabel, FCGridLayout, FCFrame
from appGUI.GUIElements import FCSpinner, FCLabel, GLay, FCFrame
from appGUI.preferences.OptionsGroupUI import OptionsGroupUI
import gettext
@@ -34,7 +34,7 @@ class Tools2OptimalPrefGroupUI(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)
self.precision_sp = FCSpinner()

14
appGUI/preferences/tools/Tools2PunchGerberPrefGroupUI.py
View File

@@ -1,6 +1,6 @@
from PyQt6 import QtWidgets
from appGUI.GUIElements import FCCheckBox, RadioSet, FCDoubleSpinner, FCLabel, FCGridLayout, FCFrame
from appGUI.GUIElements import FCCheckBox, RadioSet, FCDoubleSpinner, FCLabel, GLay, FCFrame
from appGUI.preferences.OptionsGroupUI import OptionsGroupUI
import gettext
@@ -36,7 +36,7 @@ class Tools2PunchGerberPrefGroupUI(OptionsGroupUI):
param_frame = FCFrame()
self.layout.addWidget(param_frame)
param_grid = FCGridLayout(v_spacing=5, h_spacing=3)
param_grid = GLay(v_spacing=5, h_spacing=3)
param_frame.setLayout(param_grid)
# Circular Aperture Selection
@@ -90,7 +90,7 @@ class Tools2PunchGerberPrefGroupUI(OptionsGroupUI):
met_frame = FCFrame()
self.layout.addWidget(met_frame)
met_grid = FCGridLayout(v_spacing=5, h_spacing=3)
met_grid = GLay(v_spacing=5, h_spacing=3)
met_frame.setLayout(met_grid)
self.hole_size_radio = RadioSet(
@@ -122,7 +122,7 @@ class Tools2PunchGerberPrefGroupUI(OptionsGroupUI):
fix_frame = FCFrame()
self.layout.addWidget(fix_frame)
fix_grid = FCGridLayout(v_spacing=5, h_spacing=3)
fix_grid = GLay(v_spacing=5, h_spacing=3)
fix_frame.setLayout(fix_grid)
# Diameter value
@@ -152,7 +152,7 @@ class Tools2PunchGerberPrefGroupUI(OptionsGroupUI):
ring_frame = FCFrame()
self.layout.addWidget(ring_frame)
ring_grid = FCGridLayout(v_spacing=5, h_spacing=3)
ring_grid = GLay(v_spacing=5, h_spacing=3)
ring_frame.setLayout(ring_grid)
# Circular Annular Ring Value
@@ -229,7 +229,7 @@ class Tools2PunchGerberPrefGroupUI(OptionsGroupUI):
prop_frame = FCFrame()
self.layout.addWidget(prop_frame)
prop_grid = FCGridLayout(v_spacing=5, h_spacing=3)
prop_grid = GLay(v_spacing=5, h_spacing=3)
prop_frame.setLayout(prop_grid)
# Factor value
@@ -247,7 +247,7 @@ class Tools2PunchGerberPrefGroupUI(OptionsGroupUI):
prop_grid.addWidget(self.factor_label, 0, 0)
prop_grid.addWidget(self.factor_entry, 0, 1)
FCGridLayout.set_common_column_size(
GLay.set_common_column_size(
[param_grid, ring_grid, prop_grid, met_grid, fix_grid], 0)
self.layout.addStretch()

4
appGUI/preferences/tools/Tools2QRCodePrefGroupUI.py
View File

@@ -1,6 +1,6 @@
from PyQt6 import QtGui
from appGUI.GUIElements import FCSpinner, RadioSet, FCTextArea, FCLabel, FCColorEntry, FCGridLayout, FCFrame
from appGUI.GUIElements import FCSpinner, RadioSet, FCTextArea, FCLabel, FCColorEntry, GLay, FCFrame
from appGUI.preferences.OptionsGroupUI import OptionsGroupUI
import gettext
@@ -35,7 +35,7 @@ class Tools2QRCodePrefGroupUI(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)
# VERSION #

10
appGUI/preferences/tools/Tools2RulesCheckPrefGroupUI.py
View File

@@ -1,6 +1,6 @@
from PyQt6 import QtWidgets
from appGUI.GUIElements import FCCheckBox, FCDoubleSpinner, FCLabel, FCGridLayout, FCFrame
from appGUI.GUIElements import FCCheckBox, FCDoubleSpinner, FCLabel, GLay, FCFrame
from appGUI.preferences.OptionsGroupUI import OptionsGroupUI
import gettext
@@ -34,7 +34,7 @@ class Tools2RulesCheckPrefGroupUI(OptionsGroupUI):
copper_frame = FCFrame()
self.layout.addWidget(copper_frame)
self.copper_grid = FCGridLayout(v_spacing=5, h_spacing=3)
self.copper_grid = GLay(v_spacing=5, h_spacing=3)
copper_frame.setLayout(self.copper_grid)
# Trace size
@@ -133,7 +133,7 @@ class Tools2RulesCheckPrefGroupUI(OptionsGroupUI):
silk_frame = FCFrame()
self.layout.addWidget(silk_frame)
self.silk_grid = FCGridLayout(v_spacing=5, h_spacing=3)
self.silk_grid = GLay(v_spacing=5, h_spacing=3)
silk_frame.setLayout(self.silk_grid)
# Silkscreen2silkscreen clearance
@@ -211,7 +211,7 @@ class Tools2RulesCheckPrefGroupUI(OptionsGroupUI):
solder_frame = FCFrame()
self.layout.addWidget(solder_frame)
self.solder_grid = FCGridLayout(v_spacing=5, h_spacing=3)
self.solder_grid = GLay(v_spacing=5, h_spacing=3)
solder_frame.setLayout(self.solder_grid)
# Soldermask2soldermask clearance
@@ -246,7 +246,7 @@ class Tools2RulesCheckPrefGroupUI(OptionsGroupUI):
holes_frame = FCFrame()
self.layout.addWidget(holes_frame)
self.holes_grid = FCGridLayout(v_spacing=5, h_spacing=3)
self.holes_grid = GLay(v_spacing=5, h_spacing=3)
holes_frame.setLayout(self.holes_grid)
# Hole2Hole clearance

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

@@ -1,6 +1,6 @@
from PyQt6 import QtWidgets
from appGUI.GUIElements import FCDoubleSpinner, RadioSet, FCLabel, FCGridLayout, FCFrame
from appGUI.GUIElements import FCDoubleSpinner, RadioSet, FCLabel, GLay, FCFrame
from appGUI.preferences.OptionsGroupUI import OptionsGroupUI
import gettext
@@ -35,7 +35,7 @@ class Tools2sidedPrefGroupUI(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)
# ## Drill diameter for alignment holes
@@ -95,7 +95,7 @@ class Tools2sidedPrefGroupUI(OptionsGroupUI):
mirror_frame = FCFrame()
self.layout.addWidget(mirror_frame)
mirror_grid = FCGridLayout(v_spacing=5, h_spacing=3)
mirror_grid = GLay(v_spacing=5, h_spacing=3)
mirror_frame.setLayout(mirror_grid)
mirror_grid.addWidget(self.mirax_label, 0, 0)
@@ -122,6 +122,6 @@ class Tools2sidedPrefGroupUI(OptionsGroupUI):
mirror_grid.addWidget(self.axloc_label, 2, 0)
mirror_grid.addWidget(self.axis_location_radio, 2, 1)
FCGridLayout.set_common_column_size([param_grid, mirror_grid], 0)
GLay.set_common_column_size([param_grid, mirror_grid], 0)
# self.layout.addStretch(1)

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

@@ -1,6 +1,6 @@
from PyQt6 import QtWidgets
from appGUI.GUIElements import FCDoubleSpinner, FCLabel, FCGridLayout, FCFrame
from appGUI.GUIElements import FCDoubleSpinner, FCLabel, GLay, FCFrame
from appGUI.preferences.OptionsGroupUI import OptionsGroupUI
import gettext
@@ -35,7 +35,7 @@ class ToolsCalculatorsPrefGroupUI(OptionsGroupUI):
v_frame = FCFrame()
self.layout.addWidget(v_frame)
v_grid = FCGridLayout(v_spacing=5, h_spacing=3)
v_grid = GLay(v_spacing=5, h_spacing=3)
v_frame.setLayout(v_grid)
# ## Tip Diameter
@@ -93,7 +93,7 @@ class ToolsCalculatorsPrefGroupUI(OptionsGroupUI):
el_frame = FCFrame()
self.layout.addWidget(el_frame)
el_grid = FCGridLayout(v_spacing=5, h_spacing=3)
el_grid = GLay(v_spacing=5, h_spacing=3)
el_frame.setLayout(el_grid)
# ## PCB Length
@@ -155,6 +155,6 @@ class ToolsCalculatorsPrefGroupUI(OptionsGroupUI):
el_grid.addWidget(self.growth_label, 8, 0)
el_grid.addWidget(self.growth_entry, 8, 1)
FCGridLayout.set_common_column_size([v_grid, el_grid], 0)
GLay.set_common_column_size([v_grid, el_grid], 0)
self.layout.addStretch()

10
appGUI/preferences/tools/ToolsCutoutPrefGroupUI.py
View File

@@ -1,7 +1,7 @@
from PyQt6 import QtWidgets
from appGUI.GUIElements import FCDoubleSpinner, FCCheckBox, RadioSet, FCComboBox, FCLabel, OptionalInputSection, \
FCGridLayout, FCFrame, FCComboBox2
GLay, FCFrame, FCComboBox2
from appGUI.preferences.OptionsGroupUI import OptionsGroupUI
import gettext
@@ -37,7 +37,7 @@ class ToolsCutoutPrefGroupUI(OptionsGroupUI):
tool_par_frame = FCFrame()
self.layout.addWidget(tool_par_frame)
param_grid = FCGridLayout(v_spacing=5, h_spacing=3)
param_grid = GLay(v_spacing=5, h_spacing=3)
tool_par_frame.setLayout(param_grid)
# Tool Diameter
@@ -143,7 +143,7 @@ class ToolsCutoutPrefGroupUI(OptionsGroupUI):
self.layout.addWidget(gaps_frame)
# Grid Layout
gaps_grid = FCGridLayout(v_spacing=5, h_spacing=3)
gaps_grid = GLay(v_spacing=5, h_spacing=3)
gaps_frame.setLayout(gaps_grid)
# Gap Size
@@ -271,7 +271,7 @@ class ToolsCutoutPrefGroupUI(OptionsGroupUI):
self.layout.addWidget(self.drill_cut_frame)
# Grid Layout
drill_cut_grid = FCGridLayout(v_spacing=5, h_spacing=3)
drill_cut_grid = GLay(v_spacing=5, h_spacing=3)
self.drill_cut_frame.setLayout(drill_cut_grid)
# Drill Tool Diameter
@@ -314,7 +314,7 @@ class ToolsCutoutPrefGroupUI(OptionsGroupUI):
drill_cut_grid.addWidget(self.drill_margin_label, 4, 0)
drill_cut_grid.addWidget(self.drill_margin_entry, 4, 1)
FCGridLayout.set_common_column_size([param_grid, drill_cut_grid, gaps_grid], 0)
GLay.set_common_column_size([param_grid, drill_cut_grid, gaps_grid], 0)
# self.layout.addStretch()

12
appGUI/preferences/tools/ToolsDrillPrefGroupUI.py
View File

@@ -2,7 +2,7 @@ from PyQt6 import QtWidgets, QtCore
from PyQt6.QtCore import Qt
from appGUI.GUIElements import RadioSet, FCDoubleSpinner, FCComboBox, FCCheckBox, FCSpinner, NumericalEvalTupleEntry, \
OptionalInputSection, NumericalEvalEntry, FCLabel, FCGridLayout, FCComboBox2, FCFrame
OptionalInputSection, NumericalEvalEntry, FCLabel, GLay, FCComboBox2, FCFrame
from appGUI.preferences.OptionsGroupUI import OptionsGroupUI
import gettext
@@ -34,7 +34,7 @@ class ToolsDrillPrefGroupUI(OptionsGroupUI):
param_frame = FCFrame()
self.layout.addWidget(param_frame)
param_grid = FCGridLayout(v_spacing=5, h_spacing=3)
param_grid = GLay(v_spacing=5, h_spacing=3)
param_frame.setLayout(param_grid)
# Tool order Radio Button
@@ -232,7 +232,7 @@ class ToolsDrillPrefGroupUI(OptionsGroupUI):
ds_frame = FCFrame()
self.layout.addWidget(ds_frame)
ds_grid = FCGridLayout(v_spacing=5, h_spacing=3)
ds_grid = GLay(v_spacing=5, h_spacing=3)
ds_frame.setLayout(ds_grid)
# Drill slots
@@ -281,7 +281,7 @@ class ToolsDrillPrefGroupUI(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)
# Offset Z
@@ -426,7 +426,7 @@ class ToolsDrillPrefGroupUI(OptionsGroupUI):
area_frame = FCFrame()
self.layout.addWidget(area_frame)
area_grid = FCGridLayout(v_spacing=5, h_spacing=3)
area_grid = GLay(v_spacing=5, h_spacing=3)
area_frame.setLayout(area_grid)
# Exclusion Area CB
@@ -475,6 +475,6 @@ class ToolsDrillPrefGroupUI(OptionsGroupUI):
area_grid.addWidget(self.over_z_label, 6, 0)
area_grid.addWidget(self.over_z_entry, 6, 1, 1, 2)
FCGridLayout.set_common_column_size([param_grid, ds_grid, adv_grid, area_grid], 0)
GLay.set_common_column_size([param_grid, ds_grid, adv_grid, area_grid], 0)
self.layout.addStretch()

12
appGUI/preferences/tools/ToolsFilmPrefGroupUI.py
View File

@@ -1,7 +1,7 @@
from PyQt6 import QtGui
from appGUI.GUIElements import RadioSet, FCDoubleSpinner, FCCheckBox, FCComboBox, FCColorEntry, FCLabel, FCSpinner, \
FCGridLayout, FCComboBox2, FCFrame
GLay, FCComboBox2, FCFrame
from appGUI.preferences.OptionsGroupUI import OptionsGroupUI
import gettext
@@ -35,7 +35,7 @@ class ToolsFilmPrefGroupUI(OptionsGroupUI):
adj_frame = FCFrame()
self.layout.addWidget(adj_frame)
adj_grid = FCGridLayout(v_spacing=5, h_spacing=3)
adj_grid = GLay(v_spacing=5, h_spacing=3)
adj_frame.setLayout(adj_grid)
# Scale Geometry
@@ -55,7 +55,7 @@ class ToolsFilmPrefGroupUI(OptionsGroupUI):
scale_frame = FCFrame()
adj_grid.addWidget(scale_frame, 4, 0, 1, 2)
grid_scale = FCGridLayout(v_spacing=5, h_spacing=3)
grid_scale = GLay(v_spacing=5, h_spacing=3)
scale_frame.setLayout(grid_scale)
# Scale Type
@@ -120,7 +120,7 @@ class ToolsFilmPrefGroupUI(OptionsGroupUI):
skew_frame = FCFrame()
adj_grid.addWidget(skew_frame, 10, 0, 1, 2)
grid_skew = FCGridLayout(v_spacing=5, h_spacing=3)
grid_skew = GLay(v_spacing=5, h_spacing=3)
skew_frame.setLayout(grid_skew)
self.film_skew_type_lbl = FCLabel('%s:' % _("Type"))
@@ -205,7 +205,7 @@ class ToolsFilmPrefGroupUI(OptionsGroupUI):
par_frame = FCFrame()
self.layout.addWidget(par_frame)
grid_par = FCGridLayout()
grid_par = GLay()
par_frame.setLayout(grid_par)
# Convex Shape
@@ -393,7 +393,7 @@ class ToolsFilmPrefGroupUI(OptionsGroupUI):
# self.layout.addStretch(1)
FCGridLayout.set_common_column_size([adj_grid, grid_par, grid_skew, grid_scale], 0)
GLay.set_common_column_size([adj_grid, grid_par, grid_skew, grid_scale], 0)
# Film Tool
self.film_color_entry.editingFinished.connect(self.on_film_color_entry)

10
appGUI/preferences/tools/ToolsISOPrefGroupUI.py
View File

@@ -1,7 +1,7 @@
from PyQt6 import QtWidgets
from appGUI.GUIElements import RadioSet, FCDoubleSpinner, FCComboBox2, FCCheckBox, FCSpinner, NumericalEvalTupleEntry, \
FCLabel, FCGridLayout, FCFrame
FCLabel, GLay, FCFrame
from appGUI.preferences.OptionsGroupUI import OptionsGroupUI
import gettext
@@ -35,7 +35,7 @@ class ToolsISOPrefGroupUI(OptionsGroupUI):
par_frame = FCFrame()
self.layout.addWidget(par_frame)
par_grid = FCGridLayout(v_spacing=5, h_spacing=3)
par_grid = GLay(v_spacing=5, h_spacing=3)
par_frame.setLayout(par_grid)
# Tool Dias
@@ -141,7 +141,7 @@ class ToolsISOPrefGroupUI(OptionsGroupUI):
tt_frame = FCFrame()
self.layout.addWidget(tt_frame)
tool_grid = FCGridLayout(v_spacing=5, h_spacing=3)
tool_grid = GLay(v_spacing=5, h_spacing=3)
tt_frame.setLayout(tool_grid)
# Shape
@@ -254,7 +254,7 @@ class ToolsISOPrefGroupUI(OptionsGroupUI):
gp_frame = FCFrame()
self.layout.addWidget(gp_frame)
gen_grid = FCGridLayout(v_spacing=5, h_spacing=3)
gen_grid = GLay(v_spacing=5, h_spacing=3)
gp_frame.setLayout(gen_grid)
# Rest machining CheckBox
@@ -371,6 +371,6 @@ class ToolsISOPrefGroupUI(OptionsGroupUI):
gen_grid.addWidget(plotting_label, 14, 0)
gen_grid.addWidget(self.plotting_radio, 14, 1, 1, 2)
FCGridLayout.set_common_column_size([par_grid, tool_grid, gen_grid], 0)
GLay.set_common_column_size([par_grid, tool_grid, gen_grid], 0)
self.layout.addStretch(1)

4
appGUI/preferences/tools/ToolsLevelPrefGroupUI.py
View File

@@ -1,6 +1,6 @@
from PyQt6 import QtWidgets
from appGUI.GUIElements import FCDoubleSpinner, FCSpinner, RadioSet, FCLabel, FCComboBox, FCGridLayout, FCFrame
from appGUI.GUIElements import FCDoubleSpinner, FCSpinner, RadioSet, FCLabel, FCComboBox, GLay, FCFrame
from appGUI.preferences.OptionsGroupUI import OptionsGroupUI
import gettext
@@ -34,7 +34,7 @@ class ToolsLevelPrefGroupUI(OptionsGroupUI):
par_frame = FCFrame()
self.layout.addWidget(par_frame)
par_grid = FCGridLayout(v_spacing=5, h_spacing=3)
par_grid = GLay(v_spacing=5, h_spacing=3)
par_frame.setLayout(par_grid)
# Probe points mode

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

@@ -1,6 +1,6 @@
from PyQt6 import QtWidgets
from appGUI.GUIElements import FCDoubleSpinner, FCLabel, RadioSet, FCGridLayout, FCFrame
from appGUI.GUIElements import FCDoubleSpinner, FCLabel, RadioSet, GLay, FCFrame
from appGUI.preferences.OptionsGroupUI import OptionsGroupUI
import gettext
@@ -33,7 +33,7 @@ class ToolsMarkersPrefGroupUI(OptionsGroupUI):
param_frame = FCFrame()
self.layout.addWidget(param_frame)
param_grid = FCGridLayout(v_spacing=5, h_spacing=3)
param_grid = GLay(v_spacing=5, h_spacing=3)
param_frame.setLayout(param_grid)
# Type of Marker
@@ -111,7 +111,7 @@ class ToolsMarkersPrefGroupUI(OptionsGroupUI):
off_frame = FCFrame()
self.layout.addWidget(off_frame)
off_grid = FCGridLayout(v_spacing=5, h_spacing=3)
off_grid = GLay(v_spacing=5, h_spacing=3)
off_frame.setLayout(off_grid)
off_grid.addWidget(self.ref_label, 0, 0)
@@ -143,6 +143,6 @@ class ToolsMarkersPrefGroupUI(OptionsGroupUI):
off_grid.addWidget(self.offset_y_label, 3, 0)
off_grid.addWidget(self.offset_y_entry, 3, 1)
FCGridLayout.set_common_column_size([param_grid, off_grid], 0)
GLay.set_common_column_size([param_grid, off_grid], 0)
self.layout.addStretch()

14
appGUI/preferences/tools/ToolsMillPrefGroupUI.py
View File

@@ -2,7 +2,7 @@ from PyQt6 import QtWidgets, QtCore
from PyQt6.QtCore import Qt
from appGUI.GUIElements import RadioSet, FCDoubleSpinner, FCComboBox, FCCheckBox, FCSpinner, NumericalEvalTupleEntry, \
OptionalInputSection, NumericalEvalEntry, FCLabel, FCComboBox2, FCEntry, FCGridLayout, FCFrame
OptionalInputSection, NumericalEvalEntry, FCLabel, FCComboBox2, FCEntry, GLay, FCFrame
from appGUI.preferences.OptionsGroupUI import OptionsGroupUI
import gettext
@@ -34,7 +34,7 @@ class ToolsMillPrefGroupUI(OptionsGroupUI):
param_frame = FCFrame()
self.layout.addWidget(param_frame)
param_grid = FCGridLayout(v_spacing=5, h_spacing=3)
param_grid = GLay(v_spacing=5, h_spacing=3)
param_frame.setLayout(param_grid)
# Tooldia
@@ -298,7 +298,7 @@ class ToolsMillPrefGroupUI(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)
# Toolchange X,Y
@@ -446,7 +446,7 @@ class ToolsMillPrefGroupUI(OptionsGroupUI):
area_frame = FCFrame()
self.layout.addWidget(area_frame)
area_grid = FCGridLayout(v_spacing=5, h_spacing=3)
area_grid = GLay(v_spacing=5, h_spacing=3)
area_frame.setLayout(area_grid)
# Exclusion Area CB
@@ -513,7 +513,7 @@ class ToolsMillPrefGroupUI(OptionsGroupUI):
polish_frame = FCFrame()
self.layout.addWidget(polish_frame)
polish_grid = FCGridLayout(v_spacing=5, h_spacing=3)
polish_grid = GLay(v_spacing=5, h_spacing=3)
polish_frame.setLayout(polish_grid)
# Polish Margin
@@ -571,7 +571,7 @@ class ToolsMillPrefGroupUI(OptionsGroupUI):
excellon_mill_frame = FCFrame()
self.layout.addWidget(excellon_mill_frame)
excellon_mill_grid = FCGridLayout(v_spacing=5, h_spacing=3)
excellon_mill_grid = GLay(v_spacing=5, h_spacing=3)
excellon_mill_frame.setLayout(excellon_mill_grid)
# Milling Type
@@ -639,6 +639,6 @@ class ToolsMillPrefGroupUI(OptionsGroupUI):
excellon_mill_grid.addWidget(self.connect_cb, 8, 0, 1, 2)
FCGridLayout.set_common_column_size([param_grid, adv_grid, area_grid, polish_grid, excellon_mill_grid], 0)
GLay.set_common_column_size([param_grid, adv_grid, area_grid, polish_grid, excellon_mill_grid], 0)
self.layout.addStretch()

10
appGUI/preferences/tools/ToolsNCCPrefGroupUI.py
View File

@@ -1,7 +1,7 @@
from PyQt6 import QtWidgets
from appGUI.GUIElements import RadioSet, FCDoubleSpinner, FCCheckBox, NumericalEvalTupleEntry, FCComboBox2, FCLabel, \
FCGridLayout, FCFrame
GLay, FCFrame
from appGUI.preferences.OptionsGroupUI import OptionsGroupUI
import gettext
@@ -36,7 +36,7 @@ class ToolsNCCPrefGroupUI(OptionsGroupUI):
par_frame = FCFrame()
self.layout.addWidget(par_frame)
par_grid = FCGridLayout(v_spacing=5, h_spacing=3)
par_grid = GLay(v_spacing=5, h_spacing=3)
par_frame.setLayout(par_grid)
# Tools Diameters
@@ -161,7 +161,7 @@ class ToolsNCCPrefGroupUI(OptionsGroupUI):
tt_frame = FCFrame()
self.layout.addWidget(tt_frame)
tool_grid = FCGridLayout(v_spacing=5, h_spacing=3)
tool_grid = GLay(v_spacing=5, h_spacing=3)
tt_frame.setLayout(tool_grid)
# Overlap Entry
@@ -280,7 +280,7 @@ class ToolsNCCPrefGroupUI(OptionsGroupUI):
gp_frame = FCFrame()
self.layout.addWidget(gp_frame)
gen_grid = FCGridLayout(v_spacing=5, h_spacing=3)
gen_grid = GLay(v_spacing=5, h_spacing=3)
gp_frame.setLayout(gen_grid)
# Rest machining CheckBox
@@ -355,6 +355,6 @@ class ToolsNCCPrefGroupUI(OptionsGroupUI):
gen_grid.addWidget(self.valid_cb, 10, 0, 1, 2)
FCGridLayout.set_common_column_size([par_grid, tool_grid, gen_grid], 0)
GLay.set_common_column_size([par_grid, tool_grid, gen_grid], 0)
self.layout.addStretch(1)

10
appGUI/preferences/tools/ToolsPaintPrefGroupUI.py
View File

@@ -1,7 +1,7 @@
from PyQt6 import QtWidgets
from appGUI.GUIElements import RadioSet, FCDoubleSpinner, FCComboBox2, FCCheckBox, NumericalEvalTupleEntry, FCLabel, \
FCGridLayout, FCFrame
GLay, FCFrame
from appGUI.preferences.OptionsGroupUI import OptionsGroupUI
import gettext
@@ -38,7 +38,7 @@ class ToolsPaintPrefGroupUI(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)
# Tool dia
@@ -144,7 +144,7 @@ class ToolsPaintPrefGroupUI(OptionsGroupUI):
tt_frame = FCFrame()
self.layout.addWidget(tt_frame)
tool_grid = FCGridLayout(v_spacing=5, h_spacing=3)
tool_grid = GLay(v_spacing=5, h_spacing=3)
tt_frame.setLayout(tool_grid)
# Overlap
@@ -237,7 +237,7 @@ class ToolsPaintPrefGroupUI(OptionsGroupUI):
gp_frame = FCFrame()
self.layout.addWidget(gp_frame)
gen_grid = FCGridLayout(v_spacing=5, h_spacing=3)
gen_grid = GLay(v_spacing=5, h_spacing=3)
gp_frame.setLayout(gen_grid)
self.rest_cb = FCCheckBox('%s' % _("Rest"))
@@ -310,6 +310,6 @@ class ToolsPaintPrefGroupUI(OptionsGroupUI):
gen_grid.addWidget(plotting_label, 8, 0)
gen_grid.addWidget(self.paint_plotting_radio, 8, 1)
FCGridLayout.set_common_column_size([tool_grid, param_grid, gen_grid], 0)
GLay.set_common_column_size([tool_grid, param_grid, gen_grid], 0)
self.layout.addStretch(1)

4
appGUI/preferences/tools/ToolsPanelizePrefGroupUI.py
View File

@@ -1,6 +1,6 @@
from PyQt6 import QtWidgets
from appGUI.GUIElements import FCDoubleSpinner, FCSpinner, RadioSet, FCCheckBox, FCLabel, FCGridLayout, FCFrame
from appGUI.GUIElements import FCDoubleSpinner, FCSpinner, RadioSet, FCCheckBox, FCLabel, GLay, FCFrame
from appGUI.preferences.OptionsGroupUI import OptionsGroupUI
import gettext
@@ -35,7 +35,7 @@ class ToolsPanelizePrefGroupUI(OptionsGroupUI):
param_frame = FCFrame()
self.layout.addWidget(param_frame)
param_grid = FCGridLayout(v_spacing=5, h_spacing=3)
param_grid = GLay(v_spacing=5, h_spacing=3)
param_frame.setLayout(param_grid)
# ## Spacing Columns

4
appGUI/preferences/tools/ToolsSolderpastePrefGroupUI.py
View File

@@ -1,6 +1,6 @@
from PyQt6 import QtCore
from appGUI.GUIElements import FCDoubleSpinner, FCSpinner, FCComboBox, NumericalEvalTupleEntry, FCLabel, FCGridLayout, \
from appGUI.GUIElements import FCDoubleSpinner, FCSpinner, FCComboBox, NumericalEvalTupleEntry, FCLabel, GLay, \
FCFrame
from appGUI.preferences.OptionsGroupUI import OptionsGroupUI
@@ -35,7 +35,7 @@ class ToolsSolderpastePrefGroupUI(OptionsGroupUI):
param_frame = FCFrame()
self.layout.addWidget(param_frame)
param_grid = FCGridLayout(v_spacing=5, h_spacing=3)
param_grid = GLay(v_spacing=5, h_spacing=3)
param_frame.setLayout(param_grid)
# Nozzle Tool Diameters

4
appGUI/preferences/tools/ToolsSubPrefGroupUI.py
View File

@@ -1,4 +1,4 @@
from appGUI.GUIElements import FCCheckBox, FCLabel, FCFrame, FCGridLayout
from appGUI.GUIElements import FCCheckBox, FCLabel, FCFrame, GLay
from appGUI.preferences.OptionsGroupUI import OptionsGroupUI
import gettext
@@ -31,7 +31,7 @@ class ToolsSubPrefGroupUI(OptionsGroupUI):
param_frame = FCFrame()
self.layout.addWidget(param_frame)
param_grid = FCGridLayout(v_spacing=5, h_spacing=3)
param_grid = GLay(v_spacing=5, h_spacing=3)
param_frame.setLayout(param_grid)
self.close_paths_cb = FCCheckBox(_("Close paths"))

16
appGUI/preferences/tools/ToolsTransformPrefGroupUI.py
View File

@@ -1,7 +1,7 @@
from PyQt6 import QtWidgets, QtGui
from appGUI.GUIElements import FCDoubleSpinner, FCCheckBox, NumericalEvalTupleEntry, FCComboBox, FCLabel, \
FCGridLayout, FCFrame
GLay, FCFrame
from appGUI.preferences.OptionsGroupUI import OptionsGroupUI
import gettext
@@ -35,7 +35,7 @@ class ToolsTransformPrefGroupUI(OptionsGroupUI):
param_frame = FCFrame()
self.layout.addWidget(param_frame)
param_grid = FCGridLayout(v_spacing=5, h_spacing=3)
param_grid = GLay(v_spacing=5, h_spacing=3)
param_frame.setLayout(param_grid)
# Reference Type
@@ -91,7 +91,7 @@ class ToolsTransformPrefGroupUI(OptionsGroupUI):
rot_frame = FCFrame()
self.layout.addWidget(rot_frame)
rot_grid = FCGridLayout(v_spacing=5, h_spacing=3)
rot_grid = GLay(v_spacing=5, h_spacing=3)
rot_frame.setLayout(rot_grid)
self.rotate_entry = FCDoubleSpinner()
@@ -132,7 +132,7 @@ class ToolsTransformPrefGroupUI(OptionsGroupUI):
skew_frame = FCFrame()
self.layout.addWidget(skew_frame)
skew_grid = FCGridLayout(v_spacing=5, h_spacing=3)
skew_grid = GLay(v_spacing=5, h_spacing=3)
skew_frame.setLayout(skew_grid)
self.skewx_entry = FCDoubleSpinner()
@@ -183,7 +183,7 @@ class ToolsTransformPrefGroupUI(OptionsGroupUI):
scale_frame = FCFrame()
self.layout.addWidget(scale_frame)
scale_grid = FCGridLayout(v_spacing=5, h_spacing=3)
scale_grid = GLay(v_spacing=5, h_spacing=3)
scale_frame.setLayout(scale_grid)
self.scalex_entry = FCDoubleSpinner()
@@ -220,7 +220,7 @@ class ToolsTransformPrefGroupUI(OptionsGroupUI):
off_frame = FCFrame()
self.layout.addWidget(off_frame)
off_grid = FCGridLayout(v_spacing=5, h_spacing=3)
off_grid = GLay(v_spacing=5, h_spacing=3)
off_frame.setLayout(off_grid)
self.offx_entry = FCDoubleSpinner()
@@ -273,7 +273,7 @@ class ToolsTransformPrefGroupUI(OptionsGroupUI):
buff_frame = FCFrame()
self.layout.addWidget(buff_frame)
buff_grid = FCGridLayout(v_spacing=5, h_spacing=3)
buff_grid = GLay(v_spacing=5, h_spacing=3)
buff_frame.setLayout(buff_grid)
self.buffer_label = FCLabel('%s:' % _("Distance"))
@@ -311,7 +311,7 @@ class ToolsTransformPrefGroupUI(OptionsGroupUI):
buff_grid.addWidget(self.buffer_factor_label, 4, 0)
buff_grid.addWidget(self.buffer_factor_entry, 4, 1)
FCGridLayout.set_common_column_size(
GLay.set_common_column_size(
[param_grid, rot_grid, skew_grid, scale_grid, off_grid, buff_grid], 0)
self.layout.addStretch()