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

- most of the logging (except in the Editors) is now done by the AppLogging class

Browse Source
This commit is contained in:
Marius Stanciu
2022-01-31 02:14:14 +02:00
committed by Marius
parent fa25644f8f
commit 056ff05e29
39 changed files with 373 additions and 371 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
appObjects/FlatCAMGeometry.py
View File

@@ -1554,8 +1554,7 @@ class GeometryObject(FlatCAMObj, Geometry):
self.read_form_item('multicolored')
self.plot()
@staticmethod
def merge(geo_list, geo_final, multi_geo=None, fuse_tools=None):
def merge(self, geo_list, geo_final, multi_geo=None, fuse_tools=None):
"""
Merges the geometry of objects in grb_list into the geometry of geo_final.
@@ -1580,7 +1579,7 @@ class GeometryObject(FlatCAMObj, Geometry):
try:
new_options[option] = deepcopy(geo_obj.options[option])
except Exception as e:
log.error("Failed to copy option %s. Error: %s" % (str(option), str(e)))
self.app.log.error("Failed to copy option %s. Error: %s" % (str(option), str(e)))
# Expand lists
if type(geo_obj) is list:
@@ -1596,7 +1595,7 @@ class GeometryObject(FlatCAMObj, Geometry):
new_solid_geometry += deepcopy(geo_obj.solid_geometry.geoms)
except Exception as e:
new_solid_geometry.append(geo_obj.solid_geometry)
log.error("GeometryObject.merge() --> %s" % str(e))
self.app.log.error("GeometryObject.merge() --> %s" % str(e))
# find the tool_uid maximum value in the geo_final
try: