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

20
appEditors/AppExcEditor.py
View File

@@ -9,7 +9,7 @@ from PyQt6 import QtGui, QtCore, QtWidgets
from PyQt6.QtCore import Qt
from camlib import distance, arc, AppRTreeStorage
from appGUI.GUIElements import FCEntry, FCTable, FCDoubleSpinner, RadioSet, FCSpinner, FCButton, FCLabel, FCGridLayout
from appGUI.GUIElements import FCEntry, FCTable, FCDoubleSpinner, RadioSet, FCSpinner, FCButton, FCLabel, GLay
from appEditors.AppGeoEditor import FCShapeTool, DrawTool, DrawToolShape, DrawToolUtilityShape, AppGeoEditor
from shapely.geometry import LineString, LinearRing, MultiLineString, Polygon, MultiPolygon, Point
@@ -4093,7 +4093,7 @@ class AppExcEditorUI:
# #############################################################################################################
# ######################## ADD New Tool Grid ##################################################################
# #############################################################################################################
grid1 = FCGridLayout(v_spacing=5, h_spacing=3)
grid1 = GLay(v_spacing=5, h_spacing=3)
self.ui_vertical_lay.addLayout(grid1)
# Tool Diameter Label
@@ -4145,7 +4145,7 @@ class AppExcEditorUI:
self.resize_frame.setContentsMargins(0, 0, 0, 0)
self.ui_vertical_lay.addWidget(self.resize_frame)
self.resize_grid = FCGridLayout(v_spacing=5, h_spacing=3)
self.resize_grid = GLay(v_spacing=5, h_spacing=3)
self.resize_grid.setContentsMargins(0, 0, 0, 0)
self.resize_frame.setLayout(self.resize_grid)
@@ -4199,7 +4199,7 @@ class AppExcEditorUI:
self.array_frame.setContentsMargins(0, 0, 0, 0)
self.ui_vertical_lay.addWidget(self.array_frame)
self.array_grid = FCGridLayout(v_spacing=5, h_spacing=3)
self.array_grid = GLay(v_spacing=5, h_spacing=3)
self.array_grid.setContentsMargins(0, 0, 0, 0)
self.array_frame.setLayout(self.array_grid)
@@ -4240,7 +4240,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 = FCGridLayout(v_spacing=5, h_spacing=3)
self.lin_grid = GLay(v_spacing=5, h_spacing=3)
self.lin_grid.setContentsMargins(0, 0, 0, 0)
self.array_linear_frame.setLayout(self.lin_grid)
@@ -4297,7 +4297,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 = FCGridLayout(v_spacing=5, h_spacing=3)
self.circ_grid = GLay(v_spacing=5, h_spacing=3)
self.circ_grid.setContentsMargins(0, 0, 0, 0)
self.array_circular_frame.setLayout(self.circ_grid)
@@ -4339,7 +4339,7 @@ class AppExcEditorUI:
self.slot_frame.setContentsMargins(0, 0, 0, 0)
self.ui_vertical_lay.addWidget(self.slot_frame)
self.slot_grid = FCGridLayout(v_spacing=5, h_spacing=3)
self.slot_grid = GLay(v_spacing=5, h_spacing=3)
self.slot_grid.setContentsMargins(0, 0, 0, 0)
self.slot_frame.setLayout(self.slot_grid)
@@ -4411,7 +4411,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 = FCGridLayout(v_spacing=5, h_spacing=3)
self.slot_array_grid = GLay(v_spacing=5, h_spacing=3)
self.slot_array_grid.setContentsMargins(0, 0, 0, 0)
self.slot_array_frame.setLayout(self.slot_array_grid)
@@ -4453,7 +4453,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 = FCGridLayout(v_spacing=5, h_spacing=3)
self.slot_array_lin_grid = GLay(v_spacing=5, h_spacing=3)
self.slot_array_lin_grid.setContentsMargins(0, 0, 0, 0)
self.slot_array_linear_frame.setLayout(self.slot_array_lin_grid)
@@ -4511,7 +4511,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 = FCGridLayout(v_spacing=5, h_spacing=3)
self.slot_array_circ_grid = GLay(v_spacing=5, h_spacing=3)
self.slot_array_circ_grid.setContentsMargins(0, 0, 0, 0)
self.slot_array_circular_frame.setLayout(self.slot_array_circ_grid)

14
appEditors/AppGeoEditor.py
View File

@@ -20,7 +20,7 @@ from camlib import distance, arc, three_point_circle, Geometry, AppRTreeStorage,
from appTool import AppTool
from appGUI.GUIElements import OptionalInputSection, FCCheckBox, FCLabel, FCComboBox, FCTextAreaRich, \
FCDoubleSpinner, FCButton, FCInputDoubleSpinner, FCTree, NumericalEvalTupleEntry, FCEntry, FCTextEdit, \
VerticalScrollArea, FCGridLayout
VerticalScrollArea, GLay
from appParsers.ParseFont import *
from vispy.geometry import Rect
@@ -83,7 +83,7 @@ class BufferSelectionTool(AppTool):
self.buffer_tool_frame.setLayout(self.buffer_tools_box)
# Grid Layout
grid_buffer = FCGridLayout(v_spacing=5, h_spacing=3)
grid_buffer = GLay(v_spacing=5, h_spacing=3)
self.buffer_tools_box.addLayout(grid_buffer)
# Buffer distance
@@ -265,7 +265,7 @@ class TextInputTool(AppTool):
self.text_tools_box.addWidget(title_label)
# Grid Layout
self.grid_text = FCGridLayout(v_spacing=5, h_spacing=3)
self.grid_text = GLay(v_spacing=5, h_spacing=3)
self.text_tools_box.addLayout(self.grid_text)
# Font type
@@ -501,7 +501,7 @@ class PaintOptionsTool(AppTool):
""")
self.layout.addWidget(title_label)
grid = FCGridLayout(v_spacing=5, h_spacing=3)
grid = GLay(v_spacing=5, h_spacing=3)
self.layout.addLayout(grid)
# Tool dia
@@ -729,7 +729,7 @@ class TransformEditorTool(AppTool):
self.layout.addWidget(FCLabel(''))
# ## Layout
grid0 = FCGridLayout(v_spacing=5, h_spacing=3, c_stretch=[0, 1, 0])
grid0 = GLay(v_spacing=5, h_spacing=3, c_stretch=[0, 1, 0])
self.layout.addLayout(grid0)
grid0.addWidget(FCLabel(''))
@@ -3452,7 +3452,7 @@ class AppGeoEditor(QtCore.QObject):
self.level.setCheckable(True)
self.title_box.addWidget(self.level)
self.grid_d = FCGridLayout(v_spacing=5, h_spacing=3)
self.grid_d = GLay(v_spacing=5, h_spacing=3)
self.tools_box.addLayout(self.grid_d)
# Tool diameter
@@ -3494,7 +3494,7 @@ class AppGeoEditor(QtCore.QObject):
self.adv_frame.setContentsMargins(0, 0, 0, 0)
self.tools_box.addWidget(self.adv_frame)
grid0 = FCGridLayout(v_spacing=5, h_spacing=3)
grid0 = GLay(v_spacing=5, h_spacing=3)
grid0.setContentsMargins(0, 0, 0, 0)
self.adv_frame.setLayout(grid0)

18
appEditors/AppGerberEditor.py
View File

@@ -20,7 +20,7 @@ import logging
from camlib import distance, arc, three_point_circle, flatten_shapely_geometry
from appGUI.GUIElements import FCEntry, FCComboBox, FCTable, FCDoubleSpinner, FCSpinner, RadioSet, EvalEntry2, \
FCInputDoubleSpinner, FCButton, OptionalInputSection, FCCheckBox, NumericalEvalTupleEntry, FCLabel, FCTextEdit, \
VerticalScrollArea, FCGridLayout
VerticalScrollArea, GLay
from appTool import AppTool
import numpy as np
@@ -6213,7 +6213,7 @@ class AppGerberEditorUI:
# #############################################################################################################
# ############################ Add/Delete an new Aperture #####################################################
# #############################################################################################################
grid1 = FCGridLayout(v_spacing=5, h_spacing=3)
grid1 = GLay(v_spacing=5, h_spacing=3)
self.apertures_box.addLayout(grid1)
# Title
@@ -6312,7 +6312,7 @@ class AppGerberEditorUI:
self.shape_frame.setContentsMargins(0, 0, 0, 0)
self.custom_box.addWidget(self.shape_frame)
self.shape_grid = FCGridLayout(v_spacing=5, h_spacing=3)
self.shape_grid = GLay(v_spacing=5, h_spacing=3)
self.shape_grid.setContentsMargins(0, 0, 0, 0)
self.shape_frame.setLayout(self.shape_grid)
@@ -6332,7 +6332,7 @@ class AppGerberEditorUI:
)
self.shape_grid.addWidget(param_title, 4, 0, 1, 3)
p_grid = FCGridLayout(v_spacing=5, h_spacing=3, c_stretch=[0, 0, 0, 1, 0])
p_grid = GLay(v_spacing=5, h_spacing=3, c_stretch=[0, 0, 0, 1, 0])
# Is Valid
valid_lbl = FCLabel('<b>%s</b>:' % _("Valid"))
@@ -6444,7 +6444,7 @@ class AppGerberEditorUI:
self.buffer_tools_box.addWidget(buf_title_lbl)
# Grid Layout
buff_grid = FCGridLayout(v_spacing=5, h_spacing=3)
buff_grid = GLay(v_spacing=5, h_spacing=3)
self.buffer_tools_box.addLayout(buff_grid)
# Buffer distance
@@ -6502,7 +6502,7 @@ class AppGerberEditorUI:
self.scale_tools_box.addWidget(scale_title_lbl)
# Grid Layout
scale_grid = FCGridLayout(v_spacing=5, h_spacing=3)
scale_grid = GLay(v_spacing=5, h_spacing=3)
self.scale_tools_box.addLayout(scale_grid)
self.scale_factor_lbl = FCLabel('%s:' % _("Scale factor"))
@@ -6551,7 +6551,7 @@ class AppGerberEditorUI:
self.ma_tools_box.addWidget(ma_title_lbl)
# Form Layout
mark_grid = FCGridLayout(v_spacing=5, h_spacing=3)
mark_grid = GLay(v_spacing=5, h_spacing=3)
self.ma_tools_box.addLayout(mark_grid)
# Upper Threshold
@@ -6620,7 +6620,7 @@ class AppGerberEditorUI:
separator_line.setFrameShadow(QtWidgets.QFrame.Shadow.Sunken)
self.array_box.addWidget(separator_line)
array_grid = FCGridLayout(v_spacing=5, h_spacing=3)
array_grid = GLay(v_spacing=5, h_spacing=3)
self.array_box.addLayout(array_grid)
# Title
@@ -6795,7 +6795,7 @@ class TransformEditorTool(AppTool):
self.layout.addWidget(FCLabel(''))
# ## Layout
grid0 = FCGridLayout(v_spacing=5, h_spacing=3, c_stretch=[0, 1, 0])
grid0 = GLay(v_spacing=5, h_spacing=3, c_stretch=[0, 1, 0])
self.layout.addLayout(grid0)
grid0.addWidget(FCLabel(''))

4
appEditors/appGCodeEditor.py
View File

@@ -7,7 +7,7 @@
from appEditors.AppTextEditor import AppTextEditor
from appObjects.CNCJobObject import CNCJobObject
from appGUI.GUIElements import FCTextArea, FCEntry, FCButton, FCTable, FCGridLayout, FCLabel
from appGUI.GUIElements import FCTextArea, FCEntry, FCButton, FCTable, GLay, FCLabel
from PyQt6 import QtWidgets, QtCore, QtGui
# from io import StringIO
@@ -835,7 +835,7 @@ class AppGCodeEditorUI:
self.snippet_frame.setContentsMargins(0, 0, 0, 0)
self.edit_box.addWidget(self.snippet_frame)
self.snippet_grid = FCGridLayout(v_spacing=5, h_spacing=3, c_stretch=[0, 0])
self.snippet_grid = GLay(v_spacing=5, h_spacing=3, c_stretch=[0, 0])
self.snippet_grid.setContentsMargins(0, 0, 0, 0)
self.snippet_frame.setLayout(self.snippet_grid)