- fixed an issue in Gerber parser with detecting old kind of units
This commit is contained in:
@@ -12,6 +12,7 @@ CAD program, and create G-Code for Isolation routing.
|
|||||||
12.01.2020
|
12.01.2020
|
||||||
|
|
||||||
- improved the circle approximation resolution
|
- improved the circle approximation resolution
|
||||||
|
- fixed an issue in Gerber parser with detecting old kind of units
|
||||||
|
|
||||||
11.01.2020
|
11.01.2020
|
||||||
|
|
||||||
|
|||||||
@@ -528,13 +528,13 @@ class Geometry(object):
|
|||||||
self.solid_geometry = []
|
self.solid_geometry = []
|
||||||
|
|
||||||
if type(self.solid_geometry) is list:
|
if type(self.solid_geometry) is list:
|
||||||
self.solid_geometry.append(Point(origin).buffer(
|
self.solid_geometry.append(Point(origin).buffer(radius, int(self.geo_steps_per_circle)))
|
||||||
radius, int(self.geo_steps_per_circle)))
|
|
||||||
return
|
return
|
||||||
|
|
||||||
try:
|
try:
|
||||||
self.solid_geometry = self.solid_geometry.union(Point(origin).buffer(
|
self.solid_geometry = self.solid_geometry.union(
|
||||||
radius, int(self.geo_steps_per_circle)))
|
Point(origin).buffer(radius, int(self.geo_steps_per_circle))
|
||||||
|
)
|
||||||
except Exception as e:
|
except Exception as e:
|
||||||
log.error("Failed to run union on polygons. %s" % str(e))
|
log.error("Failed to run union on polygons. %s" % str(e))
|
||||||
return
|
return
|
||||||
|
|||||||
@@ -595,6 +595,7 @@ class Gerber(Geometry):
|
|||||||
match = self.units_re.search(gline)
|
match = self.units_re.search(gline)
|
||||||
if match:
|
if match:
|
||||||
obs_gerber_units = {'0': 'IN', '1': 'MM'}[match.group(1)]
|
obs_gerber_units = {'0': 'IN', '1': 'MM'}[match.group(1)]
|
||||||
|
self.units = obs_gerber_units
|
||||||
log.warning("Gerber obsolete units found = %s" % obs_gerber_units)
|
log.warning("Gerber obsolete units found = %s" % obs_gerber_units)
|
||||||
# Changed for issue #80
|
# Changed for issue #80
|
||||||
# self.convert_units({'0': 'IN', '1': 'MM'}[match.group(1)])
|
# self.convert_units({'0': 'IN', '1': 'MM'}[match.group(1)])
|
||||||
|
|||||||
Reference in New Issue
Block a user