From 1a841e3fdc8de094424d7b64e0773ae284fdcc77 Mon Sep 17 00:00:00 2001
From: Marius Stanciu <marius.adrian@gmail.com>
Date: Sun, 6 Oct 2019 16:37:45 +0300
Subject: [PATCH] - changed the Jump To icon and reverted some changes to the
 parseGerber and ParseExcellon classes

---
 README.md                       |   1 +
 flatcamParsers/ParseExcellon.py |  21 +--------------------
 flatcamParsers/ParseGerber.py   |  25 +------------------------
 share/jump_to16.png             | Bin 489 -> 423 bytes
 share/jump_to32.png             | Bin 629 -> 684 bytes
 5 files changed, 3 insertions(+), 44 deletions(-)

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 24bddf3788ed4d337de706e895a8ea4ec1f6bff1..079dfa68640cd40b373739c976c2e44ab8aa030c 100644
GIT binary patch
literal 423
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbKJV{wqX6XVU3I`u#fXMsm#F#`kN
z5fEmas?8@26zmP~32_C|g9p57H~s;1jebdxUoZoA`SDxZ!Wl&`|6k0sF<<4KHG9$h
zh|a45DW&_Q#9c1v%YVp@+39p9PJ|~Q<Zk>!p+0+{)(TG-$B>FSwSAm?O%4JqADMIo
zLRbW!et7op|L2%ZtMxcHPWD``J#(I6PoVFz%|8!q*;l!9(e$@92c$H^Q~Awq&*iUX
zW#VX+RhaaEW8((lIsY3~&K@{Z|DfpY`#W2v?mofq{k~#fSCIbFRnlzXN4l!k<lW9=
cSTf-=+l}oU_07EYYe0eN>FVdQ&MBb@0N9&oegFUf

delta 453
zcmZ3^{E~TsWDpAj1H;x|=C6PhOS+@4BLl<6e(pbstU$g(vPY0F14ES>14Ba#1H&(%
zP{RubhEf9thF1v;3|2E37{m+a><Y92N-!mPySp$jtm;)Zny4pH&tBr`>&pI^i&ezT
znkgva5m3c;PZ!4!jq_8_+h#d23LN<u-!wr$w@F}6!(Laft)KZeZV_c-oIOWT`~<6z
z2bZ)oxBdghBgdRJa!p)5L3mB8KEM6EmNRD7XXMMK)vtJQ^TwGA&E1!OoO4O}{Ops2
z#G9jvHnPV;6?3k{zT`|StmoL$`eD+pl>&JaW3?JpO7A~NlebtMykOB%o>^Iy2e$5$
z`f=q1^EA23xlc^@AKuNcV)ZEI<hrHn^fjI^*}q#`{#t*+jO3|`ulL_OzlC*$nqgRc
z?X7J<Kd6?tMwFx^mZVxG7o`Fz1|tJQOI<?)T?5k)BLgc_6Dw0oZ36?V3<HDywu)L5
z9l7}_nQ4`{bQl=?yM5pwP=h4Mis1aTlJdl&REF~Ma=pyF?Be9af>gcyqV(DCY@~pS
O7(8A5T-G@yGywp*Af%=M

diff --git a/share/jump_to32.png b/share/jump_to32.png
index 5912ae2b81b8235bfa0e453623abed88a7767389..8ceeb4a5fa35b2e60261e6b5d33a3f5da76c8ffe 100644
GIT binary patch
literal 684
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dyjKx9jPK-BC>eK@{oCO|{#S9F5
zM?jcysy3fAQ1EkrPlzj!9%&$=z3m~;&w(XDe!&cC6^nMQpWw}@vF-o!T;{-UI|YOP
z9_LW`G-Jibe}A+UR;x=^{aVEs`t+Fa?hpOCFY8Q_XP#bX{@ax4fZ{3ExG$>9lLQ{x
zi5XaSd$D<Zeb7AjYnXZ@(D1LGE{-7;bIwk>9>ruR(CR)R?ZtwUm$6HAWT)Pn{r<m6
zp4!i_O)BMa1$jkj=jNw;ddu`@y`0W9_t|$Jh8$U^e(1@!iqxIw{driMwpVKSto!mO
z>6~()l13WaBO4Euo3pA!Kb!1UnA{q(Pr>?7^Vy`%Uq-*YJQ>#9=-IHS%hi|R)t0Zv
zy31MYSQyMrD=xY$C_U~Fec6hm#B{AX^QZdzi|r>c9-hc(^3=FT*yjJAAfBIRKb;Ku
z*(J$T{MA_8d+&xurUn0BYq?5gH}r-xy*MqFF#V3PzGb77g-mI&mGDhb9!JggB|I}q
nR=)manDn{M(I!|iymrfe4F;v49#`Q`P>S+&^>bP0l+XkK#k{ru

delta 594
zcmZ3(`jusZWDpAj1H;YYP4z&ECEd~2k%3`jKlh(RRv=#?*(1o8fuTx`fuW&=f#DZW
zsNn?zL#Y7+!>a@a2CEqi4B`cIb_Lo1C76=D-CY<MR`n_yP1KX9XD{*eb!C6d#VTT^
z_}^e5P$i?Yr;B5V$ML(9cY85AinQ537R?cH^wDaqaI`)+<(lGLw%a06&sl?hFzsuY
z+S<FQb*{#u2-h!?IYI)QVw;kbj?LIu;CYV6c=lZurHW;i#s5CnTc5evxWBKFA-B<Y
z+RTMso!WUnI+)@f$t+!4pZ<xbZEJpj@tggxC!I9-rgJ}Rw^QNq2=(eo=F4Lj-gwVq
zVa6lpn|nV&^@QDO+5b~q75o~jZWuptecUPWY1#^VR^I;sCTgZjHKwdAvrJ=nwD!#7
zz~FbT^9q=cMc-V$a8Fmw72Xb+{|p8qi_+UgHfU+F#x*eK8r5xC9xM2En|b}mqqE*-
zn>qAEb0=J{i;-q{_JQX&^Wi{-376lzKeJo!3~Pfj<BhWWJERR9Pllgsa(l*hz=~Hy
zblGm!19HAb7i<$+wnTP))4sm*1#bf9XWf|KubYe3zo<LP?<Vsksz7YVMqrSumbgZg
zq$HN4S|t~y0x1R~14Bz)Ljzp{)6x(l11nP#D`R7A0|P4qgSRvFwxH<9%}>cpt3=X)
zreV&JX&gWek{~OB^V3So6N^$A%FE03GV`*FlM@S4_413-XTP(N0xDwgboFyt=akR{
E0JEs!$^ZZW