- refactored the imports in the Plugins, moved almost all imports in the AppTool file

- fixed a number of issues, mostly leftovers from moving the UI of a Plugin in its own class
- fixed some bugs in the Punch Gerber plugin
- fixed some bugs where the 'pool' parameter was not passed when creating shapes collections (in 3D graphic mode); I wonder how it worked until now
- added a new feature in the Isolation Plugin: now for all the isolation Geometry objects this plugin can do a supplementary simplification of the geometry using the tolerance parameter defined in the General Parameters. This should lead to a reduced number of tool lifts when doing corners
This commit is contained in:
Marius Stanciu
2022-03-31 19:28:19 +03:00
committed by Marius Stanciu
parent e1824a09f7
commit ada48269a9
43 changed files with 378 additions and 797 deletions

View File

@@ -1,20 +1,5 @@
from PyQt6 import QtWidgets, QtCore, QtGui
from appTool import AppTool
from appGUI.GUIElements import RadioSet, FCDoubleSpinner, FCButton, FCComboBox, NumericalEvalTupleEntry, FCLabel, \
VerticalScrollArea, FCGridLayout, FCComboBox2, FCFrame
from numpy import Inf
from copy import deepcopy
from shapely.geometry import Point
from shapely import affinity
import logging
import gettext
import appTranslation as fcTranslate
import builtins
from appTool import *
fcTranslate.apply_language('strings')
if '_' not in builtins.__dict__:
@@ -297,6 +282,7 @@ class DblSidedTool(AppTool):
align_type = self.ui.align_type_radio.get_value()
mode = self.ui.axis_location.get_value()
px = py = 0.0
if align_type in ["X", "Y"]:
if mode == "point":
try:
@@ -350,7 +336,7 @@ class DblSidedTool(AppTool):
for hole in holes:
point = Point(hole)
point_mirror = affinity.scale(point, xscale, yscale, origin=(px, py))
point_mirror = scale(point, xscale, yscale, origin=(px, py))
tools[1]['drills'] += [point, point_mirror]
tools[1]['solid_geometry'] += [point, point_mirror]
@@ -1169,8 +1155,7 @@ class DsidedUI:
}
""")
self.tools_box.addWidget(self.reset_button)
self.align_type_radio.activated_custom.connect(self.on_align_type_changed)
# #################################### FINSIHED GUI ###########################
# #############################################################################