From 42ca1926e1c2857641e5671601fc8542069be22d Mon Sep 17 00:00:00 2001 From: Branislav Stojkovic Date: Thu, 10 Jan 2019 19:53:34 +0100 Subject: [PATCH] fix 3-legged symbols --- diylc/diylc-library/lib/diylc-core.jar | Bin 251094 -> 251094 bytes .../diylc/components/Abstract3LegSymbol.java | 1 - .../passive/PotentiometerSymbol.java | 67 +++++++++--------- diylc/diylc-swing/lib/diylc-core.jar | Bin 251094 -> 251094 bytes diylc/diylc-swing/library/main.jar | Bin 479869 -> 479840 bytes 5 files changed, 33 insertions(+), 35 deletions(-) diff --git a/diylc/diylc-library/lib/diylc-core.jar b/diylc/diylc-library/lib/diylc-core.jar index b95dba76e8f757b6364923d949100517977e9804..ff45ff41284d5ac6512c6ba4ce682d7e95fea354 100644 GIT binary patch delta 4316 zcmYjUdsvUz7H;pIRFnv%k|H9PaY>n&+$NK#Np58{h{CvK9?qQcxD_Ho^($YAZb~X$ zfAp17q$rXkG6y+sc@A+*OwU1bzO~l($Nb}c*Sptkuf6y8%e~BA_cD9+^qwPh4Rv(% zb#zh^qk4|u$%#?UUCO^2XJ!N7$A$rfFh>BHjRt6C;{XQm$pDM^NPs=u86bpNY2H3J z{##;2Z08tfE5?A!Jc1BGIfV;|?}aPC1l_R!fx4p<&}wueIpEOl<=sGj(epXL4Wmv_ zYmKinz*rMIUBJ@5VQA0npN~<0nQum1W9cSfJcEOh=V76L>%Z6g-zs7NkW`Abv-s&F{7Phb?q{}c3-Ze6QQd~F)`EL zbK8o3p6)9V3q9VzNVF;5!!WLPz768*MYQ>oev`0H^OEi8ztF$GG5Bv-*9+~P8-mgQ zU2sZI&^0^sP*2!35AkitLsQV}Vmr{TiZjC@KRRKLwqDY4%%7UksZkMid4GlD7Gy7@AJ~5CyvxK4Cs?WlqHF>iUtA-rXBomefLW>Ez49Vq`zDg1x z3(VNR;h1G7J9ZkETI^XLVFcH_mrsgcyRxA-(zr3qTDBa?4A5iP7&a7%=QvgIb!0}U ztafGtba5IV2e$UHR)Pm`Dc_5mNuIevU(T7#hGW_0?^v-3l#TLYaTqz$haEyvypVlG zpAuj88I_`?tP08Ylq_KQYGU0EV@bQVg}?U=c& zx0!7~kF8r+GzJ^|#-^b%XB+#Biu(?hjO5iWHWyy2JSmKYQ##X7i|Oe~x@0NOi_iNz4IB!*RA9h{P80A@b%#_AAOSQW!oUxhtJT zpc0X(?qz8X%R)uJfc=H(ziOE~DzjzggUZPgHUba3<{}%26IP@|3w^)V6ju(*U+!@tIZ9)?W^e_wZA;zCfBDq-=d>spu}} zd}XUKu)p9HNSgJyDUvn=j_*;PWyI&Bl3>DjAhGDnS0UML#%+gIKk(%^nf0^z7JA0rs{5PoQ$Fr{nUrUtTwM1`VJtOS@IF$48}BK#Tk!AY zt)6@|#;1AlOw9PB56?%U9BwR5r4WDZ{ z;uyEZGhR;1^!@H4y@f`kN{f zg7Cn8A`nTPnFyT?iuVdJ13!H+8-yM@p9mK87|gebYWNYAAO9}?z^Dt`#Xsk>3Hfh2!5s(x`)k>km@q!h^yC*1HZ0FF>zD z)JfzaF$L`ULt+u&un6%pV3>-n5n?geQx6Moz$g`;9Tp40b~!?M!;T0~u586J%-|D#1clw()#mQ>TldJseUj!9w`;Pxcp2iTlM^RZ19aFeC=$+Uhh znf7IvLh=47G|%%X)VEnGo$JO_+GkBF&BOi_ z{7O{YAe-tf&8EECY`UlXEX~8?EWMA&vve<>s_2+Qar<*9Z*z{A3H!3jRX#BauFR$T zlb=iR9V$-Aqr7`ntjnYOYo1SW%ks%TUB%b=^q3tB$ZvN6#n%+jxtSJH{go zi%j{-WV&B^#gxypnDp3Uiho*6=ipRA=M+&w>rEx(Z+U_I)?A=>TBO>dl=6C(lAcgX zanDMr{)95>GqjBQzfnf#WPOqLz3C$5EmLiya*FdWr?|7_lSSVfoMOBE&csHUc(t7*8c)$};su8N-^Z|YUD*)@8U{?|kR=$EgF z6@Yd%WFM%ZkJkGd5d`{Awe(T0t|h$Udmz3l*o;k)BXTKNcVA z==+@I^SW-`q?QFeR3cBGf>Nn^X#g*P7zupaWxT{o@RW!U!y1$C~ oDvCzxdqE@B&26MZ`qW65$^8!5F?VR5PwvnhCpJ-BSd;MnKQ>FfUH||9 delta 4316 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 { this.body = getBody(); applyOrientation(this.body); } - Shape[] body = getBody(); AffineTransform old = g2d.getTransform(); diff --git a/diylc/diylc-library/src/org/diylc/components/passive/PotentiometerSymbol.java b/diylc/diylc-library/src/org/diylc/components/passive/PotentiometerSymbol.java index 9ce0f0b0..661aa908 100644 --- a/diylc/diylc-library/src/org/diylc/components/passive/PotentiometerSymbol.java +++ b/diylc/diylc-library/src/org/diylc/components/passive/PotentiometerSymbol.java @@ -47,44 +47,43 @@ public class PotentiometerSymbol extends Abstract3LegSymbol { } public Shape[] getBody() { - if (body == null) { - body = new Shape[3]; - int x = controlPoints[0].x; - int y = controlPoints[0].y; - int pinSpacing = (int) PIN_SPACING.convertToPixels(); + Shape[] body = new Shape[3]; + int x = controlPoints[0].x; + int y = controlPoints[0].y; + int pinSpacing = (int) PIN_SPACING.convertToPixels(); - GeneralPath polyline = new GeneralPath(); - polyline.moveTo(x + pinSpacing * 2, y - pinSpacing * 2); - polyline.lineTo(x + pinSpacing * 2, y - pinSpacing * 2 + pinSpacing / 2); - polyline.lineTo(x + pinSpacing * 2 - pinSpacing / 4, (y - pinSpacing * 2) + pinSpacing / 2 + pinSpacing / 4); - polyline.lineTo(x + pinSpacing * 2 + pinSpacing / 4, (y - pinSpacing * 2) + 2 * pinSpacing / 2); - polyline.lineTo(x + pinSpacing * 2 - pinSpacing / 4, (y - pinSpacing * 2) + 3 * pinSpacing / 2 - pinSpacing / 8); - polyline.lineTo(x + pinSpacing * 2 + pinSpacing / 4, (y - pinSpacing * 2) + 4 * pinSpacing / 2 - pinSpacing / 4); - polyline.lineTo(x + pinSpacing * 2 - pinSpacing / 4, (y - pinSpacing * 2) + 5 * pinSpacing / 2 - pinSpacing / 3 - - pinSpacing / 16); - polyline.lineTo(x + pinSpacing * 2 + pinSpacing / 4, (y - pinSpacing * 2) + 6 * pinSpacing / 2 - pinSpacing / 2 - + pinSpacing / 16); - polyline.lineTo(x + pinSpacing * 2 - pinSpacing / 4, (y - pinSpacing * 2) + 7 * pinSpacing / 2 - pinSpacing / 2 - - pinSpacing / 16); - polyline.lineTo(x + pinSpacing * 2 + pinSpacing / 4, (y - pinSpacing * 2) + 7 * pinSpacing / 2 - pinSpacing / 2 - + pinSpacing / 4); - polyline.lineTo(x + pinSpacing * 2, (y - pinSpacing * 2) + 7 * pinSpacing / 2); - polyline.lineTo(x + pinSpacing * 2, y + pinSpacing * 2); - polyline.moveTo(x, y); - polyline.lineTo(x + pinSpacing * 2 - pinSpacing / 2, y); + GeneralPath polyline = new GeneralPath(); + polyline.moveTo(x + pinSpacing * 2, y - pinSpacing * 2); + polyline.lineTo(x + pinSpacing * 2, y - pinSpacing * 2 + pinSpacing / 2); + polyline.lineTo(x + pinSpacing * 2 - pinSpacing / 4, (y - pinSpacing * 2) + pinSpacing / 2 + pinSpacing / 4); + polyline.lineTo(x + pinSpacing * 2 + pinSpacing / 4, (y - pinSpacing * 2) + 2 * pinSpacing / 2); + polyline.lineTo(x + pinSpacing * 2 - pinSpacing / 4, (y - pinSpacing * 2) + 3 * pinSpacing / 2 - pinSpacing / 8); + polyline.lineTo(x + pinSpacing * 2 + pinSpacing / 4, (y - pinSpacing * 2) + 4 * pinSpacing / 2 - pinSpacing / 4); + polyline.lineTo(x + pinSpacing * 2 - pinSpacing / 4, (y - pinSpacing * 2) + 5 * pinSpacing / 2 - pinSpacing / 3 + - pinSpacing / 16); + polyline.lineTo(x + pinSpacing * 2 + pinSpacing / 4, (y - pinSpacing * 2) + 6 * pinSpacing / 2 - pinSpacing / 2 + + pinSpacing / 16); + polyline.lineTo(x + pinSpacing * 2 - pinSpacing / 4, (y - pinSpacing * 2) + 7 * pinSpacing / 2 - pinSpacing / 2 + - pinSpacing / 16); + polyline.lineTo(x + pinSpacing * 2 + pinSpacing / 4, (y - pinSpacing * 2) + 7 * pinSpacing / 2 - pinSpacing / 2 + + pinSpacing / 4); + polyline.lineTo(x + pinSpacing * 2, (y - pinSpacing * 2) + 7 * pinSpacing / 2); + polyline.lineTo(x + pinSpacing * 2, y + pinSpacing * 2); + polyline.moveTo(x, y); + polyline.lineTo(x + pinSpacing * 2 - pinSpacing / 2, y); - body[1] = polyline; - polyline = new GeneralPath(); + body[1] = polyline; + polyline = new GeneralPath(); - body[0] = polyline; + body[0] = polyline; - polyline = new GeneralPath(); - polyline.moveTo(x + pinSpacing * 2 - pinSpacing / 3, y); - polyline.lineTo(x + pinSpacing * 2 - pinSpacing * 2 / 3, y - pinSpacing / 3); - polyline.lineTo(x + pinSpacing * 2 - pinSpacing * 2 / 3, y + pinSpacing / 3); - polyline.lineTo(x + pinSpacing * 2 - pinSpacing / 3, y); - body[2] = polyline; - } + polyline = new GeneralPath(); + polyline.moveTo(x + pinSpacing * 2 - pinSpacing / 3, y); + polyline.lineTo(x + pinSpacing * 2 - pinSpacing * 2 / 3, y - pinSpacing / 3); + polyline.lineTo(x + pinSpacing * 2 - pinSpacing * 2 / 3, y + pinSpacing / 3); + polyline.lineTo(x + pinSpacing * 2 - pinSpacing / 3, y); + body[2] = polyline; + return body; } diff --git a/diylc/diylc-swing/lib/diylc-core.jar b/diylc/diylc-swing/lib/diylc-core.jar index a93dfaa598ae608e77ad641217ad2e5736782677..ff45ff41284d5ac6512c6ba4ce682d7e95fea354 100644 GIT binary patch delta 4316 zcmYjUdsvUz7H;pIRFnv%k|H9PaY>n&+$NK#Np58{h{CvK9?qQcxD_Ho^($YAZb~X$ zfAp17q$rXkG6y+sc@A+*OwU1bzO~l($Nb}c*Sptkuf6y8%e~BA_cD9+^qwPh4Rv(% zb#zh^qk4|u$%#?UUCO^2XJ!N7$A$rfFh>BHjRt6C;{XQm$pDM^NPs=u86bpNY2H3J z{##;2Z08tfE5?A!Jc1BGIfV;|?}aPC1l_R!fx4p<&}wueIpEOl<=sGj(epXL4Wmv_ zYmKinz*rMIUBJ@5VQA0npN~<0nQum1W9cSfJcEOh=V76L>%Z6g-zs7NkW`Abv-s&F{7Phb?q{}c3-Ze6QQd~F)`EL zbK8o3p6)9V3q9VzNVF;5!!WLPz768*MYQ>oev`0H^OEi8ztF$GG5Bv-*9+~P8-mgQ zU2sZI&^0^sP*2!35AkitLsQV}Vmr{TiZjC@KRRKLwqDY4%%7UksZkMid4GlD7Gy7@AJ~5CyvxK4Cs?WlqHF>iUtA-rXBomefLW>Ez49Vq`zDg1x z3(VNR;h1G7J9ZkETI^XLVFcH_mrsgcyRxA-(zr3qTDBa?4A5iP7&a7%=QvgIb!0}U ztafGtba5IV2e$UHR)Pm`Dc_5mNuIevU(T7#hGW_0?^v-3l#TLYaTqz$haEyvypVlG zpAuj88I_`?tP08Ylq_KQYGU0EV@bQVg}?U=c& zx0!7~kF8r+GzJ^|#-^b%XB+#Biu(?hjO5iWHWyy2JSmKYQ##X7i|Oe~x@0NOi_iNz4IB!*RA9h{P80A@b%#_AAOSQW!oUxhtJT zpc0X(?qz8X%R)uJfc=H(ziOE~DzjzggUZPgHUba3<{}%26IP@|3w^)V6ju(*U+!@tIZ9)?W^e_wZA;zCfBDq-=d>spu}} zd}XUKu)p9HNSgJyDUvn=j_*;PWyI&Bl3>DjAhGDnS0UML#%+gIKk(%^nf0^z7JA0rs{5PoQ$Fr{nUrUtTwM1`VJtOS@IF$48}BK#Tk!AY zt)6@|#;1AlOw9PB56?%U9BwR5r4WDZ{ z;uyEZGhR;1^!@H4y@f`kN{f zg7Cn8A`nTPnFyT?iuVdJ13!H+8-yM@p9mK87|gebYWNYAAO9}?z^Dt`#Xsk>3Hfh2!5s(x`)k>km@q!h^yC*1HZ0FF>zD z)JfzaF$L`ULt+u&un6%pV3>-n5n?geQx6Moz$g`;9Tp40b~!?M!;T0~u586J%-|D#1clw()#mQ>TldJseUj!9w`;Pxcp2iTlM^RZ19aFeC=$+Uhh znf7IvLh=47G|%%X)VEnGo$JO_+GkBF&BOi_ z{7O{YAe-tf&8EECY`UlXEX~8?EWMA&vve<>s_2+Qar<*9Z*z{A3H!3jRX#BauFR$T zlb=iR9V$-Aqr7`ntjnYOYo1SW%ks%TUB%b=^q3tB$ZvN6#n%+jxtSJH{go zi%j{-WV&B^#gxypnDp3Uiho*6=ipRA=M+&w>rEx(Z+U_I)?A=>TBO>dl=6C(lAcgX zanDMr{)95>GqjBQzfnf#WPOqLz3C$5EmLiya*FdWr?|7_lSSVfoMOBE&csHUc(t7*8c)$};su8N-^Z|YUD*)@8U{?|kR=$EgF z6@Yd%WFM%ZkJkGd5d`{Awe(T0t|h$Udmz3l*o;k)BXTKNcVA z==+@I^SW-`q?QFeR3cBGf>Nn^X#g*P7zupaWxT{o@RW!U!y1$C~ oDvCzxdqE@B&26MZ`qW65$^8!5F?VR5PwvnhCpJ-BSd;MnKQ>FfUH||9 delta 4316 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 diff --git a/diylc/diylc-swing/library/main.jar b/diylc/diylc-swing/library/main.jar index 4c1b40c078f356c3baabd2a99068fb78986d3ebb..b62710ff7068912fa0fb5c1508843a216405b5e9 100644 GIT binary patch delta 15543 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 QgRrqZq($MwgMAA3f8$9@hyVZp delta 15505 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 J9PlCC{{TFgG`9c%