diff --git a/README.md b/README.md index 8f97cbd1..dc4e576c 100644 --- a/README.md +++ b/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 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 +- changed the Jump To icon and reverted some changes to the parseGerber and ParseExcellon classes 5.10.2019 diff --git a/flatcamParsers/ParseExcellon.py b/flatcamParsers/ParseExcellon.py index 457150be..ba00a476 100644 --- a/flatcamParsers/ParseExcellon.py +++ b/flatcamParsers/ParseExcellon.py @@ -1,32 +1,13 @@ -from camlib import Geometry -import FlatCAMApp +from camlib import * 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 builtins -import numpy as np -from numpy import Inf - -import logging if '_' not in builtins.__dict__: _ = 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): """ diff --git a/flatcamParsers/ParseGerber.py b/flatcamParsers/ParseGerber.py index 0012bf11..ef7c3cbd 100644 --- a/flatcamParsers/ParseGerber.py +++ b/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 -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 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__: _ = 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): """ diff --git a/share/jump_to16.png b/share/jump_to16.png index 24bddf37..079dfa68 100644 Binary files a/share/jump_to16.png and b/share/jump_to16.png differ diff --git a/share/jump_to32.png b/share/jump_to32.png index 5912ae2b..8ceeb4a5 100644 Binary files a/share/jump_to32.png and b/share/jump_to32.png differ