From 7caadec1ec969458807cd0b7e2392287a4aa3933 Mon Sep 17 00:00:00 2001 From: Branislav Stojkovic Date: Thu, 10 Jan 2019 18:44:23 +0100 Subject: [PATCH] Added "Label Orientation" property to leaded components that can be used to force labels to be rendered horizontally instead of following component placement direction --- .../components/AbstractLeadedComponent.java | 34 +++++++++++++++--- diylc/diylc-library/lib/diylc-core.jar | Bin 250191 -> 251094 bytes .../diylc/components/passive/Resistor.java | 2 +- diylc/diylc-swing/lib/diylc-core.jar | Bin 250191 -> 251094 bytes diylc/diylc-swing/library/main.jar | Bin 479726 -> 479799 bytes diylc/diylc-swing/update.xml | 4 +++ 6 files changed, 34 insertions(+), 6 deletions(-) diff --git a/diylc/diylc-core/src/org/diylc/components/AbstractLeadedComponent.java b/diylc/diylc-core/src/org/diylc/components/AbstractLeadedComponent.java index 9dd8c536..3e5a49cc 100644 --- a/diylc/diylc-core/src/org/diylc/components/AbstractLeadedComponent.java +++ b/diylc/diylc-core/src/org/diylc/components/AbstractLeadedComponent.java @@ -71,6 +71,7 @@ public abstract class AbstractLeadedComponent extends AbstractTransparentComp protected Color leadColor = LEAD_COLOR; protected Display display = Display.NAME; private boolean flipStanding = false; + private LabelOriantation labelOriantation = LabelOriantation.Directional; protected AbstractLeadedComponent() { super(); @@ -235,9 +236,17 @@ public abstract class AbstractLeadedComponent extends AbstractTransparentComp g2d.rotate(Math.PI, length / 2, width / 2); offset = -offset; } - g2d.drawString(label, (int) (length - textRect.getWidth()) / 2 + offset, - calculateLabelYCoordinate(shapeRect, textRect, fontMetrics)); - g2d.setTransform(oldTransform); + if (getLabelOriantation() == LabelOriantation.Horizontal) { + g2d.setTransform(oldTransform); + double x = (points[0].x + points[1].x - length) / 2.0; + double y = (points[0].y + points[1].y - width) / 2.0; + g2d.drawString(label, (int) (x + (length - textRect.getWidth()) / 2 + offset), + (int)(y + calculateLabelYCoordinate(shapeRect, textRect, fontMetrics))); + } else { + g2d.drawString(label, (int) (length - textRect.getWidth()) / 2 + offset, + calculateLabelYCoordinate(shapeRect, textRect, fontMetrics)); + g2d.setTransform(oldTransform); + } } } @@ -367,7 +376,7 @@ public abstract class AbstractLeadedComponent extends AbstractTransparentComp : getLeadColor(); } - @EditableProperty(name = "Lead color") + @EditableProperty(name = "Lead Color") public Color getLeadColor() { if (leadColor == null) { leadColor = LEAD_COLOR_ICON; @@ -457,7 +466,7 @@ public abstract class AbstractLeadedComponent extends AbstractTransparentComp this.display = display; } - @EditableProperty(name = "Label color") + @EditableProperty(name = "Label Color") public Color getLabelColor() { return labelColor; } @@ -465,6 +474,17 @@ public abstract class AbstractLeadedComponent extends AbstractTransparentComp public void setLabelColor(Color labelColor) { this.labelColor = labelColor; } + + @EditableProperty(name = "Label Orientation") + public LabelOriantation getLabelOriantation() { + if (labelOriantation == null) + labelOriantation = LabelOriantation.Directional; + return labelOriantation; + } + + public void setLabelOriantation(LabelOriantation labelOriantation) { + this.labelOriantation = labelOriantation; + } /** * Override this method with @EditableProperty annotation in child classes where standing mode is @@ -479,4 +499,8 @@ public abstract class AbstractLeadedComponent extends AbstractTransparentComp public void setFlipStanding(boolean flipStanding) { this.flipStanding = flipStanding; } + + public enum LabelOriantation { + Directional, Horizontal + } } diff --git a/diylc/diylc-library/lib/diylc-core.jar b/diylc/diylc-library/lib/diylc-core.jar index a68e7f96c51ef14588104bbab18664820cad13bf..b95dba76e8f757b6364923d949100517977e9804 100644 GIT binary patch delta 14252 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 delta 13451 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
fAkq9?iH%oJ5uPKs@9?466`qu?E8*`6!Bj? z%H}2zcs^r)^+J5u6rhoCm;~Rgj4rVn@yLh>1LkX~^6Jy@LDqnxr9SpTID70r3pCrcOMK|Un{8$ou^1*1-$PnN^`3Uy1g+^jvuN(ooZ-5w3 z@bScsUM^TYda4f5+f9OwkAWgXlLVd8zl`>&{@Z9JGt<2l7&L)GyOxzy{}}P%LDpcS zTPQl$-vhYqph(dK(L^l@5D~PlV0B@Yi^Y0Rfu4?oB1pqD(jYuD6%uPotPpg}elzM{ zi149ig$OS`TGh{-lCE%(NZz2Vp|LO5#;DleJE6sxshbI5`WpDdO$FMQE*t`3EkOY@ z^52 zKrKoTA+)>%;l{95fWiAcFt#X~;tA3HwWpa}n-pOX;MZR(;q3*?OpRFc(u;JpfKmAu zOW_jg|NpG>(H5GA0pkEDiZltY^FjMckfG4kA{~aoS4HT;1EhhJ<7n?fiG`9JYm6Ro&9wnjR&Ae)A+a&N{l`KeMAD^ z3r1U)+L=Ho1Qa0QiK9WJ9QZ0k3DBe*;llzrV4!jW0Y;Y-Cs{5AHYF3_a5=GH<}h$1jR4&%5JptK zf^e)~0W?loe>C`OLO2F$=Mo^f0Gu4{6~v}_j%lU}2#r$7zt5DG`lL}7Fedb%NYRYT zXz?FDGkT1=I^+R6E1ShY#|8iDyxe_)e~t=vS|OE)Ttfws|EVA}4u#8a^u}+v)gT3_`U0V%~ z4{#sGgx;(sa!3FQxEw*D8t}a9tX}P1Zp*=05#SGdrIMnVxON7NN*pHN8l;K^0D~J8 z+Q+O63u;lb`k1}MmQUUZ7~4UiJq0ea6JhJPU>3BthDfNR1|+n^MQHZbA`B>8OS~UQ z)B?>hzCRiXtYdB%=r2fsDXYvH49piIK)pJI8U0#I>?-y;pcxhYqru;^Z87kz1OeW{ z8o+TrCXYz1I+lh1J|ya>_aiQYPGy0&LfXd~_?p7UQ?{Pi<=XYY*FgmWbgn1Xg+B%= zs}NvmJ@Lxlhk?dw1bAyB7#FsO#JGq&1e&gmgvR9I>O|$)zCIlUav+03yTeSi2rA_v z5iSR_XVM`+Q$3jVuS3tpah?e~J6FJ#pj}8m^ib{wVj*p901HVArVFbr;O|-^Xe%M%c5HAVeC&j3{&C>O%kDP27JM`a@$PS8z8+Y;oPoMv|T& zKexa78el?DV;hOS<~4$ND*FgmUKTHLae2<j`uJwVs6E#&B1FyM0|2Wk3nbLeg37<#}F`cwwUa{f@x&X zyN?n4ORE6``N@Akdel7t=D=?x@J_nMp6OBL1%FKr($=KO{N2BeoLdq6o9TKhaOXt9 z+{vL`t%wZnq^BZNydN0<0!5p~$;}vyir-)zX#=JYVhPifHbfdX4Sv_RF93{O02qNy zG^Q`&h@{o-z`UqpB(c5a+kum!c(kDl5kQZ&6G>ghz{?2)*wcw{qjl}8OZ5C^-K7>V z%V}U9X+P~dlK#aP?jUx=`VQb}`0l?no~xQrOtX;sFHH~7;9YoMWiNUebio{Sfi^}& z#=rQAokWanoxs!n?0;$UbFn8)=jxLNQ~${Mqn5^R*(R!vQ9VIFc7T4!p}C!i0;=3a z^xn7&7_=1<23NXPr$j;3f$9JZUV+3m(u`|REk@mr-y#+5JYXIIo;DQS|32O|>oJxL zy0aU6?SKoY!`&bXJWNEng*5<}kApJ=IMxkrXaUI51C(E9|A2hB4?J8(D-;NWgrcxs z&?NPngi1a^1kr>ZL;`bCjXBwg5a3)7So#3u?gij)dJJ5HnlmFzsP~fZHZ%nk;kqFzN=Jb?f5N(I4Py zZwfpuX|GXKk6|n!H1r7~h2>WG1VlOSgmykbl(F^?&_;Y*5VXJ@k;DfFLw7#~=vQ|f z6-ND@B0Tuzgg{MVVlo&4dN2gE?@qN|2s(EeSxfVL0*=OkBj`3-@)W!Sjrf8MxF>UU zIPY{``@{|WIRAAW!*vzi-@n>1ub@FgIj|=AKvde#h2sHeMn59Mu}E4Zd7F|*4S`^V Gkp2(vsHN8c diff --git a/diylc/diylc-library/src/org/diylc/components/passive/Resistor.java b/diylc/diylc-library/src/org/diylc/components/passive/Resistor.java index be7eb36c..3379165e 100644 --- a/diylc/diylc-library/src/org/diylc/components/passive/Resistor.java +++ b/diylc/diylc-library/src/org/diylc/components/passive/Resistor.java @@ -200,7 +200,7 @@ public class Resistor extends AbstractLeadedComponent { @Override protected int getLabelOffset(int bodyWidth, int labelWidth) { - if (value == null || getColorCode() == ResistorColorCode.NONE) + if (value == null || getColorCode() == ResistorColorCode.NONE || getLabelOriantation() != AbstractLeadedComponent.LabelOriantation.Directional) return 0; int width = getClosestOdd(getWidth().convertToPixels()); Color[] bands = value.getColorCode(colorCode); diff --git a/diylc/diylc-swing/lib/diylc-core.jar b/diylc/diylc-swing/lib/diylc-core.jar index a68e7f96c51ef14588104bbab18664820cad13bf..b95dba76e8f757b6364923d949100517977e9804 100644 GIT binary patch delta 14252 zcmZvD2V76z|9|)1wD;b7FQr5&5z^jPv?N4}XzN{3lJ>fhb}7-)rkzk}Xopg0NmN!5 z{^#D?*XQ^CeEy%$jSxyY3JMwu3WMZ$23c4? zIey!3@HcTAB!Y<}kQ8i?oEQSBVWI|7#Ka7wf(c%D2PO`}@|d^`Z^J|gB!KQ@gqX;f z6IWo|Q4~?aNG%8vf)J#LCg%7V*@+2NN@YwqQz`&akw_T_V^Wg3aT5klGrYq@7vnmH zb})59m`rAopv2@uj&QuchpP3e zFqs%AJ;-E`EN5zadKbk$h=M{7PIR$>=pC-j^oBA`cAmKZ@7q!OGUQ16z<$%C4$R^gTx4=AK8uv8?gz*?GM;; zF=6&@XPNPSkeerNzvP+CfZ>Uks9-j%^f_5KtrbwZJ|zXk9tt!&84*U!P=uKzVeEL^ z+12d4i=+Dm#|thV?n+Lsj$U5*R<>u^cXMbbj$hEZUuwLc~r-?jL`&G7O{rv|1M=!UT`wBj4M5*E@Mfa3<2Lz2? zLzFC)5*dawSb|>B`6aBpRg(cd06sRvo zPMveo+x@a6Y~Pr+GyPWA)1xPRRoL^xIJK(HTi!oE-P@j9VO)8c1-4^R?hN^FzYxIRq=BC3}?olRZ_fb~9c>F?R z##FVro1v0Qu;yvZSVkhOQQf#l``BQT*W4-P`_0xBS#f`M$8X7*(XiexbD_7{RGK=5 zSJvb0%|YWRx#9A@d+X5ub`Kh`d&rrdX+K~P!%jhwAx}ZE<)1afNy_J=^-UT&H}m@K z>+yPtcgKC&6nAesq8!R;68bcOG9p|eA(-myxv_NvF7=1!e8e4!hYn_=hZnPb&0`IV zst$@B*`+l%eW1!tyS`ND%%Y=Nu}He#pQioZ+p=vM-`T2qlx$P=m=G5FIX6K~;SjQ= z7kc^pPEHrop{$qC(enNWB+4%&CUZ}^QnRYJYPWiFd9`kK50?w zb|JsoJJoGNhug$UFW;;)z9eK8JL{qtYifS3F_J!Y;9C8vth?!(lcL+Cy}TkLzrNah zpMChwD+TXnSFP?4qrNA5Q_c^}HA}h9R5^Pei;?%;Pj6;6JHtR-{l<`=RIPF^U0P5s z!{y0=(GC-CtHX=IiJpv3nFoSTIn^K|Z#1-isSRkNX}#M$1v8#RXF>~pip?gmmp|kz z7oyN5t@l0-EZaOQ;tNFGsd)Hiq*@1dQ)k3lWIXqCkLKqu+3e#%G zJ~S)(iXL67cy%oA&8&c@k|wFHZZte|_O~vzT_~!#M6daBvyItLhvBQXCZCTDOL{vk zIh>!)DsPQImtAaoa*Ln&@ZbF->E8Hkpp;|s(DGUDTDDS$q(!EBwkCJG^R#}nN8ZYX z+qo4~c__bSRA}9HB+Nr)rN-|9$lz_}lQe1I8Yg|G=bT zl2v`R3R~n}ewN6ArHhKui*7WeedqJf?lXGJ>(-r~PBU;+{CVSxjL8)9EOnM^XR45! zI_exl$E(s?=(pyG-n@yf9jx&#UT{6~GRlF`WvbCvC)C-h>}tS*g9J~^6BffB1Ny#} zvz23wJNqm48D2Io+sU>l%08#MKcZ@z)VH{qPb!bkm?^9Cta$7$6cB&Wyi0;~>}6it z;d>M2o@I$q{p<|i<8KTnK)M=K+HMNhTJ#T#A31wz!D+crhs8s(nomWY;=q`+Zs5J^ zp;HclDxn=#4OA_!c;=ta?Tzqqcx(8_0VQ41Pn7N+3y#$o=HV3>%xNr~LDTe=z03xi zXr}_rUhL}1{oV50L8LnCj_6McOVS&b*xKPTb^Zy~XxBb?`PL;xlSg4u&l@x9=U~Mb z<_&u7FAvo3Y5#QBw;)m{>%^Tmw&$m>ChfJZKiWPn7gOlV+@2d5Feh=?TAg0-v~!SO z+RagxY6&sj@6!DXg>Ooo*Y;nt%G5hredXzg0qvo>ozM9g&a#;n9C)6~sv?$ooK&48 zz|xX#|ETKTwH=epo5FP~4TMNOPFL2|cy4Rx20U)uskp`bVWh$*=I>!@2bV~Y;`J+U z<*R&?c+{;OK@Rd32X~ExT1IZ|-iz*3>^BDQpD=z? zdx(+sD&%IO%$0ZgOIRDLcA&v+zcGbhE~nkR%#?eUjac`w^3PTtXZlI4W_s_D*X`SF(Lnr|;~y<0q~d%IFq{CZ@inKDO|$9%+;p9?(L}Ox`y6y=}@dtXIhodIAj1)DthbEu{gMoKsE@^8V=dB&kdYilDW$TGN zX%9mUg9rAGt_qb3$=q8!H0`UkGAB#qpRe`jq~sjs>U!dKXZFvD$7d?g&HP^1D{`Z4 zRRT_sVyYGCu0#clPVj!neP>L4wXeGHuAR>#mVF1^e){{VC}kY3E-BOz;Qz9JE0ZSj zpz!Wp$8(p1g_~{PxjWe&Z8oj7aDczF34Eum<#o@dx1J2DHEk{)oNUngp%lxsG^g(F z?O8!zVzs<8K)OeTDtjHn)ffOgy=kZvT0{X z?A_J8W|IA+6`c9_ly%_2NiWx{-=`Quny%DP{-z@pzwzLi^`pD*+oZlL$-bF;Q{$D* zR_;$DpDXEQ!FrSOt3}NtwSMW0zo;y(P_jR?olILj%1M%5`o2mX;xY9SwhKQ*SX zaFyxvkKAUTWi$9s6p3|7f&a|`Uz17u8&AcT3Y))^mONm)P>Z5#l)uws_&CRw`~=>p z{-FMCHQBWE8V-WYEHosSF0JpHBrWX;Uu5@<$k&V#rq#*`HaEAhZkOOtHB-2-63JOO z=X1OFZek>C7`&&2MN)nDsJfifDN7A0j)!lu&KNguo;n0?;-bqBPM>!1)sxZ9c8RxC zNHTbpM3Tw39;3}?=(=KAVol=nRsC!P(pK)|5O!LUKoZ8k&(!Eh^ZBdja<5AQpkS%ampg>M2+gg6>JMPFs zGG57iSL%eN_nTi@DsSVOT8&K(pAoi(uJ?8K-a8@#TiOi|8rEH;HrT2@e5s+qdWTWlH@zH$UuZpbcMlk)80DCTZ7Iw3!INo&6huA^sgc%mygYNNQVcm<}GS+Foz$n z>gZ)yPyJ*weRko)Qt=u01;dQXCTuAa&L0`Wb)AeHf3-JXFf$zZ%FOgl?@rDH$2IqR zf;5j|S-pmq#_YnVJITMxnqmbXx*OAeR;f&q(s^Q47q?_Wu7(L3dJ*30RTYF%4YuGU$aI+tXRwUw0WX%4y{jVa%%^N!Rp zoDq(+x|HjjRAV%+-5lGd;+_G%;g(tHv}`n(q7>e^}(QWXoaITNmbQ&n5Y7RzI=B zVTPMM@)>9R=_TF!G_#)6Bs;^-#bSXoZANK1U-uK&9^4CMd@1ICTgR_#9(*lM+lHZbo z#bSOGh+AguqSEbeNzZVeRp{cUN-p<3;i=W4kiJ;F&g%RAk$uDH(53QVg^2qLS6}UK z8XECWDSeo@rS;F!m(7#2_7ZV{3^Q6kzbX&GE7uPUt;Qs+HAuA?BziD>g}oQP*>75Ze4*x*BX(h{Hi>cGmumYq$6=!1s}TCI}?AI=$UyKjJ=jy?p}{b`sJqA)HOH1DC5`n z+2Y$5-@FMU7XSMRlsb81zt(*=zpokku<2g;D`vx*d5W##4u-*gBrA=>VlPbsb}xQV zFF*(G<~rQvg?`FxFO=umwA*${hQs2J7F}YYJa1S(-+)Zg^V&cTxie?jlr^9p3(w^~ z#jD9}4rc|aycXQqZVM}g8#zXP*nIVl#N4=qgGOph-NSE%$2Q z&$+$hYtzMD@VEEMUjr>kUUI?t_fIm98q?Qq-K^hSsVU!~+%Pdyt!;eVfA)c*T4p)- zNv5>dxzFzjZolqno98wB_^fx1&7KNFSaLEo>>Hx|FwNU~QG{PV&#`PF;9K)8x`&d3 z6>eHf<(jpvJvsqXwf2D~rwb?(uncI*Xc?!HXx3i{B9PdHD_5w7aaar?VXc3HtU z4Nhv@%Y1jyOsxD&z0%dYr#CAMEXNGgaDC%T`ZgJ^1J3FdzZvh$F?l< z4urlHO-=9{tQ2Ez)7x+RHa#WSyY%6e@sKZE5BmLj8Wlc`q03{a>4k6kc0Mi%whbdD zB@^+%suwGgeaF9Pmqn)aP+pjxvdJ*<+3KZus>Io^wq&@DYY6o_QfYI)`R0$6{)+eV zr>l}IJCqDnX}1UPNLh{iQYMWW_VT3|jnf`Zd!%`ayKr7Rb7IqH=H|NbfGO4bt`#}bjAg$3zEy&{*?`>A(*AEuo@=nw$=b7|VfobM~C6QX4PQ8G@; zsYPQKfLJd(yxqEE{t->W#R<-yRbA<2KAw;zrHHwm+e37Q>ZFzm9~hRB9=1-O=QOH& zXPMPnr&u0uq*8M4M=Et`PhKjO%G~N@EL%TiInAc{MsZI9n z9g9mmC!?u%FsL3_y+fxXe^}4tToWC$AS9n86usFkS*JeP**C)fD@#%#X~|PwD0GX$ zxgeT7`yIadQsrF-yWC*yO%I6__4lQQYd_U{cW!^}Ji#;C*mrZq%P#8u_4lLJckL60 z>9#`U)`hO0&6B=H=Q|D0&jqVgKD*(Vl2>)~ARQg)&G5eVf~N@*audfKC!iR=nO`i2 zc1>7v-K&XdW{C!;`t7%$`u>pix9jn4qgWpiFH+9B8FXkx@I>~BV;+LxCpF4nomy1a zPz>Ym`Jlc-F+XkFE!mfpu8y~k+}NI<)+U<=Uz@ymRJxYtK7W%VjEchDi+)M~CKJZMK=#EPBswWCqbYoE@#SDb9?eAFZb)%GC5Xg*`L)$|YTvH7 z+`+guo45Jn9qhjR6DpIEgQ~CIj3cO&{JKu-!#j%)L{D(}iqQUHUmpubdEeEMTFXq1 zc-Dk0aj%{YmrQ0b604^sb$Rmd^GVw*;qzPYx8tsK%C}x`L&w!GLVi!VefahN7$3Rw zD6Y4a^OmW2m%yK#kFVFdr}X;+GUujzzp(6l+GYCA`MdD@ozHqrCB_8Bn!5654F}RB z=4FjPDF;?^#VpzPtx2PWT_T+%;V#mi$}PecYLeG(er7K=W~<8D%KW@v&El>^XQAAS zm3TRmg!{8wk6Y{%&$+xrzrtTGV_@dsn4y2CPki6bYcA@Jd42G471Pcqx5YYcOC+;z zX;)Ic#cNcqaOx+Af6Bs3x5F7fB>EKC1$WubJO7+q3CK#FSh?`JuUFf%0~&o{%e4DT zv%t-a{{*y>cQX0S7i0x!|W4HpATa~s(%$@6&b*zBwiW%#fZJOOd8>)=%%2c zP)Up(5=$%_evcX58ezdHOU4ZFg4f1daO(Q0WgIVkH;$(gGedkz*fZaX>!}w%;`;BO zf^fah@^3|h5k2FM8b5;d<2V)EtY7j3a)^ObpS>Z^FCREFUApu5EDo({|23<#( zFskXAbdL@|^$13%;vnvtc1!3Lj0aio^dD$PC@7lI$v6;1=^jE`(|Z8w#R;;GK#%ao zN!yKl{T-kvJQ|G?q=&1_PeMI-L*xu}7jJaCL2-D){v4D*M4@qSlY>E&Usx%kHNqDl z4%}j^5A+kK+u{#p!FZ}~UQE++Qc+Ocr$XZyVQ%zyDMDTII}j41!t)g!c4W2$OeSa? zBg}(o>1xa_L&tEs;&A8%-nbSC{la-8q9G$38H$5y@J37$B!@R1pim&zKo=}w@tUJ) z(0Ls0&49qU1BP)f2a3WG@7o&{>J>pn#CYzyx{L227|&`LHPZ!2_Edmj6Dol^@SyW$ zkUn7-s#p6+0N8O8n(+tF z3LgJ?BlHxX*tA}#4|jCyhu-6jBSR1)ZgYAR+KD#`Uqb$PL*g~G6Zbmt3ED%8g}bu~ zfyECRZtGAy)~JM=@IF|s?093C3I=B~uu!Iht?)(|BYX*OP_n`&@WvSqSQKwWbHlO_ zW?ahyZ^n^%ewYStd=`R+)a%q|kG=5Kj&FURWC+xPyA|1>E$R0o;sN5n}}3!4VBJxD0QAb&*VDccS>K zvIWS_n8+^wAnb%&(AmIlc*D;YcEEXG+QWNrM8pY3@kZTAI2v#0pMkgGkwVVGOxUJU z6YmOB;tkXdPRF*L8ufFq4&Ly&03+Dv$(lfa_&APCUV?QnV^ov`KgTp*NN_Ma*6>b* zMRA%NNw6H=XitWP@y1LFJb-Uk4{yLvaU?7aHph{XbQs_3Yi2WHP8|824X5Fav^=;K zZ`c>W`FMk>2nHuCh$T=A*Wf%uC2$?~iLxfH0WQN4-6pt`A48a4!oOMZ#v;6etKd&C zH5-P|L&!dy&=Nsv@CH2PJCHa=a?;R1(PSg32mW6Bx=qxB1AR& zS-{|6d}eHjGv27?Ktc^LMAHt@#XgbN1f4;s@RY;d5O78S1U`qfV_#uwI=qoF+$+xy z@y0iCfgr>jZ@7md_E^ej?`1>-EN+zU3bG56##az!Oa@&+)G@t9I3j@dUqNKB&iWNZ z8X`Mi#lNDx=Ki#`TSLa z`PNm$5Hp&)ikM<@djv=aNdE{#3zM}G$U#i9TtnA4~Mt|5o8zHB67j>&)x*&T@- z!1@x`30}|ZhzZtjx{erQk}-wi9|qoOFHP4~~Ibks2c;T8GsH&k#}vhiPD$eWPAU*Sb@)0duCzZHU2JO@6}Z~31c zka;1^$%JVsiV&t9+0|TaV4u;arl8nPW(w{H@o)RgsfaX|_x4mo0DgW82NS>D;6r0m z5p3C`>6qe22BzRn+y&F2uTl{SJP&9(Eny7g;k}81LWhhzCF`$wVnezJ8XQA#dE5Y8 z&vMb|8;BZCapg4E-Vfkk8-#!y#mOjU^3bUphzf2sqFbZz2w2Jf$BMlmkvC6L!Q2P} z+X?p1S%?qP{Xf1M_5lY2;2=gu%X24D=(fav9KxA%ReeDz3ZN8n2bsHxN`(^mXyCc5 zt?p$^2b3?sAxTC(S)4diB#j!T5w#vp1GP4npx$Z7R%{%Lv3^o1+LeaL;7px;AwsGNa7v^V`m4_A}?^@F`Au@sNz=l zs}H111FKkIB}W$HL~s8R-q!QTZibyPo#h#QAth26MaR|dj|GurMR zj~WF`dVp1dj4|RlW|?@mhZXhBCm42T0*0b~9PjSsLZ5C_l!f7k2XW??nTQaU!A}fR z9>Ov8EJO&8HW21*!2`yK37kVpWYOe?aaNN7cAOQrwzlg{Q}23MugDJjYaYt!)srm**ORwN}EIM-wHX10ED1f zIfxYMk%O?|DZDp#ug6aM6JS!wSIgsfm^*%1m;jz|-7MDUPkix?;qQ2<%Tb1SU;B5W$-_zzIyUF8u}RP?0=@3p3xI2Q<)ULgSeSuCf4(#lVm+1o$Km;l{v8 z9Q;OrJoyBuk`F9*{=mURyYI}Xf9}SLdsgYFkP1dN6qHB4mS)!pj>ddqDkm_GC%^xK zAi3Kc<3nG0!Nvs;d;$|nzI;A!Ld^@n@B$J#R1ksa(7qgER$^`gy4y5_`tfa|%n1NO z&Zt=d!jEzRKYa8LteR?^1PkB{IK;@7ivkPgu8doCCD8N)gA;-c?6%~mPCpBpRj_gD z6l7YRbOo7CfJ|k{xRNfTu}0K zKSfR=XSyah!zKhu!1hL7vNF7PU~cSa>~@F-?I|MieuWWsX%ia8y9ggvjO<+ihM5vz zh7m;l?=(Cx17S>dT0#NG`0os-# zlK5c#^IZP#^e0G!DfXm})|Vp87)duqq7eR9!-bQuhw|;t2lZ!xgM6{nTth|6!Eou9 zA?%pHZ5i-Sj3&U?G9t4Q0740&r z00;TWJC=>^zE7OIF86`!Ny0Iu~i!l1VTO!@T+V#?Do&F6~08n7`Xql*}*T|u2H>Ryv9UR5MX@KaP*6mJgM30>w){1v zM1NKytXM)!Re&VFpU}khgT2(Cipc*crtum2tKs~2>7|%~(!?;g-wUY+a zfq;WN{`r@L>Ge^F7S*XH=E9^JklddjG(puHMRabVn?XPUznLj0gvka(=?!7(P=jnj zjbB6mIR~dOLid&bV-@uYqWgF5n`?ko#m~Q1_(m9rfj)l-Fm4^9M{8>k24QS*Y@=_N zzYHo00*44$LUgD~Em)f+H3${@yJjQ*r^Y+(jDszC6ddG(&_#tle+ahaeZUDD|6{cv z<|HivM%NN&+C2=^WF)|GtOG260tv;Uj&&fKBKU)k_Ql*!E8-w0A#jjiMVUAVcWG9b z1HD!UZXd8Z?g@zby#YyK$%&KIae;dy2M(AGeF5yTm~(X?Hp)k6%D7=BvioO@Fs_XD zl5JcV&y~1h(zq5F<d3#4k!tFAKPs!&f%jUguORS7V#exuZ|8ZjPyz_sT;`Mgy}%j=1)@g?T! zq=~t*qYMoj>u06(vUn|Us{jZ2h9I<)Ftus`cZ#4C*9PFvqDz430K`i%5WM1g5!@yE zf`fc7GucO&&Nggpdw<{2fe9h6`nMios@h15nn5E7~BzH+92yEg9zfOSAJapjo=Hp$dLX zRGtk`xcwF?`V`?thaYb|(zX_j*cjc^uBO}3+ABWr#pl*ST-y853`H2Iht{_tw|6wu@s5HxvD!Ce~| z=sFB^DI&l>0L0&^1v*6!b_2d7@be{kG_V7aMU{(ScGSLu$knX_cuAFEUVP}E5_l78 zR1DMoCoLEMSd(*1;CT`3!sO44ugm}Xa-d4_1gk(NV7=LlX}D1HP6Ye)6M6{)ja&bM zOlVW*#v|#2uRhj|tP~VBfLnrW@^~iDd1j7nuiod{p-31cjq(rm3!DMqh+j!scaKx3<3q)7~Gay42 zhg?OERoMJe_9L_L7zS&rePcd)#wS3zncJ+yTR4F3C-#TkF4$h!*l%S75l%h z-o`ALJMsGHP=%~rJ1E*6>~`eWcnfwS2uBYQM79S+KEg?WBsTCs;J$G-1!9_JZcHPL z*7YFR_W-mT1NS;&AP16z7S?_k!QAfgmltAPB<+tj~w8^%9X8`v5rLhsyUM*iYV28?0Xvi2C*s w`&kLrmkL3j^&!}g=+Hl)kNAcmC@B=-=Q20i1R{c+75qPMLP0SS4w9hwf4GxNt^fc4 delta 13451 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
fAkq9?iH%oJ5uPKs@9?466`qu?E8*`6!Bj? z%H}2zcs^r)^+J5u6rhoCm;~Rgj4rVn@yLh>1LkX~^6Jy@LDqnxr9SpTID70r3pCrcOMK|Un{8$ou^1*1-$PnN^`3Uy1g+^jvuN(ooZ-5w3 z@bScsUM^TYda4f5+f9OwkAWgXlLVd8zl`>&{@Z9JGt<2l7&L)GyOxzy{}}P%LDpcS zTPQl$-vhYqph(dK(L^l@5D~PlV0B@Yi^Y0Rfu4?oB1pqD(jYuD6%uPotPpg}elzM{ zi149ig$OS`TGh{-lCE%(NZz2Vp|LO5#;DleJE6sxshbI5`WpDdO$FMQE*t`3EkOY@ z^52 zKrKoTA+)>%;l{95fWiAcFt#X~;tA3HwWpa}n-pOX;MZR(;q3*?OpRFc(u;JpfKmAu zOW_jg|NpG>(H5GA0pkEDiZltY^FjMckfG4kA{~aoS4HT;1EhhJ<7n?fiG`9JYm6Ro&9wnjR&Ae)A+a&N{l`KeMAD^ z3r1U)+L=Ho1Qa0QiK9WJ9QZ0k3DBe*;llzrV4!jW0Y;Y-Cs{5AHYF3_a5=GH<}h$1jR4&%5JptK zf^e)~0W?loe>C`OLO2F$=Mo^f0Gu4{6~v}_j%lU}2#r$7zt5DG`lL}7Fedb%NYRYT zXz?FDGkT1=I^+R6E1ShY#|8iDyxe_)e~t=vS|OE)Ttfws|EVA}4u#8a^u}+v)gT3_`U0V%~ z4{#sGgx;(sa!3FQxEw*D8t}a9tX}P1Zp*=05#SGdrIMnVxON7NN*pHN8l;K^0D~J8 z+Q+O63u;lb`k1}MmQUUZ7~4UiJq0ea6JhJPU>3BthDfNR1|+n^MQHZbA`B>8OS~UQ z)B?>hzCRiXtYdB%=r2fsDXYvH49piIK)pJI8U0#I>?-y;pcxhYqru;^Z87kz1OeW{ z8o+TrCXYz1I+lh1J|ya>_aiQYPGy0&LfXd~_?p7UQ?{Pi<=XYY*FgmWbgn1Xg+B%= zs}NvmJ@Lxlhk?dw1bAyB7#FsO#JGq&1e&gmgvR9I>O|$)zCIlUav+03yTeSi2rA_v z5iSR_XVM`+Q$3jVuS3tpah?e~J6FJ#pj}8m^ib{wVj*p901HVArVFbr;O|-^Xe%M%c5HAVeC&j3{&C>O%kDP27JM`a@$PS8z8+Y;oPoMv|T& zKexa78el?DV;hOS<~4$ND*FgmUKTHLae2<j`uJwVs6E#&B1FyM0|2Wk3nbLeg37<#}F`cwwUa{f@x&X zyN?n4ORE6``N@Akdel7t=D=?x@J_nMp6OBL1%FKr($=KO{N2BeoLdq6o9TKhaOXt9 z+{vL`t%wZnq^BZNydN0<0!5p~$;}vyir-)zX#=JYVhPifHbfdX4Sv_RF93{O02qNy zG^Q`&h@{o-z`UqpB(c5a+kum!c(kDl5kQZ&6G>ghz{?2)*wcw{qjl}8OZ5C^-K7>V z%V}U9X+P~dlK#aP?jUx=`VQb}`0l?no~xQrOtX;sFHH~7;9YoMWiNUebio{Sfi^}& z#=rQAokWanoxs!n?0;$UbFn8)=jxLNQ~${Mqn5^R*(R!vQ9VIFc7T4!p}C!i0;=3a z^xn7&7_=1<23NXPr$j;3f$9JZUV+3m(u`|REk@mr-y#+5JYXIIo;DQS|32O|>oJxL zy0aU6?SKoY!`&bXJWNEng*5<}kApJ=IMxkrXaUI51C(E9|A2hB4?J8(D-;NWgrcxs z&?NPngi1a^1kr>ZL;`bCjXBwg5a3)7So#3u?gij)dJJ5HnlmFzsP~fZHZ%nk;kqFzN=Jb?f5N(I4Py zZwfpuX|GXKk6|n!H1r7~h2>WG1VlOSgmykbl(F^?&_;Y*5VXJ@k;DfFLw7#~=vQ|f z6-ND@B0Tuzgg{MVVlo&4dN2gE?@qN|2s(EeSxfVL0*=OkBj`3-@)W!Sjrf8MxF>UU zIPY{``@{|WIRAAW!*vzi-@n>1ub@FgIj|=AKvde#h2sHeMn59Mu}E4Zd7F|*4S`^V Gkp2(vsHN8c diff --git a/diylc/diylc-swing/library/main.jar b/diylc/diylc-swing/library/main.jar index 75a9dbc6128a580379cc7bc9d0c79fe7c94f84e4..d31657b43ffc3b5edce96be86e80de3b9656c37e 100644 GIT binary patch delta 10253 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 I*tU=GKgf^jt^fc4 delta 10127 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 diff --git a/diylc/diylc-swing/update.xml b/diylc/diylc-swing/update.xml index 17233ff0..102fa6e4 100644 --- a/diylc/diylc-swing/update.xml +++ b/diylc/diylc-swing/update.xml @@ -2138,6 +2138,10 @@ 2019-01-09 00:00:00.000 CET + + NEW_FEATURE + Added "Label Orientation" property to leaded components that can be used to force labels to be rendered horizontally instead of following component placement direction + NEW_FEATURE "Jazz Bass Pickup" added