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

FlatCAMObj - to_form,read_form,read_form_item cleanups for better debuging and cleanup Excellon merge method

Browse Source 
FlatCAMApp - fix  accidentall delete issue, change  calling  to  understand FlatCAMObj changes
This commit is contained in:
Kamil Sopko
2016-02-23 12:21:57 +01:00
parent a3ccbac362
commit c3e544ac6c
2 changed files with 53 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
FlatCAMApp.py
View File

@@ -2774,6 +2774,8 @@ class App(QtCore.QObject):
def delete(obj_name):
try:
#deselect all to avoid delete selected object when run delete from shell
self.collection.set_all_inactive()
self.collection.set_active(str(obj_name))
self.on_delete()
except Exception, e:
@@ -2815,7 +2817,7 @@ class App(QtCore.QObject):
objs.append(obj)
def initialize(obj, app):
FlatCAMExcellon.merge(objs, obj,True)
FlatCAMExcellon.merge(objs, obj)
if objs is not None:
self.new_object("excellon", obj_name, initialize)
@@ -2880,14 +2882,14 @@ class App(QtCore.QObject):
obj_init.offset([float(currentx), float(currenty)]),
def initialize_local_excellon(obj_init, app):
FlatCAMExcellon.merge(obj, obj_init,True)
FlatCAMExcellon.merge(obj, obj_init)
obj_init.offset([float(currentx), float(currenty)]),
def initialize_geometry(obj_init, app):
FlatCAMGeometry.merge(objs, obj_init)
def initialize_excellon(obj_init, app):
FlatCAMExcellon.merge(objs, obj_init,True)
FlatCAMExcellon.merge(objs, obj_init)
objs=[]
if obj is not None:
@@ -2909,7 +2911,8 @@ class App(QtCore.QObject):
else:
self.new_object("geometry", outname, initialize_geometry)
#deselect all to avoid delete selected object when run delete from shell
self.collection.set_all_inactive()
for delobj in objs:
self.collection.set_active(delobj.options['name'])
self.on_delete()