From 1ccf4b38c6e7bdfdc0d12e201982be8aaa836a4a Mon Sep 17 00:00:00 2001
From: Marius Stanciu <marius.adrian@gmail.com>
Date: Mon, 10 Jan 2022 17:36:50 +0200
Subject: [PATCH] - fixed and error in the Isolation Plugin when using the pad
 multi-isolations and area isolation simultaneously

---
 CHANGELOG.md                                     |   1 +
 appPlugins/ToolIsolation.py                      |   5 +++--
 assets/resources/dark_resources/set_colors64.png | Bin 0 -> 944 bytes
 assets/resources/set_colors64.png                | Bin 0 -> 944 bytes
 4 files changed, 4 insertions(+), 2 deletions(-)
 create mode 100644 assets/resources/dark_resources/set_colors64.png
 create mode 100644 assets/resources/set_colors64.png

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 64f238e6..03fb56aa 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -10,6 +10,7 @@ CHANGELOG for FlatCAM beta
 10.01.2022
 
 - added a new feature in Preferences -> Gerber: a Layer Color Manager where the user can set and edit predefined colors for the Gerber objects: loading order matter
+- fixed and error in the Isolation Plugin when using the pad multi-isolations and area isolation simultaneously
 
 9.01.2022
 
diff --git a/appPlugins/ToolIsolation.py b/appPlugins/ToolIsolation.py
index 85e075d9..9842eb2a 100644
--- a/appPlugins/ToolIsolation.py
+++ b/appPlugins/ToolIsolation.py
@@ -2218,8 +2218,9 @@ class ToolIsolation(AppTool, Gerber):
                 extra_geo = []
                 for apid in self.grb_obj.tools:
                     for t_geo_dict in self.grb_obj.tools[apid]['geometry']:
-                        if isinstance(t_geo_dict['follow'], Point):
-                            extra_geo.append(t_geo_dict['solid'])
+                        if 'follow' in t_geo_dict:
+                            if isinstance(t_geo_dict['follow'], Point):
+                                extra_geo.append(t_geo_dict['solid'])
 
                 for nr_pass in range(passes, extra_passes + passes):
                     pad_pass_geo = []
diff --git a/assets/resources/dark_resources/set_colors64.png b/assets/resources/dark_resources/set_colors64.png
new file mode 100644
index 0000000000000000000000000000000000000000..fcc10dc7e795ddde91066330d77562bbc25c3e28
GIT binary patch
literal 944
zcmV;h15f;kP)<h;3K|Lk000e1NJLTq002M$002M;1^@s6s%dfF000AbNkl<Zc%1Fn
zO-K}B7zgl)Km-pJxJ7M=6hRi9BIwXzXAos)cLNDwb=oMq+NB^7#T}7~=mQrE7dqIX
zj1Uzezlz8XUBXSvATcO9MH{nu2uf}D>7e`R?(DoDGw-DDAD-h5^Z&ii%q}YkJUl!+
zJUl!s()XpZRCwtsWqlu(B=ol2ABs32cZ4x{{fx>1*7r*-p@<`zuedHidSa~aA3Hto
zc1e204FasrxYxzH4^l!A$BL2ih5=URFY8{0Vzf90!0OmJsO7N$?1~VI>>RQTVB9mr
zy6?K+l*b0J+ZN!KCjzh&!lniwDNhVw2LukVnE^r($6e+CW1b$C07T{K05IHw%p%|B
z4+4Cu(w$dx6-5CmCb~g>rs>X!$v5@@7@FNvv~;1#1t?a!(3Fq2u>k;4!7iUUxW%(3
zs9A>qqVgO>1wd2)76{5O9D?|i01$S<smbre0BiHY?DFwcc~JrAtidXu_^=P+Q$h*=
z!cJ%%nZPUGn*{)JP>Y*WUQ(8_$|naE;N$*O`Ah%^JK_A;9LedYN7a^Tm%o*_JO)5!
z`CI@9JLv!fHIRd`8}tAQl@}F&nWNa{^8p|sjOqbUdNJyjN7#bI^fto)Bad4MPoEM3
z2*MUa0P}~jPQMU<p)HuS0>DUl16z=IzZ)6g+VB(N(<eqi0+9X4r>_T~y9Heq0D#M1
zi3A`j01r-@5AYDJyd2cPr^YHU0F-5908s&WdfYsK0rc`~Ux`cT06687bJ3T6{%0K6
z0KEhE(&f8x%VRzUL;x8t#`x>4*Z`mVs*zuK_5u(UfVSE{xB$Ouo2Zm$3vk5)(C!9k
zcSGXQ-r@i)$5Nk-x|=ruz=gULK;F^$>~P@z1^|#0YyfY^52gT()DSQMXqES<F+VZ@
z)h%EQfK{F<K(h}SVEXh`8vsZRlIdGu^67ikpDt_ws$0-z9AHH{%l`CJ0IqY}P2B=B
zUw+pYcMt;zf*^pD^KUTjxEqQBG_@?y0-*cvFtshX<ShvB)pOZCt8XeotGo{2cQwP`
z{Y(&&UyY&yvvr;SNBK0unSLq=k^;VtD4p_ZtlyII*$_kkgURd2sy1l*Q`ZZKjkgUK
zuMSidx{kYR@qqCY*X~%^5jjv3D1#&QC8XD>SD~clCX~^*CmtRi9v&W^to#ERAYqf~
S$8CE60000<MNUMnLSTXd^`;*H

literal 0
HcmV?d00001

diff --git a/assets/resources/set_colors64.png b/assets/resources/set_colors64.png
new file mode 100644
index 0000000000000000000000000000000000000000..fcc10dc7e795ddde91066330d77562bbc25c3e28
GIT binary patch
literal 944
zcmV;h15f;kP)<h;3K|Lk000e1NJLTq002M$002M;1^@s6s%dfF000AbNkl<Zc%1Fn
zO-K}B7zgl)Km-pJxJ7M=6hRi9BIwXzXAos)cLNDwb=oMq+NB^7#T}7~=mQrE7dqIX
zj1Uzezlz8XUBXSvATcO9MH{nu2uf}D>7e`R?(DoDGw-DDAD-h5^Z&ii%q}YkJUl!+
zJUl!s()XpZRCwtsWqlu(B=ol2ABs32cZ4x{{fx>1*7r*-p@<`zuedHidSa~aA3Hto
zc1e204FasrxYxzH4^l!A$BL2ih5=URFY8{0Vzf90!0OmJsO7N$?1~VI>>RQTVB9mr
zy6?K+l*b0J+ZN!KCjzh&!lniwDNhVw2LukVnE^r($6e+CW1b$C07T{K05IHw%p%|B
z4+4Cu(w$dx6-5CmCb~g>rs>X!$v5@@7@FNvv~;1#1t?a!(3Fq2u>k;4!7iUUxW%(3
zs9A>qqVgO>1wd2)76{5O9D?|i01$S<smbre0BiHY?DFwcc~JrAtidXu_^=P+Q$h*=
z!cJ%%nZPUGn*{)JP>Y*WUQ(8_$|naE;N$*O`Ah%^JK_A;9LedYN7a^Tm%o*_JO)5!
z`CI@9JLv!fHIRd`8}tAQl@}F&nWNa{^8p|sjOqbUdNJyjN7#bI^fto)Bad4MPoEM3
z2*MUa0P}~jPQMU<p)HuS0>DUl16z=IzZ)6g+VB(N(<eqi0+9X4r>_T~y9Heq0D#M1
zi3A`j01r-@5AYDJyd2cPr^YHU0F-5908s&WdfYsK0rc`~Ux`cT06687bJ3T6{%0K6
z0KEhE(&f8x%VRzUL;x8t#`x>4*Z`mVs*zuK_5u(UfVSE{xB$Ouo2Zm$3vk5)(C!9k
zcSGXQ-r@i)$5Nk-x|=ruz=gULK;F^$>~P@z1^|#0YyfY^52gT()DSQMXqES<F+VZ@
z)h%EQfK{F<K(h}SVEXh`8vsZRlIdGu^67ikpDt_ws$0-z9AHH{%l`CJ0IqY}P2B=B
zUw+pYcMt;zf*^pD^KUTjxEqQBG_@?y0-*cvFtshX<ShvB)pOZCt8XeotGo{2cQwP`
z{Y(&&UyY&yvvr;SNBK0unSLq=k^;VtD4p_ZtlyII*$_kkgURd2sy1l*Q`ZZKjkgUK
zuMSidx{kYR@qqCY*X~%^5jjv3D1#&QC8XD>SD~clCX~^*CmtRi9v&W^to#ERAYqf~
S$8CE60000<MNUMnLSTXd^`;*H

literal 0
HcmV?d00001