From 146634f75def45ea3c1e4dc4527eed5e93ed4aa0 Mon Sep 17 00:00:00 2001 From: bancika Date: Mon, 25 Apr 2016 15:00:25 +0200 Subject: [PATCH] improved potentiometer symbol --- .../diylc-core/.classpath | 2 +- .../diylc-core/library/main.jar | Bin 288660 -> 290420 bytes .../diylc-library/.classpath | 2 +- .../passive/PotentiometerSymbol.java | 65 +++++++++++++++--- .../AbstractTransistorSymbol.java | 30 ++++++-- .../semiconductors/SymbolFlipping.java | 9 ++- .../diylc-swing/.classpath | 2 +- .../diylc-swing/DIYLCStarter.launch | 1 + .../diylc-swing/library/main.jar | Bin 288660 -> 290420 bytes .../diylc-swing/update.xml | 16 +++++ 10 files changed, 105 insertions(+), 22 deletions(-) diff --git a/ diy-layout-creator --username bancika@gmail.com/diylc-core/.classpath b/ diy-layout-creator --username bancika@gmail.com/diylc-core/.classpath index c0ec8be1..1d2aca0d 100644 --- a/ diy-layout-creator --username bancika@gmail.com/diylc-core/.classpath +++ b/ diy-layout-creator --username bancika@gmail.com/diylc-core/.classpath @@ -8,6 +8,6 @@ - + diff --git a/ diy-layout-creator --username bancika@gmail.com/diylc-core/library/main.jar b/ diy-layout-creator --username bancika@gmail.com/diylc-core/library/main.jar index 7c39bd34d0a3be44c415c58a20a4b645550b22ad..e439b308bfe8a3c021f3cc4feb0c1389053f63f9 100644 GIT binary patch delta 11849 zcmZX4cOcdO_y1jHM#v`FGb6G`$jX+P>^(9fTQ`xt*R>1T+2e|=tWeoPBqTGltc>6F zy7$w&zCZum<2)YcJkN7KpRe;w9whlWLqe#f3Wec=K)4_fw|9C1AqSKT^&=X=iuzFo z{q+Y!$*vFW`2OQx5Wllt@RNwZ{7{s6k}OyR`1J=%0l&>)IgFky)ewx6bRB{Z{4Wl< zNrK}4Qvf}JL>j_K@OL;#t==!YBzB0s}qY% zC=CQa>uO1!yP!h)#*NSph5#r_EzyJzIo?J6_Hf`z*h#nAZXm?uVdS+F>zC2aSAW=1 z0OlECZp}!P^HMB?b|i#0$-Ipe83h9m12m)=4wwiC6zPT!-b3qb3BjxAqLUFJ2t}0b zCJfqUk2YpbM{HWhBOzoKx$tHXQ6f5eBdxrK<6h1W=2adbWuYO&`leFwb4A@ zd*Em?K-cmBJcrgjcLVdHc|#sxaS8w>j0E3BqgK&iUbIE>bMQ1UypZmdU^=u#d<_^q z{E(?{z(K%3MAGzvb_AVOL$Hw*GhjvH zi+O`QSO=qf7TLH9j=%!ikteDw>*x{)WK5Iv;t4Hc`xXQjA*cbnhDt zrMA68{c+Z0Ad%UwUC{qvX77#vvywq9Y#3zR>wz3k#@gWlSDrx>Br8jeaqSh3ocL) zhFO@8)LiO&Q|<6QQLL=aGR1f5Q6hKKB9)V5dc*x`TK$OTnUBt?sXQL>vYc)QPgCZs z?N>LA(gHNhMw5=4GT&eMMXvF%K~^*J>PUDc)zbUO9Kn99(3MEIjZ227bZEZ6EtX44 zBH5ew4`$WYT@oaPtnW)5oFuoBW(g~ju>WFpF|}3p-V$u-@<`5k+K1DFea=4IsOMGG z=tL`K=hhlVMB~xb_iT3-r_4*%?CUP!Cj-g4H_M^(%7F(jZOfY$l8PifCj-WNt^3Tr zOnka4R`z~K`1H4s-#XmCr4xU@*vmnXN`6e2Ik){OiC|wc-mn)H;4L&{h>OBHx zF84W=1uw|IC6WJKphuc~m^Dw8ypr&6>fxgio>5Av`*&%CHP`${zOA^FN4vAz(Q;SV zjEXVYwA=<8J3+jTNLD?MOO5NCbuwv8@<=1Tdm<=#jCEDm48FlxcdzSAIs5#|SseX# z{lT71aB`=K2ZAI0=vo%zjRwA0vM#Z2jl$j@3fkfpl?K<$(yRAoQU{%653bopxlZX> za7l;akO$~@FK_#jn_V8D++hvvnO@W1u?bMjyX0Fz-t+GS#r+y zU^{k0>OR8$*02D(6IR|Wk7k-LlZRT_xx=>vOg`TjO_ePw9*6Jv1do$Q5y@t2sLN!k z#6=etvQx$WsGKDIl&zO3(HHHm(4{=1s*#@*Th;Txd*Ti)?TqJ}zB_jfd5xR`Ch`VX zt};;0azuqvMDIiGuu??okM2G;Qw)EzA#z408`dyEOWE2Vp0v2I$l=qEERY@6DcW1T zW=cLfytG+eE#MBXEAE^H#inka-txh>Tu}29G+fmvIN8a=w{5zSl|Or_1j~%nNLa0Q z0ug68NVi#Zsb*lkkSH&1^fz<>-j z4hNNof90Qjr8LAX6d3q(K4iI#f%vFZ?wn=L6DRcQN+4MRTqcyXWp|6Q6qpDslBCw00dk7aMe+@Zu1{H)KX?rV$kXk)wTXV@SZT7t-Ks`c4DZd~}$MU-(b z*U0!N(>rVyu6RCcfgIK+Pj!@UEWR;!snvw<(ChT84#Tje*<_+xUM7+vN`(8#!HCRK zJIvDO=|~0>74O?F_EnwdU3>!1B+`1C(>idJ{XvAksR>E>iZ#Cq2s{fHm)CulkL|9n z#+?`Xj_D~?l<&66Rb7GGXEB$Y?R~;;FLSxI(6o1N;=w=d__^KGtZYnVzi9$*waA5PgzeR_ULl%iX(Tvv&jkon>&w zHa3M@(&NliEX_q%pF(_kec3R*Aq#R(LoE7+D5A4^hHOT!@876zNX8|A=#_9+X2(87 zGUN5VQS4lYPZLcaujEY2`kSTg<4Z}btf+D<@G8S3t{*r12)}x7&72{blu~!7rawVr zR}(oQnH1xwWLuN*>d{cCeFU{xI*&@WzC!{}mxQKbhbi9vuz6)4Se}e@w<B}5y%Wf+u_CnRIk zHIREZeq2f(WqPd9_Ha%%;^v6v7gOT9d@ zZ|+}Fc)g+(tRX&@JxWw>JKa&_)+dWyyQj4XHvglBj>?H^Y zSuO#=9EPCMkS_F*q5l>n1${WtXMaWmN8J@XNP)wNxekm7nW_lM#{~{Pl9~|Ap^4fI zav6Ot;jxE+(We%EPlyIu7ZeClMtgn_hj^opPl~}1%mMC6D5Mjki-gQj0-jm(AV1L- zbOn$_bS$8`O5V#@AQ0arAePG=5MsoMJ`5KrQwHJ20?uDYuPY>Xh(Ms9*FYdS1jzt| z{ep27USM>|+<4sg?6J{E%C~hTy5)J6P?ndn4U9x=Y3A(UHmfztYAZJg%cqh0Kr$oJ z#H_AlgXV_1IveB9DZ?(@$!wf~F;uT$9LZ9u&DDer)#Wx$NH5y;h6;bA$-Vva^y1yjn;WJfehXYV%O@cFluFH15mk7Iu6%fg0b`$ zOY2?OJJow)NADP3fKmi+tlrQ)EJ-Xq(N*XER@9?Xg{TBNZbh*&@?pQ7;@&Bo_Vk(km`SfB8QJfRNSgd!DNe<+p%E( za{p7p#ef=a3frSn>{rENLLw3lY(3F^@bE-Y3d?+2XTP(LpxF}YD6Clzm7bL}wL(%w zj+?3cc`Dp}{GTP6%tS5d*k{P^Csy)VblJVqswrrm^|dlFqR8iDwrOB++l*teRC=#f zid)&1`MRnkjD0FNHa)^iTa@2MAx0VTKu^=LC(EWqUqZVV_VKBH$tbkvWx4`qCfo&& zOh4sHmKHTve2UwVLb8Q-%!dLd=Tq57B%V+B#9X*<8#ZT^@)$L0iM=h1S{t0MHH+4sSu|fqo%vuh&GK&A8gG$hgpvD)@U&;-X_g{a zg{I2nRRnB^D!uV|JCbi`zTD@mpOAptUrJ_Xw&bEcPFg74@0%`2dM!^X=KN-8SeCis zL?{0`m%$tL{BjzT5^b%{Iz_@PHL>~P^ZU+K4uaz;lx`s@9cQ7WBz6j&Y{mr>?ycOy z?8Nx$n3{6kz9 zlYY3XXO#W&HtsU#YYH|Y7xt2AbNLb>J!Bj?(pLQ$oq$B%aCBJ}m4Sp9m1^?`DGP4a zgH8=v5i-v1>**F%OxmPNT5 zTBZ2wi9a9|K5_OnQMFaM&v0VI0S^z6e)Np1WDG`oNB6n43*2Vtb-4~T*~-U>U_uQ& zd~UgG>D~>}jVIcSJlJcx98=K};QW9W;k1YKyN(MH>Ot^9Of8ZneKYW%2+D%UN=U#+8cptp0^=#|)c66@W!4KW>a zAf7EARu_MyRit4uR<0eV(ZX{T{;PVX4sm?5$%v}OqzFti<`5qGsLTF#k+JopQoeZ1 z@Z;>BRsC!is~`4qp-|C+MHXUDtvV}y+0ZyRHYBCYFPe$E$lM3%1=$B zzIG+AN-vt}hcR&zmsK5kJUCU)&gu2D>$csEDIs7dlr`1OQ5F?e?Dusi+T zuS|MBz7;R31f-sx%00+dbYAvtGS2s2@g$z*ru1b%;AL-8{yM~->U*4XHMHv2$bF%? zqMDBTd5_FxTFjrfKdSd+Z%;uvd9GqsmFQ7QuwRz^+Uxbp_9^dTtEyfN0u!zu6e3*Jv_-UxZ~# z)U?G#J1ryW$uU}PhGZ!tiPL0_Hrn&yaj)~8xD)zaN1vq+J6gkN)B{g18at*~;Ccgx z9pUkKGh>%xOYSv?vnwGld3YJWe=Iq`UDp|&9sOJlH{TeV{BpJ0_?iU`+(KfV#4D8} zfOXfQB!E-uebp?lZI+6i@)tdq{dyK+18^w-RyPw5rOX1UZ1nWItt~?39`&Mr$LdZrz^y@F{paKzzX6d3_y=PZf zRyL?b$0Q_$*j!&d4dwf+(8Z!M2BXg`C9A1U>1DVV8MP}}MV}}iDrp%|lJ-NLw4zgf z!)x>7e057e*v6!7vi#1P&UFJ4j--+9yM+&q9)38T4mjX)-f~jyco6pi9=~)Z_CEfj z&8&}oQjKE`;&*2!VrZZVOPw~`9@WgOW@L65kcfUu;j z{18HYby10Ge)0zKR$kQV7Q9Vpm`{P!-NCM!>v4nbOcTYQd~(^WWJD@vb`9S@+{1!fCkFpm zE70m%Snyf9E=WDUT;WgV(jomza85khk|5;tWa+Kw$%xbLG~a{LjMv@p`Kjv<$}?Vv z>FvFo_EtSFwRJJ^eT@8hPqNZBW9IUnPe_|IHbdo;gr3?LJv5(~`e|DD+NHGj-w@c? z%~NN)EtgBFt}FP^QogwUwl@h*0?z5D%oQw&6uh&RFX>`S)GnO5_~6yJejQWzto|5l%<5AB=%JejO$L!%e>HqaJ4?(oW|aom3# z;;6yYKH7hm!|c|BOfMRP37N=a4@13LKd{q?;cwEl>3~PALKA%zZ9CM5({+X7*JFOY z*-x#P3??jZ-Kc3DpG)hpc@R`H@i6GMjWNYlBgxQXIt`bD(e3hfLDgRPdTsAILucU{ zbYIcPOFsMZl~U*Hb_KkyqnY|CGCoAK9?1;v870$t*v@cy%=b8jgi@A-M;h}=N-2y- zCZ~13_XpX*9upb(jo=ni=kjVzBr4`VnGuUO4qAg;&B@GI`zci6c&~lj!P#oSWU=bL zO;F6~C3|T?Gm`?t+65tDc=F^gUUPqAg}WwLw2eLE`h9O#H|UBcl|~xB3+eBT?UEll z-Y+5#FK86@ckJb~R~7w~{r2Wy{-Xt+3d%7duZfvmqMP}jTnXKN?Dcc* z>n-?G@4SidpC>uFR6{ zszz7e?Wa5}4p%*XYG=Jrg7a%?&YRv@l=dS!7)5St9P@rrnCom_#qo)A;{LMSgumro zzrgqjCcV;xLtF+5AafEG8Zhh$9x}us#A6Zj@vr6oUS-?tYn^G&MawWt=Wn zg=%k2RKpDtKQ6iXeYD08XLDZYTA9B)gQVe7M#rfS$dsVD!RGL)7kqqxEbZv(qw#kV zX~E~b2tSU8$I7oy4zWU0776{b?oRu^sI91+tf^{f3qE*w%`Nl2u58{a$K?zBm~n0SDF);G+AbAPO5 z?t~0QJ@+2+W#K#W6ZD+f4H-1o+?nk=_bK^cQ>ga+*Lymzk>ij&czvhz^Q4m0^0WBq zN=?AvVoP@{s#I7PRe_(+ zuN|)tP{NbtVjB3Vp9N6q&UdI^FCxLir?mR=;%Q!VuIATK>YHA>JpE0S zLq9x|1$|=|KBo6)dn70E#HngKd=!lg8|Uyy6w6#@&ml-3O`jbsetOCxok?P++4HC+ zMtw$;C!O)d3p2|T%H5FN?;*RT`idckbhO=t;~Cl?mb{MJU6+R8ZcFx!44AZoyUmDlunhaBD_ zR#uPyQeKZg&0z8k({_h92Gr;EHqq>-Ik?sD6v_=bp5HD0#K$#eRH4oqvMcuNSbPy~ zMVa=At>Z+ zXMaqaX)0$%<3A`0do{?sI+*Ztk#%3mQipx#GqsMY-$VGqSZ!-ajx?{?RF`K`KWrmp zFdv>rA@aPl9fCb*x#FP9XMX5le~HSM=1j1kO_lcz9=F)%F*^4Wk9lwM!8t2r>Jj%j z@jqVzkcO?0IP_h6tsPPZq?wRu?;!SQ9drP)gqGGnK!mY?+d0c9E! zZJCpyQwkTCa-_%>;Q>bWnxiVl(U4#I~F6NCz(-L&3> zwgbsJWRN(Nhzf|)#%BAwBr01cOz`L10kT&IYK9GXA2LHY#nu1GJ(s1Uz}@ICP#)Sa0^~QR5RSnyTiJI;#5{jxn^y$weE4bKwvv)YyHGksMrHJ~~?e&G|&B(V$aLs1(<&{LXM{ z@F%FVgd21F2N04fM=9T%i*i)@xsq@;{C0%+FcYblFj6r?GU|rd-M1Omj1MzyhgYnH z8=A_-11jE!bV$tD6-$!cqfTiv=cu2?AvnuXXX(7BNiAmhzUM|@cW=gxbt&#f>8~XZ z4>d=Uwx}EYl}^%nGcr{qtMZ?vd8Lf0u&X~fPPTZI?6H&D#N)U^PEem<@>0$#Wf4AU z=(5quoR2N8XrHN_$G2Ca4w)fx$I%Ywa%9}hqqd~H9$F4JyP6ln)@h}~&N~({I2M5z zk3eLGU*&(oI3uE1=$~Pi{+?>h&VaC2N#`2@@!;SGE$Q!m^SICJro&qH1mlZ02wT?A z??5xz`rS-UL}Q-FP!Wm$qNi!VCuD$^iDbRyWeNZ@9_h(3XyxJB2SO!IwSPmlYK;pj zw@>Gl4*4z_vNh_oYi@_zC1HDE5gs?P9g*^q%D?_vVi~hRE8J_=Wn(^cl zSa`@g)KP?UdH%*YNO}h%QRmb}A*x$>g8k2QP@aQs_J4+eutA5Yfh&ssh=dvtE%wb5e&uhhj<%xd!!$^l_Iq$bKcz3Ux|`d_&Tl%x{l0qi zZhROTQ5Y1;Qtw2HDTlMXR-9UBI@jXp^!;29b-cAj&VoOszDu<4TzX3f>21PXd~}5~ zV;)~@o5qV^Hhn{{!}wP_zf9{*E=CgHFP?IZ^{V@2F6EN&qyS1h<^unlb9EEWL__1w z{2c;UW)?=LD!*c-QWaLj<(uOU!0|Wb^|nd5@lAuU1zT^r1T=KN(7B9t5Ks8PZ>a1A zaSOqN4=N)1W2vG1-9w1jX1#11)5f_M4>qqB7p0K_aH~6Zgc`Eo`E3NTKgBZf9=bRTB5<5iHIF@@fy|8OD)sZV3GX z3&lWc5 zZHy;dp`dsrTP=SE{bv>++l`?QA%qtnicc0x$oMEgpzjE+NC+L`i5ZLu8E6U>L+8?8 zdqREDIem_wg=YseAP`a<{hR7eev4h0!9p(!|;$F z5}_QJ4Imkcqy$#vB{%6HLCrT}QXL}AK+&>;%b1Ozg%|2VV= zA2Apgpe_)D-2()OILrVL?*C6{5QiB88WIVZDIh$QfawFmfCL6&lf-D?{}U!9F=R0* zjF2IP;p|Dli~w^@X_!4AG)cou0D(pZBlyW+I1@6Mc=&I@EC5dOE!cfP*t-QY1_W(c zm>nQA%ff5`fmse_3kcD2Fl#{Alf!UKtaovWQ147Jgm=&6Q8|DNE777?) zPytiApd!o>fLq@dn5OGcftdjgneSlg z9()I;0cghVV8}A6m_|rfg=qoMhAO7dWz{g6WHp#B0IjQ`po`ITOC94UK^;@C19gl; zOASnwyEQO{vT9;N4bj9j%c>^K9GG2yJp?h(!t`O47K|1$C56bX}XaT^JS6!etjwJ^T+u22>t^ z@N`iS=qVaHhNId=OBWNn*#+eH3=LI;LdX$Sx-c>ztnW>+);3TO$Pe}0M*g3$>cao< z*$^Chm?j>0BBdEg2?DwBfj}bv@cp9y@UI}k^kBgACq$MWs%WE^XlN4k4^S!vzjsIu z>eLd8YLI_BN~;J>y;A@oM9Ao4Dxjf{@*-S*0Z}6URSD%@h;bKRLC3Ld&iB z*Al((a2lYT?soivND=X^5F$jN0jALC3p}I?jkg)m4Ke+uZis@i zKmG;98^YLu&S|=Uo(=y6UHgdYhB9ePS&T*~ymjJV92;Ra3PFuCBMb?CLCV_wi-fws zkn(7$f+1I+7f&V83Df`XG9b{+f7&7Ih8sdjQNfBrFFkuoJqo71wG^AyWX`BZaS|1v;w#pbr2eixJg;tdj zttGvWnTA~VQCdwdwDtk&AAlQmp`GAEYd_wHT?MpT7upTs3oSb$To6i#xMhL~MAHNX z8H%BypEsdbfc6FkAid7&r%u!`4!Z#Y@&D6Cw9;t)u?dV4p#FCw1A(Oeq4MZoP*nle ze>XD_Nc+|U;77Q0=yJ$+AzFCz4bKb zMcrxssUV{M50wbvS_#EQ5LjY5n${BKDq#SPn_9xquJV|u)q7D_X&ux%N7QQd=kH|@ zY~+GUg=imuQUgmHFp|Drc%hp517Ra*tzgtZR9gagPM=V-;}|tNg#I`JfnEmr&Hcrf zoPtvQHxJUSQ2z24{=&yl{(z#kFQBINzo396C^16Z8dD(^YZPv~cY#x)o)cps*nXfq zXQB2vz`W!FZa@7GesTb1M69U82pBK6LEGO1`H84+9eiZ}cdKy+!4Nx8)Oi+Va0zkA z7PCk@*`TJF8a{yW0t+hOXJ7Xk2L)^&=z9a)jc zO5=Oo*Q-x&@88cquj8D@8P9XibKLX1-^OY0_0v)s>!SfO1cC&CK-%9+q&$vBKtFQP ze9(^$;$MFNL|?w*F7_9H0Q|&vfKR4EilZU*Y`0_pyP{-evEdJOTA?MzV2!!Z? zb5K!^ARZEdG~6gy8y5>82Voe_kr+t@hlKMc zLvG@E7)s<4-t#>$0@Q+Z*8tFm5~&D^8USRtd>W)N9=J`1v|>Am6=x!X%)s;3#gI{S zFfUjQc??hGm_a24^TsTZCU~5v4Kj`%=DoOtoWk?6y^*4L+<-4qfeDsU#vsq)r7m$u zQM|^zY~&bRIyj#SBnMvOZZ#4O*Bmaj0eJ&Yv9%-3@KT>HWDON;PvAY$3JpJA*9rbt z;?xL4BM$;0fPcJa0Sercail8s!Gyr=tRV4E5?8l@j3$D!DI8mtu}6+T*s>+(gt3ER z&L|SF%nabdCG8^7aE;;80F($^8@LWiR1%)DXGRs`DI#vvW&C&okD-+4V54@70of0T z5C|PI5J`_@2gNM_Mv&4HpunbBO!(59GyI+i{am!fl$y#TBFIFm%g$BEWMZSNr|wZH zop|q}O`_LH(ABwyJrF0-8W`#m>fNStIy>dHWPV;k-|lo={AFbY<=yH0My|MpHLnZ9 zx|tGEA!|xgJ6W6c?inAHkyn?)HbDuq~YO2xvaBQ-2W&ESjh4Mz% z^n8jdDIv_OU2N)>!A{QKQ)~0wo|=o)^ zQ-WjEuk1>FR^}{Ipma@1kW9>g$%gdLZN_riELjtuCvO|PY$;wW8TMlZwLRWYOmOzy z`LvmLWN_L0R&ISEk$ULclB+U8c6Zp{KG2Rj@xD90Pk=Jf1smI)MRS8C__1hmUf%-6 zNX}-QZR+X;*9#^@Q4fR`*B{lE_8NKKlWw=4kYLMN9gshlYEc|fkKxRBSTMrgjqNKG z36c509e#pd->f;}aZtm>Q`o#Xz87sP4Ccl6G9#%;GW(4)@|rKRxpJ&#*LMv#kkYf} zSrDI;EMT|&B0KOUlJ$dq|4fzxy?Oli%A0<;X|uXx_QvWtxxKVI@5P;NsK1Vt%bVsq&6L||WttPNFkIs@%;-ICX54DX+QL#-I4z4cAo8~&^OR<2 zAQtK!_}zM<*-D=o9HB&+xmgz%)xH19Cv>YQq$VEoEKalfAzRFl;oemD{O4$D7KEFjQ2e7B{Z{^nz*gzz`llLd3`_03;t;#M|E6QwD5 z(|gKrw1|2-qFV_o#{Vkd>H5~x%9Gy%^M1-l6^%4WV*B}3d0yOgq+#R8%N<=+FK6Cg z=P2Kgj?E!98KWP&y`9LbezR`?sS;eAf5!24_#4Avz= zskQWW#IUlRHc66FL9UOkxKht`dZ}cmOy`%g$5-=Qe@hLqs2ZrAjM&Pd_Su%>xtsmE z3NiCpfit^jowtUWv$Spx$@nqc|8w7X)bn_y`^UdZURzo0DR4#hnRS##Urw4Yu{+*w zR%#qy)~RM~8pzmHJ!XAe0Q=_Jt!kmt7aDFd<|J{Q$vx3+%$@3w7_X28$>HL?Q9Ji%$T` z2!GTGPkOlV6A2yYpi`ar!Lf@Qbg}{HaOf};G2SiZO;jL$|BJeXBJ9AgZ=;$Cyg1Z2 zGrT8a3Q*th8urDgkN7|lQx&2#(4Hhl4hK5WhoS~a?EzL?VmXS92;M+T-0bUPDG`Ve zP6R>?G$}`kfuZ&Q6SmNbH1ytE+TZ;SQ){2PoplBfiRv->JX(1gBuL77QVsQ_q_CUB zq3?etg;u}6JTbvF@UHgVyNezkWlsx>U*y!*rkrP5fB3@FH6J^Ty}Di!s>na5uJ#Y} zhBNn3(&_x&v~SA)xNd0BWWN$9+!16Ak-ROg%=yZF-I_Z)xvHP|D^ciR!c~N06FC3z z1Y0AU2D*{I$B}wHV2WnLkakmqbw7aS%*?5weJ{jR^G@LodMfHV^_GC63dOAUZq?oF zj)gO~ei(H0-}<4p{S#aG?KBP7w`8PsRR&rPgF+qLr@I6B8>m zD_u(`b>A5)9ZXI0=lbVT^q63c+qm=)y`a>DYf1 ztNj=dQ~YD%g%TRA*P~g}5+|@4alfO$cIZfOky!etW&Y4Ag zq4$ok(Y`va6IV-tF~#<|^7&#+143WbS~1PUm0`F_Bxq?Eg(=*41@7Hpt{LjA^9ieT zk}dH$HAv_4DQ#HFvz@AkNkI<7tLf$#l~O6mPP#VG#n~X~+0NqPUy&ld&)*i+`{u3$ zhh@p?arQ~4&CNisfn?Simd|bOu6O%p{P^88q|^nECDslpeoDjYthbuBQAVt&OYO=Q z$IYcN8sfCxF=yLc4UT;smnbpvMJVg2&ij%3g9fCIXCeZfYqqFsm{+CFu4v9o-%b&q zb#AYo>`9aF3+@%ea3=X2u_?FMVQc;*9UJmQMyo`OJj0kV^Hxgbu5?#r_ZaMxof2ZUM|MJZ5{XLcX7!^0Ef8r(H4aBzt zR~?#7hX1*|#Nm84ZCP0R^P9Rlce|dZ$2|`;cD!Vgx^$(7%-1b0niZNn)skVOxYIZN zqm@_*TK4ypyzAmo)RySmk-QwrApR@~_NV`)Zyl9%<|=w>N5ul9y*J%v%bpxD$VW@I@ad zZ+8;LGr;r;(?gA3EiA_SK6l8gvCD14%L*=1yTtXu^-b#bLw7t^#v7~|bKmxzKZBiG zvm1PlIZ~Er5ML1Ivw7syQ=Hqlp0q6Y93lTfAQ1yU>#1r)7n;{e(G@e7u`at(4E&8N=OY>8ETEiR12=Y zcxWUjT$Ewrz&c%a35(I~MBO;sWgxELxApb)FE8t4 zu?9tY*_yLGxJOdU8$D(`SRmxj;WhuY-hDPN&uNsjQ(1laDz+`4LAUAY%Y=!(no{g} z@@(!?wfCou?aUt+39)v~Uu?rQwCvh`zUP1UE9=)jImecdLd`+g;QHs*FBuEn%`x(^ z_7>Ig*>!g9y>!dufm@XRRX4l!TT_LZweJd?PTR+H#Zlhhw{B^acd+7{H5{r`5i%FR@k$ys0riEB5slZD~8t zt>RT-r`P&M{wZDy&#|$WJ!5fp0bPy^t~0^ri>aPI!OG@I)a`qM^VTulgJsvBT8EV{ zqI0uf+Oepr>hY}+7j&75j985a7YLmd0i7Pcu;~pc_+cty=`cPi%t(au7fxQ0FOvB6 zoc;P55^dP7YWVcAU|o7>LQ~D~&q|sdiL1nc!DQbj@Bd;5HB8116iqMii{Iip$#{0a z+HBtB)|l(_xIn}M)^^Ev%N$Q;B~-?`&Dk)W8utf zk8ocw2j%LoBUmPKSFG&7H?AM6HooDht!iugKa4V+@0$I*ol{?~)}|;a z!dciuD<{0<_jVDK%MmOy)`@@z8DcY4KJ&!KaF+Z`C zJ!w{b!^3{noWjU`L9RzRsdf2STEF3nz;uN_r-^#pY}1lCGiRi1bIm7l3zfLq%y#dp zN=#L40B5q~55)(X*i)M_C(YjOuUwm~Qre2c{Nz=r9_6B1vY^@nETk@J5{bGN+lB|* z^>{r?wfEz+8Hm>(xZxEr_>ZUS!d!5+y+8HyO6GJQr3B3ArOWfvp(pwqlfyUUi06(q zEXQ(qIez2{jcH!bu8WjgFG-z3lUGJP*hM})A~6<5J9g8AZ5m75mQol0xK-|cWv5ya z6_;k9^G%0@Ykn$JrcC|$QR|`KmAwiaXK#J8ZAkkSpKf=;yQT~+cJ}lpZdT{<&;r=iYnqUVUV$CdiB#s!6;z@NsfW$7euKtk>qb`DN6;oL^xe zdb>F`*ph_Un@0H?R*J`cO6ePCkpI`lkR|<%Z?kiLO4qdbGPoqa2{wea3#~J-*3pVZ z^nIULb8@D1yvgi?Dr<^m?aP!qs}j9eAd?kg*=%^mw`*9YL8G~s%|VaNp=gH5%ZrC! z%>7NdfJDj6JFM@}uy^{&rnA4piihf>PYIlk5gk~MiSeSWc!d3D*n5AN;zh7mqHx@P z50Y8zlZDI22C|C2`R*-GE?HV>QrxZborU3yGldl&-jwzPrW$-m3kj_JWk)kBbM=zZ z0MT;#p2mR74r6DK|7pE%^K*4`TNxjfU%NLI-&}nrJ(}3h&b|@kl%IToNn}nn?SYZ` zoga+p4~)*-@^z4D$2#6=eYS5@RG}_1#TdJOM0$pXxI2Bcb+RY^Hxtp5PGmBAd0|>E zhvBiNm3(BZ{D@$?_vWI#aIcAr2=1IvKd&rP`o=0z(YHCnrOxyu$4Ny2Q=2PA->TWx z&PiyK2`}|V2dR5)-+g|5_jG1>jYMEwV-cp2*u96wEPqGh_db?fb#EglbeW8a<}xN+ zu6pds!)J=E?jcW9BTtAmr&xY2ziMmLM)lA9ag93}{dpFR$3-vX3EC-yKho=UXPxnB z!Y*7pIt{@s0jF~8)0%v_k8>?RZHh-Ul9@Upo0>T+ikiuvCrA5 z=QMg3J9jQtWs!F+F13g6wfL2G0iPqNk2Ta#C4OAYYWd_MHM)Vg$UnG=c%o~!jX-Iq z7-H;pJ$stZNjnLCkuBWrnN7Qx@SFMYTkG%Fs092gU}6iZ4DMFrRC-Y7@w|t9sCj%x znDJ2vW)^zkv?V*}MGK{lppM{r2T}WQGac9c4)uW@ex)qkK>ftOx|aSxO%uVqI24*5 z4L3ZaqzYe_LVe{NB7DR1;O!DOLWFL`yUQj)e}sGBxLa)K0l0^bv*Jc0@doXL&=L4| zRKC2|pPG&!5DOIlGQ%Q{p2Vx{$)Ydd4Z6vrU*RJ>u8gK)fuoVPK;Jt8N2Afw^6E4c zO$Pv0JVgtEijHVT?AfWyL&glhL@!w`DyXLQ&HRulMx7PXTdZy^yi%apu-G^MdF^Sd@%PHKuAwR~;!n3{++=Y% z5my(t4I(uruJmY$FFu$&^}=H~n&aY070HIacM0EI>}&jsE1rfX5PxFoPJLJ(>4o#} zpVj5Ruc3W3ZG6X)X&GC2PCoTzzqf}G?d2<%VzyPRrEgeuFQ0mT^lAaG>$79a^_Gf} zZ#})Tu0A<8O20RD@8vQO-o^8CHMwZ$3c6q1gXxQ~lK$~^4k54g*i_T1aQn#2-~IXL zC_{u~y)8A5q$gL%(FrB#h_|@gI^U&8_p3gYP$wZKdr|=wQSWNGUHk6 z`nMyByD!|{6T2(Qy%E-7@JeBIneh(BN8sDA-1!AM&2uCXSFVSAMClj*CINjCM&kFm z7m%4s6em7OvT-ly?D<-BjCkBOjMkw~JpRuuI>lX)JJA(QCvRt(nboO&rqDYt9Gjb~ zH`Phk<`<|i%W`pr;`6uu^9)^WDN<%$uBMYr|3vN1ojf$fbUYfpqf_sr6>&l5&=UB% zEO$lUz+ZDngrI{6ylZHE{2ba(Ltnx3ywlM*e5*#N1|5j!6+A`nFv69b)s6PXS3Kc=evov#9x;5{zN~9EkC^ujN)O|WPm$4 zJVmz6xQ;VHH;mutL7xH?J18ay908|20oqz7fQyXs;3CQ(UC*`{nnf(2cL9py06~qj z;sT!Gqh&Y-(BPvG;0FlTJ*0xbN%%qsR96J#4z66l>xzI1OuSMA#9(4W5s-liAtgZd zV7TBVB|sY{a7ut7Ob{yrrhi22V4yM}4F6Z83~0i{nlhjR6Y?s+nZLjy6$0?B3IWKe z3fRE%U{$~pCf@uZL{9@&Femyn-~bcLrvVF?P*)>}veXEioj-)JIsshuhoI9SU_3Mc zYgoNq12_*8lA3@$OeFmwHZ%zsBP~KaC0c+pjG@p5>|nw}8?c3M0*{ajoF@Z)bfLSW zIc>lI7E0*=ZZMIq17KhR&;?xadb)r+OuW@4V3hQLb1)}Q4{(ABB7MLG57q}fVB-BB zLfe24NSOg}5f-r+62=j3NHDnahht$xNCVD@5H-^oLZ*Gs5VR)G5V9z53^>9D(~SxF z*f$1@V2*(a0gN*t1p7BGWFE@vUpL3P!gCD%u^OIDCmCNh#rBEIArCR-vLwwMjdKX zA42(E!y9zBAtdI84dmt}_F%L}!50u0Ho%uS>hKZD>?)KT`9lWe!|~8Bw^5AXaa#bt zm?+yqR(vD>C*lWlYzgD2I1tIl{7=LH{#-h>mkVP070S7IUhWjLp}3DP^U^f)XyFef_>%ML%#GI z54eKhf<3?n8~E5DnQKpsKSqr=6xwFbk%$qf`8Xy8P!Wa|W3+SxWC8W|0YgM802yRG~h_G zgRqqx|KC#3lp3oQ`Bo+KSAiI$bp_y$KR{7eD9L^b ze`QC&Kvw|%^aG4LklivR$ogFYJ~*hqM{Wc{?ofI-tO;1?6wdJfr03ua^$#?d1gNeL z$5vyD22Y2eB|ruY03VA$VGQK@xC4Q`=87f;ON;u99_0%F4_pO#JgkQ8P-&V%tG?Kw zDB`-ounPeE5f}LC0;HTXga)~X(464@1%MUy|3!k-V+6|Qcc|nJ*EQ-r0Xs1ZC9Zx7 zO$*N)IFg`?kg*fve*u)#|EXhe-~ggFPk@knK>r<_-2@Mawa@5e6C@M#{TC6KwTWhd zXALZlJ`n5d{1u<@1jxZ&4}b@b7V6*UCqY#y2CWn)4h?m0?~o3DNznI%ti3@42hKpO zC%_9E`FoW8??SIkjfeg@+`?8;FF{7KSpO%X2GuVS9*E6>D1qZ&qRdMGGwkFX@w1Ef zpuE~cc@;ktY2ML);qCYVioXj|0NIZ9I- diff --git a/ diy-layout-creator --username bancika@gmail.com/diylc-library/.classpath b/ diy-layout-creator --username bancika@gmail.com/diylc-library/.classpath index 19090f8d..dc0adbd6 100644 --- a/ diy-layout-creator --username bancika@gmail.com/diylc-library/.classpath +++ b/ diy-layout-creator --username bancika@gmail.com/diylc-library/.classpath @@ -5,6 +5,6 @@ - + diff --git a/ diy-layout-creator --username bancika@gmail.com/diylc-library/src/org/diylc/components/passive/PotentiometerSymbol.java b/ diy-layout-creator --username bancika@gmail.com/diylc-library/src/org/diylc/components/passive/PotentiometerSymbol.java index 92c036bc..1eb69a46 100644 --- a/ diy-layout-creator --username bancika@gmail.com/diylc-library/src/org/diylc/components/passive/PotentiometerSymbol.java +++ b/ diy-layout-creator --username bancika@gmail.com/diylc-library/src/org/diylc/components/passive/PotentiometerSymbol.java @@ -1,18 +1,26 @@ package org.diylc.components.passive; +import java.awt.Color; +import java.awt.FontMetrics; import java.awt.Graphics2D; +import java.awt.Polygon; import java.awt.Shape; import java.awt.geom.GeneralPath; +import java.awt.geom.Rectangle2D; import org.diylc.core.IDIYComponent; import org.diylc.core.annotations.ComponentDescriptor; import org.diylc.components.semiconductors.AbstractTransistorSymbol; -@ComponentDescriptor(name = "Trimmer Symbol", author = "MCbx", category = "Schematics", instanceNamePrefix = " VR", description = "Trimmer (potentiometer) symbol", stretchable = false, zOrder = IDIYComponent.COMPONENT, rotatable = true) +@ComponentDescriptor(name = "Potentiometer Symbol", author = "MCbx", category = "Schematics", instanceNamePrefix = " VR", description = "Potentiometer symbol", stretchable = false, zOrder = IDIYComponent.COMPONENT, rotatable = true) public class PotentiometerSymbol extends AbstractTransistorSymbol { private static final long serialVersionUID = 1L; + public PotentiometerSymbol() { + this.color = Color.blue; + } + public Shape[] getBody() { if (body == null) { body = new Shape[3]; @@ -41,30 +49,65 @@ public class PotentiometerSymbol extends AbstractTransistorSymbol { 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 / 4, y); - polyline.lineTo(x + pinSpacing * 2 - 2 * pinSpacing / 3, y - pinSpacing / 2); - polyline.moveTo(x + pinSpacing * 2 - pinSpacing / 4, y); - polyline.lineTo(x + pinSpacing * 2 - 2 * pinSpacing / 3, y + pinSpacing / 2); - - body[0] = polyline; - polyline = new GeneralPath(); + polyline.lineTo(x + pinSpacing * 2 - pinSpacing / 2, y); body[1] = polyline; + polyline = new GeneralPath(); + + 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; } return body; } + @Override + protected int getLabelX(Rectangle2D shapeRect, Rectangle2D textRect, FontMetrics fontMetrics, boolean outlineMode) { + int pinSpacing = (int) PIN_SPACING.convertToPixels(); + if (controlPoints[0].x < controlPoints[1].x && controlPoints[0].x < controlPoints[2].x) + return controlPoints[1].x + pinSpacing / 3; + if (controlPoints[0].y < controlPoints[1].y && controlPoints[0].y < controlPoints[2].y) + return controlPoints[0].x - (int) (textRect.getWidth() / 2); + if (controlPoints[0].x > controlPoints[1].x && controlPoints[0].x > controlPoints[2].x) + return controlPoints[1].x - pinSpacing / 2 - (int)textRect.getWidth(); + if (controlPoints[0].y > controlPoints[1].y && controlPoints[0].y > controlPoints[2].y) + return controlPoints[0].x - (int) (textRect.getWidth() / 2); + return 2 * ((int) (shapeRect.getWidth() - textRect.getWidth()) / 2 + (int) shapeRect.getX()); + } + + @Override + protected int getLabelY(Rectangle2D shapeRect, Rectangle2D textRect, FontMetrics fontMetrics, boolean outlineMode) { + int pinSpacing = (int) PIN_SPACING.convertToPixels(); + if (controlPoints[0].x < controlPoints[1].x && controlPoints[0].x < controlPoints[2].x) + return controlPoints[0].y; + if (controlPoints[0].y < controlPoints[1].y && controlPoints[0].y < controlPoints[2].y) + return controlPoints[1].y + pinSpacing * 2 / 3; + if (controlPoints[0].x > controlPoints[1].x && controlPoints[0].x > controlPoints[2].x) + return controlPoints[0].y; + if (controlPoints[0].y > controlPoints[1].y && controlPoints[0].y > controlPoints[2].y) + return controlPoints[1].y - pinSpacing * 2 / 3; + return 2 * ((int) (shapeRect.getHeight() - textRect.getHeight()) / 2 + fontMetrics.getAscent() + + (int) shapeRect.getY()); + } + @Override public void drawIcon(Graphics2D g2d, int width, int height) { g2d.rotate(-Math.PI / 4, width / 2, height / 2); - g2d.setColor(COLOR); + g2d.setColor(Color.blue); g2d.drawLine(0, height / 2, 4, height / 2); g2d.drawLine(width - 4, height / 2, width, height / 2); g2d.drawPolyline(new int[] { 4, 6, 10, 14, 18, 22, 26, 28 }, new int[] { height / 2, height / 2 + 2, height / 2 - 2, height / 2 + 2, height / 2 - 2, height / 2 + 2, height / 2 - 2, height / 2 }, 8); - g2d.drawPolyline(new int[] { width / 2, width / 2 - 2, width / 2 - 4, width / 2 + 2, width / 2 - 2 }, - new int[] { height, height / 2 + 2, height / 2 + 6, height / 2 + 6, height / 2 + 2 }, 5); + + g2d.drawPolyline(new int[] { width / 2, width / 2 - 2 }, new int[] { height, height / 2 + 2 }, 2); + + g2d.fill(new Polygon(new int[] { width / 2 - 4, width / 2 + 2, width / 2 - 2 }, + new int[] { height / 2 + 6, height / 2 + 6, height / 2 + 2 }, 3)); } } \ No newline at end of file diff --git a/ diy-layout-creator --username bancika@gmail.com/diylc-library/src/org/diylc/components/semiconductors/AbstractTransistorSymbol.java b/ diy-layout-creator --username bancika@gmail.com/diylc-library/src/org/diylc/components/semiconductors/AbstractTransistorSymbol.java index f7d718e4..d09a6476 100644 --- a/ diy-layout-creator --username bancika@gmail.com/diylc-library/src/org/diylc/components/semiconductors/AbstractTransistorSymbol.java +++ b/ diy-layout-creator --username bancika@gmail.com/diylc-library/src/org/diylc/components/semiconductors/AbstractTransistorSymbol.java @@ -1,10 +1,13 @@ package org.diylc.components.semiconductors; import java.awt.Color; +import java.awt.FontMetrics; import java.awt.Graphics2D; import java.awt.Point; +import java.awt.Rectangle; import java.awt.Shape; import java.awt.geom.AffineTransform; +import java.awt.geom.Rectangle2D; import org.diylc.appframework.miscutils.ConfigurationManager; import org.diylc.common.Display; @@ -35,7 +38,7 @@ public abstract class AbstractTransistorSymbol extends AbstractComponent protected Point[] controlPoints = new Point[] { new Point(0, 0), new Point(0, 0), new Point(0, 0) }; protected Color color = COLOR; - protected SymbolFlipping flipping = FLIPPING; + protected SymbolFlipping flip = FLIPPING; protected Display display = Display.NAME; transient protected Shape[] body; @@ -90,7 +93,7 @@ public abstract class AbstractTransistorSymbol extends AbstractComponent AffineTransform old = g2d.getTransform(); g2d.rotate(Math.toRadians(rotation),controlPoints[0].x,controlPoints[0].y); - if (this.flipping==SymbolFlipping.Y){ + if (this.flip==SymbolFlipping.Y){ g2d.translate(0,controlPoints[0].y); g2d.scale(1, -1); g2d.translate(0, -1*controlPoints[0].y); @@ -129,8 +132,13 @@ public abstract class AbstractTransistorSymbol extends AbstractComponent if (display==Display.BOTH) { label=getName()+" "+(getValue() == null ? "" : getValue().toString()); } + + FontMetrics fontMetrics = g2d.getFontMetrics(); + Rectangle2D textRect = fontMetrics.getStringBounds(label, g2d); + Rectangle shapeRect = body[0].getBounds().union(body[1].getBounds()).union(body[2].getBounds()); + drawCenteredText(g2d, label, - x + pinSpacing * 2, y, HorizontalAlignment.LEFT, VerticalAlignment.CENTER); + getLabelX(shapeRect, textRect, fontMetrics, outlineMode), getLabelY(shapeRect, textRect, fontMetrics, outlineMode), HorizontalAlignment.LEFT, VerticalAlignment.CENTER); } @Override @@ -142,6 +150,14 @@ public abstract class AbstractTransistorSymbol extends AbstractComponent public int getControlPointCount() { return controlPoints.length; } + + protected int getLabelX(Rectangle2D shapeRect, Rectangle2D textRect, FontMetrics fontMetrics, boolean outlineMode) { + return controlPoints[0].x + (int) PIN_SPACING.convertToPixels() * 2; + } + + protected int getLabelY(Rectangle2D shapeRect, Rectangle2D textRect, FontMetrics fontMetrics, boolean outlineMode) { + return controlPoints[0].y; + } private void updateControlPoints() { int pinSpacing = (int) PIN_SPACING.convertToPixels(); @@ -185,12 +201,12 @@ public abstract class AbstractTransistorSymbol extends AbstractComponent } @EditableProperty - public SymbolFlipping getFlipping() { - return flipping; + public SymbolFlipping getFlip() { + return flip; } - public void setFlipping(SymbolFlipping flipping) { - this.flipping = flipping; + public void setFlip(SymbolFlipping flip) { + this.flip = flip; } @EditableProperty diff --git a/ diy-layout-creator --username bancika@gmail.com/diylc-library/src/org/diylc/components/semiconductors/SymbolFlipping.java b/ diy-layout-creator --username bancika@gmail.com/diylc-library/src/org/diylc/components/semiconductors/SymbolFlipping.java index 1b77e82a..d4b146a5 100644 --- a/ diy-layout-creator --username bancika@gmail.com/diylc-library/src/org/diylc/components/semiconductors/SymbolFlipping.java +++ b/ diy-layout-creator --username bancika@gmail.com/diylc-library/src/org/diylc/components/semiconductors/SymbolFlipping.java @@ -6,6 +6,13 @@ public enum SymbolFlipping { @Override public String toString() { - return name(); + switch (this) { + case Y: + return "Y-axis"; + case NONE: + return "None"; + default: + return name(); + } } } \ No newline at end of file diff --git a/ diy-layout-creator --username bancika@gmail.com/diylc-swing/.classpath b/ diy-layout-creator --username bancika@gmail.com/diylc-swing/.classpath index b7926aca..46ccb2bb 100644 --- a/ diy-layout-creator --username bancika@gmail.com/diylc-swing/.classpath +++ b/ diy-layout-creator --username bancika@gmail.com/diylc-swing/.classpath @@ -15,6 +15,6 @@ - + diff --git a/ diy-layout-creator --username bancika@gmail.com/diylc-swing/DIYLCStarter.launch b/ diy-layout-creator --username bancika@gmail.com/diylc-swing/DIYLCStarter.launch index 23679b63..8a6de7d1 100644 --- a/ diy-layout-creator --username bancika@gmail.com/diylc-swing/DIYLCStarter.launch +++ b/ diy-layout-creator --username bancika@gmail.com/diylc-swing/DIYLCStarter.launch @@ -9,6 +9,7 @@ + diff --git a/ diy-layout-creator --username bancika@gmail.com/diylc-swing/library/main.jar b/ diy-layout-creator --username bancika@gmail.com/diylc-swing/library/main.jar index 7c39bd34d0a3be44c415c58a20a4b645550b22ad..e439b308bfe8a3c021f3cc4feb0c1389053f63f9 100644 GIT binary patch delta 11849 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 diff --git a/ diy-layout-creator --username bancika@gmail.com/diylc-swing/update.xml b/ diy-layout-creator --username bancika@gmail.com/diylc-swing/update.xml index eef1fd35..57ea2952 100644 --- a/ diy-layout-creator --username bancika@gmail.com/diylc-swing/update.xml +++ b/ diy-layout-creator --username bancika@gmail.com/diylc-swing/update.xml @@ -1296,6 +1296,22 @@ http://code.google.com/p/diy-layout-creator/downloads/list + + + + 3 + 30 + 0 + + 2016-04-25 20:00:00.000 CET + + + + IMPROVEMENT + Improved potentiometer symbol appearance + + + http://code.google.com/p/diy-layout-creator/downloads/list \ No newline at end of file