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

- minor changes, code cleanup

Browse Source
This commit is contained in:
Marius Stanciu
2021-09-28 15:52:05 +03:00
parent 36c0b94d3a
commit 1fb520e829
4 changed files with 31 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
appObjects/FlatCAMGerber.py
View File

@@ -743,7 +743,7 @@ class GerberObject(FlatCAMObj, Gerber):
geom = Polygon(geom.coords[::-1])
else:
self.app.log.debug("GerberObject.isolate().generate_envelope() Error --> Unexpected Geometry %s" %
type(geom))
type(geom))
except Exception as e:
self.app.log.error("GerberObject.isolate().generate_envelope() Error --> %s" % str(e))
return 'fail'
@@ -770,8 +770,8 @@ class GerberObject(FlatCAMObj, Gerber):
tools_list = [
float(eval(dia)) for dia in temp_tools if dia != ''
]
except Exception as e:
self.app.log.error("GerberObject.follow_geo -> At least one tool diameter needed. -> %s" % str(e))
except Exception as er:
self.app.log.error("GerberObject.follow_geo -> At least one tool diameter needed. -> %s" % str(er))
return 'fail'
# Propagate options
@@ -964,45 +964,6 @@ class GerberObject(FlatCAMObj, Gerber):
except Exception as e:
self.app.log.error("GerberObject.plot() --> %s" % str(e))
# try:
# if self.options["solid"]:
# for g in geometry:
# if type(g) == Polygon or type(g) == LineString:
# self.add_shape(shape=g, color=color,
# face_color=random_color() if self.options['multicolored']
# else face_color, visible=visible)
# elif type(g) == Point:
# pass
# else:
# try:
# for el in g:
# self.add_shape(shape=el, color=color,
# face_color=random_color() if self.options['multicolored']
# else face_color, visible=visible)
# except TypeError:
# self.add_shape(shape=g, color=color,
# face_color=random_color() if self.options['multicolored']
# else face_color, visible=visible)
# else:
# for g in geometry:
# if type(g) == Polygon or type(g) == LineString:
# self.add_shape(shape=g, color=random_color() if self.options['multicolored'] else 'black',
# visible=visible)
# elif type(g) == Point:
# pass
# else:
# for el in g:
# self.add_shape(shape=el, color=random_color() if self.options['multicolored'] else 'black',
# visible=visible)
# self.shapes.redraw(
# # update_colors=(self.fill_color, self.outline_color),
# # indexes=self.app.plotcanvas.shape_collection.data.keys()
# )
# except (ObjectDeleted, AttributeError):
# self.shapes.clear(update=True)
# except Exception as e:
# self.app.log.error("GerberObject.plot() --> %s" % str(e))
def plot_aperture(self, only_flashes=False, run_thread=False, **kwargs):
"""