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

- some fixes in Drilling Tool and in camlib.py file

Browse Source
This commit is contained in:
Marius Stanciu
2021-01-27 02:16:05 +02:00
committed by Marius
parent 575e29fcaa
commit f7021d89de
3 changed files with 30 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
appTools/ToolDrilling.py
View File

@@ -306,19 +306,25 @@ class ToolDrilling(AppTool, Excellon):
except Exception:
pass
try:
loaded_obj = self.app.collection.get_by_name(self.ui.object_combo.get_value())
except Exception as err:
self.app.log.error("ToolDrilling -> Loaded Excellon object error. %s" % str(err))
return
# reset the Excellon preprocessor combo
self.ui.pp_excellon_name_cb.clear()
# populate Excellon preprocessor combobox list
pp_list = []
for name in self.app.preprocessors.keys():
# the HPGL preprocessor or Paste_ are not for Excellon job therefore don't add it
if name in ['hpgl', 'Paste_1']:
continue
elif name == 'Check_points':
pp_list = [name]
break
pp_list.append(name)
pp_list.sort()
if loaded_obj.options['tools_drill_ppname_e'] == 'Check_points':
pp_list = ['Check_points']
else:
pp_list = []
for name in self.app.preprocessors.keys():
# the HPGL preprocessor or Paste_ are not for Excellon job therefore don't add it
if name in ['hpgl', 'Paste_1']:
continue
pp_list.append(name)
pp_list.sort()
if 'default' in pp_list:
pp_list.remove('default')
pp_list.insert(0, 'default')
@@ -330,12 +336,6 @@ class ToolDrilling(AppTool, Excellon):
self.ui.order_radio.set_value(self.app.defaults["tools_drill_tool_order"])
try:
loaded_obj = self.app.collection.get_by_name(self.ui.object_combo.get_value())
except Exception as err:
self.app.log.error("ToolDrilling -> Loaded Excellon object error. %s" % str(err))
return
if loaded_obj:
outname = loaded_obj.options['name']
else: