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

41
appEditors/AppGerberEditor.py
View File

@@ -67,27 +67,26 @@ class DrawToolShape(object):
pts += DrawToolShape.get_pts(sub_o)
# Non-iterable
except TypeError:
if o is not None:
# DrawToolShape: descend into .geo.
if isinstance(o, DrawToolShape):
pts += DrawToolShape.get_pts(o.geo)
# ## Descend into .exerior and .interiors
elif type(o) == Polygon:
pts += DrawToolShape.get_pts(o.exterior)
for i in o.interiors:
pts += DrawToolShape.get_pts(i)
elif type(o) == MultiLineString:
for line in o:
pts += DrawToolShape.get_pts(line)
# ## Has .coords: list them.
else:
if DrawToolShape.tolerance is not None:
pts += list(o.simplify(DrawToolShape.tolerance).coords)
else:
pts += list(o.coords)
else:
if o is None:
return
# DrawToolShape: descend into .geo.
if isinstance(o, DrawToolShape):
pts += DrawToolShape.get_pts(o.geo)
# ## Descend into .exerior and .interiors
elif type(o) == Polygon:
pts += DrawToolShape.get_pts(o.exterior)
for i in o.interiors:
pts += DrawToolShape.get_pts(i)
elif type(o) == MultiLineString:
for line in o:
pts += DrawToolShape.get_pts(line)
# ## Has .coords: list them.
else:
if DrawToolShape.tolerance is not None:
pts += list(o.simplify(DrawToolShape.tolerance).coords)
else:
pts += list(o.coords)
return pts
def __init__(self, geo=None):
@@ -5480,7 +5479,7 @@ class AppGerberEditor(QtCore.QObject):
# "%.4f    " % (self.app.dx, self.app.dy))
self.app.ui.update_location_labels(self.app.dx, self.app.dy, x, y)
units = self.app.app_units.lower()
# units = self.app.app_units.lower()
# self.app.plotcanvas.text_hud.text = \
# 'Dx:\t{:<.4f} [{:s}]\nDy:\t{:<.4f} [{:s}]\n\nX: \t{:<.4f} [{:s}]\nY: \t{:<.4f} [{:s}]'.format(
# self.app.dx, units, self.app.dy, units, x, units, y, units)

5
appObjects/FlatCAMGeometry.py
View File

@@ -10,7 +10,7 @@
# File modified by: Marius Stanciu #
# ##########################################################
from shapely.geometry import MultiLineString, LineString, LinearRing, box
from shapely.geometry import MultiLineString, LinearRing
import shapely.affinity as affinity
from camlib import Geometry, flatten_shapely_geometry
@@ -18,15 +18,12 @@ from camlib import Geometry, flatten_shapely_geometry
from appObjects.FlatCAMObj import *
import ezdxf
import math
import numpy as np
from copy import deepcopy
import traceback
from collections import defaultdict
from functools import reduce
import simplejson as json
import gettext
import appTranslation as fcTranslate
import builtins

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):
"""

7
appPlugins/ToolFiducials.py
View File

@@ -486,6 +486,13 @@ class ToolFiducials(AppTool):
geo_list = []
def make_square_poly(center_pt, side_size):
"""
:param center_pt:
:param side_size:
:return:
:type return: Polygon
"""
half_s = side_size / 2
x_center = center_pt[0]
y_center = center_pt[1]