Просмотр исходного кода

- fixed an issue in Gerber parser with detecting old kind of units

Marius Stanciu 6 лет назад
Родитель
Сommit
c9111dac9b
3 измененных файлов с 6 добавлено и 4 удалено
  1. 1 0
      README.md
  2. 4 4
      camlib.py
  3. 1 0
      flatcamParsers/ParseGerber.py

+ 1 - 0
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
 

+ 4 - 4
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

+ 1 - 0
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)])