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

- working on fixing a bug in FlatCAMGeometry.merge()

Browse Source
This commit is contained in:
Marius Stanciu
2020-02-12 16:43:13 +02:00
parent 67a2350a59
commit c2373da17a
4 changed files with 44 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
FlatCAMApp.py
View File

@@ -5689,11 +5689,12 @@ class App(QtCore.QObject):
if True in geo_type_set:
def initialize(geo_obj, app):
FlatCAMGeometry.merge(self, geo_list=objs, geo_final=geo_obj, multigeo=True)
app.inform.emit('[success] %s.' % _("Multigeo. Geometry merging finished"))
app.inform.emit('[success] %s.' % _("Geometry merging finished"))
# rename all the ['name] key in obj.tools[tooluid]['data'] to the obj_name_multi
for v in obj.tools.values():
for v in geo_obj.tools.values():
v['data']['name'] = obj_name_multi
self.new_object("geometry", obj_name_multi, initialize)
else:
def initialize(geo_obj, app):
@@ -5701,7 +5702,7 @@ class App(QtCore.QObject):
app.inform.emit('[success] %s.' % _("Geometry merging finished"))
# rename all the ['name] key in obj.tools[tooluid]['data'] to the obj_name_multi
for v in obj.tools.values():
for v in geo_obj.tools.values():
v['data']['name'] = obj_name_single
self.new_object("geometry", obj_name_single, initialize)