- fixed the --shellvar and --shellfile FlatCAM arguments to work together but the --shellvar has precedence over --shellfile as it is most likely that whatever variable set by --shellvar will be used in the script file run by --shellfile

This commit is contained in:
Marius Stanciu
2019-09-18 01:58:15 +03:00
committed by Marius
parent 6723f9496c
commit 8958ef8007
4 changed files with 291 additions and 56 deletions

View File

@@ -3742,7 +3742,6 @@ class FlatCAMGrbEditor(QtCore.QObject):
# temp_elem.append(deepcopy(new_elem))
for elem in self.gerber_obj.apertures[apid]['geometry']:
new_elem = dict()
if 'solid' in elem:
solid_geo = elem['solid']
for clear_geo in global_clear_geo:
@@ -4434,16 +4433,18 @@ class FlatCAMGrbEditor(QtCore.QObject):
self.plot_shape(geometry=geometric_data,
color=self.app.defaults['global_sel_draw_color'],
linewidth=2)
continue
self.plot_shape(geometry=geometric_data,
color=self.app.defaults['global_draw_color'])
else:
self.plot_shape(geometry=geometric_data,
color=self.app.defaults['global_draw_color'])
except KeyError:
pass
for elem in self.utility:
geometric_data = elem.geo['solid']
self.plot_shape(geometry=geometric_data, linewidth=1)
continue
if self.utility:
for elem in self.utility:
geometric_data = elem.geo['solid']
self.plot_shape(geometry=geometric_data, linewidth=1)
continue
self.shapes.redraw()