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

- changed the Jump To icon and reverted some changes to the parseGerber and ParseExcellon classes

Marius Stanciu 6 лет назад
Родитель
Сommit
1a841e3fdc
5 измененных файлов с 3 добавлено и 44 удалено
  1. 1 0
      README.md
  2. 1 20
      flatcamParsers/ParseExcellon.py
  3. 1 24
      flatcamParsers/ParseGerber.py
  4. BIN
      share/jump_to16.png
  5. BIN
      share/jump_to32.png

+ 1 - 0
README.md

@@ -19,6 +19,7 @@ CAD program, and create G-Code for Isolation routing.
 - moved the ApertureMacro class from camlib to ParseGerber file
 - moved the ApertureMacro class from camlib to ParseGerber file
 - moved back the ApertureMacro class to camlib for now and made some import changes in the new ParseGerber and ParseExcellon classes
 - moved back the ApertureMacro class to camlib for now and made some import changes in the new ParseGerber and ParseExcellon classes
 - some changes to the tests - perhaps I will try adding a few tests in the future
 - some changes to the tests - perhaps I will try adding a few tests in the future
+- changed the Jump To icon and reverted some changes to the parseGerber and ParseExcellon classes
 
 
 5.10.2019
 5.10.2019
 
 

+ 1 - 20
flatcamParsers/ParseExcellon.py

@@ -1,32 +1,13 @@
-from camlib import Geometry
-import FlatCAMApp
+from camlib import *
 
 
 import FlatCAMTranslation as fcTranslate
 import FlatCAMTranslation as fcTranslate
 
 
-from shapely.geometry import Polygon, Point, LineString, MultiPolygon
-from shapely.ops import cascaded_union
-import shapely.affinity as affinity
-
-import re
-import traceback
 import gettext
 import gettext
 import builtins
 import builtins
-import numpy as np
-from numpy import Inf
-
-import logging
 
 
 if '_' not in builtins.__dict__:
 if '_' not in builtins.__dict__:
     _ = gettext.gettext
     _ = gettext.gettext
 
 
-log = logging.getLogger('base2')
-log.setLevel(logging.DEBUG)
-
-formatter = logging.Formatter('[%(levelname)s] %(message)s')
-handler = logging.StreamHandler()
-handler.setFormatter(formatter)
-log.addHandler(handler)
-
 
 
 class Excellon(Geometry):
 class Excellon(Geometry):
     """
     """

+ 1 - 24
flatcamParsers/ParseGerber.py

@@ -1,35 +1,12 @@
-from camlib import Geometry, ApertureMacro, parse_gerber_number, arc, arctan2, arc_angle
-import FlatCAMApp
+from camlib import *
 import FlatCAMTranslation as fcTranslate
 import FlatCAMTranslation as fcTranslate
 
 
-from shapely.geometry import Polygon, Point, LineString, MultiPolygon
-from shapely.ops import cascaded_union
-import shapely.affinity as affinity
-from shapely.geometry import box as shply_box
-import re
-import traceback
-from copy import deepcopy
-
 import gettext
 import gettext
 import builtins
 import builtins
 
 
-import numpy as np
-from numpy import Inf
-from math import sqrt, pi, sin, cos
-import sys
-
-import logging
-
 if '_' not in builtins.__dict__:
 if '_' not in builtins.__dict__:
     _ = gettext.gettext
     _ = gettext.gettext
 
 
-log = logging.getLogger('base2')
-log.setLevel(logging.DEBUG)
-
-formatter = logging.Formatter('[%(levelname)s] %(message)s')
-handler = logging.StreamHandler()
-handler.setFormatter(formatter)
-log.addHandler(handler)
 
 
 class Gerber(Geometry):
 class Gerber(Geometry):
     """
     """

BIN
share/jump_to16.png


BIN
share/jump_to32.png