- fixed a bug in Gerber merge

- bypassed a bug in FlatCAM Gerber UI - its not really fixed (it's a crash in build UI when disconnecting signals due of the wrapped C++ object already destroyed)
This commit is contained in:
Marius Stanciu
2021-03-13 21:22:13 +02:00
committed by Marius
parent 2f57e97a21
commit 5769998c04
3 changed files with 10 additions and 3 deletions

View File

@@ -1776,8 +1776,7 @@ class GerberObject(FlatCAMObj, Gerber):
else:
# create a list of integers out of the grb.tools keys and find the max of that value
# then, the aperture duplicate is assigned an id value incremented with 1,
# and finally made string because the apertures dict keys are strings
max_ap = str(max([int(k) for k in grb_final.tools.keys()]) + 1)
max_ap = max([int(k) for k in grb_final.tools.keys()]) + 1
grb_final.tools[max_ap] = {}
grb_final.tools[max_ap]['geometry'] = []

View File

@@ -993,7 +993,10 @@ class ObjectCollection(QtCore.QAbstractItemModel):
return
if obj:
obj.build_ui()
try:
obj.build_ui()
except RuntimeError:
pass
self.app.proj_selection_changed.emit(current, previous)