- created a new custom layout based on the Grid Layout where I can set the horizontal and vertical spacings between grid items and used it throughout the app

This commit is contained in:
Marius Stanciu
2021-08-07 11:46:45 +03:00
committed by Marius
parent 3c06280d3d
commit 461aa763ad
88 changed files with 325 additions and 281 deletions

View File

@@ -9,7 +9,7 @@ from PyQt6 import QtGui, QtCore, QtWidgets
from PyQt6.QtCore import Qt
from camlib import distance, arc, FlatCAMRTreeStorage
from appGUI.GUIElements import FCEntry, FCTable, FCDoubleSpinner, RadioSet, FCSpinner, FCButton, FCLabel
from appGUI.GUIElements import FCEntry, FCTable, FCDoubleSpinner, RadioSet, FCSpinner, FCButton, FCLabel, FCGridLayout
from appEditors.AppGeoEditor import FCShapeTool, DrawTool, DrawToolShape, DrawToolUtilityShape, AppGeoEditor
from shapely.geometry import LineString, LinearRing, MultiLineString, Polygon, MultiPolygon, Point
@@ -4060,7 +4060,7 @@ class AppExcEditorUI:
# #############################################################################################################
# ######################## ADD New Tool Grid ##################################################################
# #############################################################################################################
grid1 = QtWidgets.QGridLayout()
grid1 = FCGridLayout(v_spacing=3)
grid1.setColumnStretch(0, 0)
grid1.setColumnStretch(1, 1)
self.ui_vertical_lay.addLayout(grid1)
@@ -4114,7 +4114,7 @@ class AppExcEditorUI:
self.resize_frame.setContentsMargins(0, 0, 0, 0)
self.ui_vertical_lay.addWidget(self.resize_frame)
self.resize_grid = QtWidgets.QGridLayout()
self.resize_grid = FCGridLayout(v_spacing=3)
self.resize_grid.setColumnStretch(0, 0)
self.resize_grid.setColumnStretch(1, 1)
self.resize_grid.setContentsMargins(0, 0, 0, 0)
@@ -4170,7 +4170,7 @@ class AppExcEditorUI:
self.array_frame.setContentsMargins(0, 0, 0, 0)
self.ui_vertical_lay.addWidget(self.array_frame)
self.array_grid = QtWidgets.QGridLayout()
self.array_grid = FCGridLayout(v_spacing=3)
self.array_grid.setColumnStretch(0, 0)
self.array_grid.setColumnStretch(1, 1)
self.array_grid.setContentsMargins(0, 0, 0, 0)
@@ -4213,7 +4213,7 @@ class AppExcEditorUI:
self.array_linear_frame = QtWidgets.QFrame()
self.array_linear_frame.setContentsMargins(0, 0, 0, 0)
self.array_grid.addWidget(self.array_linear_frame, 6, 0, 1, 2)
self.lin_grid = QtWidgets.QGridLayout()
self.lin_grid = FCGridLayout(v_spacing=3)
self.lin_grid.setColumnStretch(0, 0)
self.lin_grid.setColumnStretch(1, 1)
self.lin_grid.setContentsMargins(0, 0, 0, 0)
@@ -4272,7 +4272,7 @@ class AppExcEditorUI:
self.array_circular_frame.setContentsMargins(0, 0, 0, 0)
self.array_grid.addWidget(self.array_circular_frame, 8, 0, 1, 2)
self.circ_grid = QtWidgets.QGridLayout()
self.circ_grid = FCGridLayout(v_spacing=3)
self.circ_grid.setColumnStretch(0, 0)
self.circ_grid.setColumnStretch(1, 1)
self.circ_grid.setContentsMargins(0, 0, 0, 0)
@@ -4316,7 +4316,7 @@ class AppExcEditorUI:
self.slot_frame.setContentsMargins(0, 0, 0, 0)
self.ui_vertical_lay.addWidget(self.slot_frame)
self.slot_grid = QtWidgets.QGridLayout()
self.slot_grid = FCGridLayout(v_spacing=3)
self.slot_grid.setColumnStretch(0, 0)
self.slot_grid.setColumnStretch(1, 1)
self.slot_grid.setContentsMargins(0, 0, 0, 0)
@@ -4390,7 +4390,7 @@ class AppExcEditorUI:
self.slot_array_frame.setContentsMargins(0, 0, 0, 0)
self.ui_vertical_lay.addWidget(self.slot_array_frame)
self.slot_array_grid = QtWidgets.QGridLayout()
self.slot_array_grid = FCGridLayout(v_spacing=3)
self.slot_array_grid.setColumnStretch(0, 0)
self.slot_array_grid.setColumnStretch(1, 1)
self.slot_array_grid.setContentsMargins(0, 0, 0, 0)
@@ -4434,7 +4434,7 @@ class AppExcEditorUI:
self.slot_array_linear_frame.setContentsMargins(0, 0, 0, 0)
self.slot_array_grid.addWidget(self.slot_array_linear_frame, 6, 0, 1, 2)
self.slot_array_lin_grid = QtWidgets.QGridLayout()
self.slot_array_lin_grid = FCGridLayout(v_spacing=3)
self.slot_array_lin_grid.setColumnStretch(0, 0)
self.slot_array_lin_grid.setColumnStretch(1, 1)
self.slot_array_lin_grid.setContentsMargins(0, 0, 0, 0)
@@ -4494,7 +4494,7 @@ class AppExcEditorUI:
self.slot_array_circular_frame.setContentsMargins(0, 0, 0, 0)
self.slot_array_grid.addWidget(self.slot_array_circular_frame, 8, 0, 1, 2)
self.slot_array_circ_grid = QtWidgets.QGridLayout()
self.slot_array_circ_grid = FCGridLayout(v_spacing=3)
self.slot_array_circ_grid.setColumnStretch(0, 0)
self.slot_array_circ_grid.setColumnStretch(1, 1)
self.slot_array_circ_grid.setContentsMargins(0, 0, 0, 0)