diff --git a/README.md b/README.md index 39de865e..57224d90 100644 --- a/README.md +++ b/README.md @@ -12,6 +12,7 @@ CAD program, and create G-Code for Isolation routing. 12.01.2020 - improved the circle approximation resolution +- fixed an issue in Gerber parser with detecting old kind of units 11.01.2020 diff --git a/camlib.py b/camlib.py index 6bbaf9ef..063478b1 100644 --- a/camlib.py +++ b/camlib.py @@ -528,13 +528,13 @@ class Geometry(object): self.solid_geometry = [] if type(self.solid_geometry) is list: - self.solid_geometry.append(Point(origin).buffer( - radius, int(self.geo_steps_per_circle))) + self.solid_geometry.append(Point(origin).buffer(radius, int(self.geo_steps_per_circle))) return try: - self.solid_geometry = self.solid_geometry.union(Point(origin).buffer( - radius, int(self.geo_steps_per_circle))) + self.solid_geometry = self.solid_geometry.union( + Point(origin).buffer(radius, int(self.geo_steps_per_circle)) + ) except Exception as e: log.error("Failed to run union on polygons. %s" % str(e)) return diff --git a/flatcamParsers/ParseGerber.py b/flatcamParsers/ParseGerber.py index 6f79c31a..7fbfce1f 100644 --- a/flatcamParsers/ParseGerber.py +++ b/flatcamParsers/ParseGerber.py @@ -595,6 +595,7 @@ class Gerber(Geometry): match = self.units_re.search(gline) if match: 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) # Changed for issue #80 # self.convert_units({'0': 'IN', '1': 'MM'}[match.group(1)])