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

- fixed a bug introduced by first mod today, when the selected object is of 'cncjob' kind.

Browse Source
This commit is contained in:
Marius Stanciu
2020-12-04 16:47:58 +02:00
committed by Marius Stanciu
parent e677a6592e
commit b023b79822
7 changed files with 16 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
appTools/ToolDblSided.py
View File

@@ -177,12 +177,13 @@ class DblSidedTool(AppTool):
name = current.indexes()[0].internalPointer().obj.options['name']
kind = current.indexes()[0].internalPointer().obj.kind
obj_type = {'gerber': 'grb', 'excellon': 'exc', 'geometry': 'geo'}[kind]
self.ui.object_type_radio.set_value(obj_type)
self.ui.box_type_radio.set_value(obj_type)
if kind in ['gerber', 'excellon', 'geometry']:
obj_type = {'gerber': 'grb', 'excellon': 'exc', 'geometry': 'geo'}[kind]
self.ui.object_type_radio.set_value(obj_type)
self.ui.box_type_radio.set_value(obj_type)
self.ui.object_combo.set_value(name)
except IndexError:
self.ui.object_combo.set_value(name)
except Exception:
pass
def on_create_alignment_holes(self):

2
appTools/ToolFilm.py
View File

@@ -100,7 +100,7 @@ class Film(AppTool):
self.ui.tf_object_combo.set_value(name)
self.ui.tf_box_combo.set_value(name)
except IndexError:
except Exception:
pass
def run(self, toggle=True):

2
appTools/ToolNCC.py
View File

@@ -280,7 +280,7 @@ class NonCopperClear(AppTool, Gerber):
self.ui.type_obj_radio.set_value(kind)
self.ui.object_combo.set_value(name)
except IndexError:
except Exception:
pass
def on_toggle_all_rows(self):

2
appTools/ToolPaint.py
View File

@@ -292,7 +292,7 @@ class ToolPaint(AppTool, Gerber):
self.ui.type_obj_radio.set_value(kind)
self.ui.obj_combo.set_value(name)
except IndexError:
except Exception:
pass
def update_ui(self):

9
appTools/ToolPanelize.py
View File

@@ -204,9 +204,10 @@ class Panelize(AppTool):
name = current.indexes()[0].internalPointer().obj.options['name']
kind = current.indexes()[0].internalPointer().obj.kind
obj_type = {
"gerber": _("Gerber"), "excellon": _("Excellon"), "geometry": _("Geometry")
}[kind]
if kind in ['gerber', 'excellon', 'geometry']:
obj_type = {
"gerber": _("Gerber"), "excellon": _("Excellon"), "geometry": _("Geometry")
}[kind]
self.ui.type_obj_combo.set_value(obj_type)
self.ui.type_box_combo.set_value(obj_type)
@@ -216,7 +217,7 @@ class Panelize(AppTool):
self.ui.object_combo.set_value(name)
self.ui.box_combo.set_value(name)
except IndexError:
except Exception:
pass
def on_panelize(self):

2
appTools/ToolSub.py
View File

@@ -173,7 +173,7 @@ class ToolSub(AppTool):
self.ui.target_gerber_combo.set_value(name)
if kind == 'geometry':
self.ui.target_geo_combo.set_value(name)
except IndexError:
except Exception:
pass
def set_tool_ui(self):