From b7a1ef666482f78361280b1c16924356c581c767 Mon Sep 17 00:00:00 2001 From: bancika Date: Wed, 25 Jan 2017 11:48:07 +0100 Subject: [PATCH] darker/lighter logic single coil improvement --- .../diylc/components/AbstractComponent.java | 12 ++++++++++++ diylc/diylc-library/lib/diylc-core.jar | Bin 236688 -> 236911 bytes .../components/guitar/SingleCoilPickup.java | 8 ++++---- diylc/diylc-swing/lib/diylc-core.jar | Bin 236688 -> 236911 bytes 4 files changed, 16 insertions(+), 4 deletions(-) diff --git a/diylc/diylc-core/src/org/diylc/components/AbstractComponent.java b/diylc/diylc-core/src/org/diylc/components/AbstractComponent.java index 843ba7e3..a463616a 100644 --- a/diylc/diylc-core/src/org/diylc/components/AbstractComponent.java +++ b/diylc/diylc-core/src/org/diylc/components/AbstractComponent.java @@ -80,6 +80,18 @@ public abstract class AbstractComponent implements IDIYComponent { return ((int) x / 2) * 2 + 1; } + /** + * Returns darker color if possible, or lighter if it's already dark + * + * @param color + * @return + */ + protected Color darkerOrLighter(Color color) { + float[] hsb = new float[3]; + Color.RGBtoHSB(color.getRed(), color.getGreen(), color.getBlue(), hsb); + return new Color(Color.HSBtoRGB(hsb[0], hsb[1], hsb[2] > 0.5 ? hsb[2] - 0.25f : hsb[2] + 0.25f)); + } + /** * @param clip * @return true if none of the control points lie in the clip rectangle. diff --git a/diylc/diylc-library/lib/diylc-core.jar b/diylc/diylc-library/lib/diylc-core.jar index 4e85d60320015a87fd7cb5b145871b8966e4c4d9..92b6a30c8fb4c3e0eecd852131e8dc3ca54c7805 100644 GIT binary patch delta 12410 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 delta 12085 zcmZu%2Rv5a|9|eiWRyL#l^KeZk`|maipbtPI7ov^(Lh#1JBbwSFGWil zMzpm1pL@=&eoy^-z0T`?yg%>HI_utZp5B}i%swe7u*`}iA|dfE}H=ov}qqh}SNjh?-PE_#ZPv(R%1IR!nVNCWhYBxKngq%@MN2w4y< zO7O5JQ2Yp(Na>)b74wXw80VBR!Urf*^wi>-hMudqwCHDT8dnyH1bLpv+_aD@@C*_9 z1->G@Pq3Asg?-h+TnMNYPe4GeiDVTv9g+^k!fM$`6yhW(C}QNG(s3-fO}4~V#ecKfiSgf_uES5I=LVz+D_ND}5GMxA#?C(naSm&#@x&OJ3 zvhL$}E|RNICEGu5FQ3IcN$K`DtHlBh2`%lDBaMm-&qgY*mI_Hbuya$r&VTup0XiWf zp`r(-Y`S@GcvDSUPtaJmZP0;5TZW^iv5UNU`*&`>AKqa)X8vM#_}bmGe|Ao0y>>bm z@AD~H>i*|yQZfHf%%?)>&nNu1%@g0#e#vfY+s12seftL-U7pSt7?x}{m0KhFc68$0 z&^_@TPYdHap1czsZkDnbJE1WQss+?lN-k?Eei_*wuX1Hu;rSh9U$f(HZyHN0J7IYw z!fEhla=c|&;xj!ykBh+g?4&Oq63x%bBIaGZKeCZ;=~LOVPvtM8ZDPb9N!C6RY2Ivn zR{e?QRu6G=;btM#+%J}8AL^98>$NO3if$X#=NsVW>PY_bLiFAfsj>yacb9?-$ zoi5sY`JNM%w==E&DZRs_e8S-g&GJ$C+pI(EQv~jPEKZb^4ffU;3>okbdNqFI=AqzM z!!L)GhYgCR2i|LVY1gAv)|A z9(*ZYF}tr|c<8}{E#;?9%GMS78t9#f%m1ztnx>!}`+0BRCg-wgypFzNW}W(?`t_dm z9yb1`_XUP)m+wrqDimH6WU^sRwLzJDa$?Y>Q>FK&+^($;5xH*f-@Ivl*5Sm+Iaj6Z z#xy3|1^wqk@a!(^exz7(=8W(LPp1@-nAhc{mW=~0?Ss7sW$aX!sPiUH*{mC3+f%Og z{*`WlSNFz!4mOwfwGqpmt19Bx4cb55=H;3R{F7h0l+DuY9?Z1hI(V;5SVu^x;)(20 zTTvZ59fg$vYokMD`g@gCj~O@)?;SWFRxr5pS}yu7`Wqwz1qA9|UJ5H#S1UPb6dvARdU)v=d-1W5 z7^e&q{;?0Yd{d3Rgb(LSdDfR!Rn?^A4Lhuhk+CaFG27+o96EfR`}nl!_U*O}rIi(S z8fUj>Cu=2kpNXoHF|ayy_m!k~mcb1L5gYxGo+2eX!}xtSR8RWO_qY_CTdpnZCPz(- z($#o&HzK2beVEfiGRo&x+DczDwH(z}?X1@6*ZjDrYk6}QIOHFk;J@r{Qc#rtwCRwOwZr!kNXk3log6TV3QmuYY-`OFV{l%x>Z@f=K@~TO-EUla_FUKjh(;MR3 z=la?>pKLFvdG4(<-St9~xAyeI!Vjv%cf9avu-@QUySIIcv&6)N_R21q;~$D%ya+zp z9_XZVsd9o?eaD_dA-%hF1yqB}m2$cc3{Ee)TXW54Q%u6@p`5N+%5%@O-@BCEm0xxu zb>`J0IU(6y3-77a9(I;^Ws;D*ae?szm0I5h=io<^l3lrlL#7A$xmwiZ4-ePXX=^*X)LobjIw+h)}woOkxW-v5!m=HSu*3$xGv{3GtrDZ_F=8YV-6>c_ZJ+z;kKf8 z-xNO6dvk=7{);gvS~b60ZG7^zBRe*>eG)cnUpD>v!_lgWUCo-O7JZcUeIVo46W6+F z;<^?SqtlMQrvGU^tGBOqzuB$I&u!A$>~neC@q9C%MT(AG@Ajtm@Uo+vYNC4_j$R*{ zKCtF~YjU#B)&)WD@~?jw@HtfGItzs9b9ofCX-&PRTcWvcRrafxm6~_lI{OaV7rk0) zm0xu^a=P}p6JsiSvSXbNS}#v*tq?z$xZ#b#79l zrO{q{+26&>WtE=GdJDd4Gq_`FS9T=i{vH4QdY6Rt%ddLaHk;(S$JfemBJsN61nMRop&q4PRC2o zF3w15pY~?m&5Q1iOFE>SQWDr^r`=XIxNK2j$$jg-BU&@eC+~ONk)e4_J!!_IPNh@N zFSG>%os8sy{OeY8Qi2!D3pfkKR>w?vo2h+vR#2SXe$`?zzMT1X57!#L_smIc7j<>Z zid2a>ER(rBTC8TRNs4>%s`r}a%Ew*!y(>i;L~<$~Ran-U7Ecj$pC0x6jy6%Dx@E!B zsTbo4{2S{Fm!6CaH#(wrq}^kGs|nZ3sZVX5nAsf9|ImK9s!P{GZOM(~C63+|m-%7@ zw(-P2>v;O4MD=Ovrb9JzJs1B7Hc9kdUvpN@6m)bbdB<`ad$2Cj|34dcoWH^cuAGCf#obztzLIU0kx9R0*hJ}7 zZn!L8-W*dmHR<)k%GWcZ4KIZDC-8ciwQOuJ+6T7l1D|Q*^k<&ASLD7dKmIFUL|XV2 zrIbygyPru8@#f1JuQzEiBLl?0?m7_Ny`rgM+u=7O7N+xuSAFbXD|i07VC%bV-hjs^ zg4Ss2T{lggv(X_y^xNEs@K9-m`!zd^gM;68c|E$~<*_2B#{Nxt$Fs_g4==jk-*@~R zo^m!8jQgb7*CVjUVcq-FN55#O96q)gq_}MAf39|}rE*u~$=+~X@X>ga%xCIAQk&rC zo&!1aqnA4ObsF)@tUpYh6e`o@u{__iCe&58TfJ(2uW?`X0>39k79vJ114iy0mlZ<= zZH#-D*@sFlm=O~rsAb%HBIVn}wHJ;WkimK%_)|Jo+_e&)Il}UopAl&#ZWvLackY7a z^SE)EkH;?x${jK6<9?g#q|xuQa@!9+ZT^Vd6Z`wkVh6X_OmW%^I;Hkkm1{pXP1vq3 zQ_-O~KdeZ@Cn|lR+Xrs-Wui)4QV+DNRWn+=l9E_#$-LppY0@#5*1x`bM>(@>YFhGz ztx?N1RNnve?mM@Y_DS=En_D8(Urmv4`mZUaJzg){dE*>FKV)cmPa`lIj|aUq_EKOW8^Hi#Zp7oHs#RpR?xM2;`?_&_B~J^HRd@Ak1U z3(`I4+{`4s$20EVu*|6MxK|OoeKT1vcB1aWi%Re<_pWJbK2haSeBQ@z+5EtFpAXzV zG?BM2W8Yd5DCS*#xLfek;3|@Mv*wU-dZc6ua1@rX9Sy8$mM92Ws}QqOyUMILOy&c1 zuqJx7+)7E0d<&|}aF=CgtTvzU%7;t4?~!qeYG!PzLd)rw>g^kH zn^yE53Cnz7JiJ%Yu4KUn=M&cMo2xc}U!WlP+}#>B^=iie}+w%YPbU+epJ*RMLJC^~2` zkko0Z=g%l-ONn(OYPy}Ib&AA)6U+jj2e{I-&l9L^NmHR8UJ35x04jdp57k$ zuK4Sq%1a+qt;Oav=ba;JtGs#e(dDG?7>Ukij$5kN$MUgQO5*If36nvE4<%GP5|G1( zl!l^T?7c)-tR-qlxxtr`sBH-k7D4AOgM<&**VJTDd~lqfu7;7|%p!d5;?35_CnPhr z6h@r#reID&0f~jwLIErk7uVy%(_U|lLtEhKFBvvf_ULXg;1Wnlu#Bw7dwlJpj&vO8{;d&AZoB&sN36KdoTuHpFHp$*(@aH^a(D`L=VoV(DAd~YUdAKm z-g`5TcFW>nXBS9-?O_yOt;v%d?6{+^96OG9(Ssd3z0%}CnZ}P)W0m2%COmE*$1Wp; zedfzPL|OCoJa(h@6LTB82;$KMTGx15kT`%7o0F@5x)&zaMFM4GLaH%Alz4;uG;Wq4 z^pJzb!_tHbg-*mj4jc%*3fY%nQw3q7ghYWN!QJ>pmUxVfdK8EW*l19hkVcs`@~9EZ zvDQt4XcR^XNE#CW^QvbPsaP_dL;S!zv-!jqjG0&xm#{?G5F$9`d0)SFIl%;0Few`@ zAp%HrYito3O*CLhGmg;2l0yO!g(Q$Thn&>-A(>c@6@lr5B<{r>*+d$~MDl(W^8^qT z7|Ym6yvKp!cN3NvyHQHm;eHu5z8^A^p)6(r9D50HCW;%NhK_4aFZJNPAa>a&vyh4(f}Hy#*O1hX1d1nkvy23 zIe`qrC22RQ>xjcFh3Hx*HmVAfYM8P_j68y+?~>$gJS(p*HmT@=p8q33)^1qRp;Stw zahxpq0{7sEJQ<5kHYk(Zu>ZrWp8Cc^|1r4BBvr`*OsUc!-(aa!8(uS_71KM7Jcc%b z#w}jcaCEc*@7{p6mluvZr2;l{?tscSY>eD<&xS!xPanmtWG04@EzycllwK= zp}GRA8&77Cc;js>$|8%gTZ3Hk0+znyk=L+v6_EBqC^^N0WVbkyzMUpZaKbw~$Wfd~ z)=hFUdha&YKP4@&?YBO%0Za8S;L8-*o_bAsV@!F7Trd}50aK~Dc=J9wi{i$-dQ&PA zOL}vu%jjab@zX+zS-x#n)JD9x=PjX@VkvJq<&JUzA68IC^u0IGwWrMK2w=TEg>Id} zetT*rLLS;v^O11Ik&*?b4wN$b%hQ3HgM|GKlr<7Y9Vm1g4yHO%3lRcMWkIeZrGfr} z_Op@j%@N;lgV`$?Ve3jJ#>JJC72*gwQMO2McVaTz>qMC#q}PdZK!SlYwF(IZzl4v@ zlp{ixx=>4zQ2I-F=R(;d#M+e!QQ%4~M#ytl$_5GgZcHiL-Ix&nxltiVwP+RPhlJy+ zC_5yKb7uq>cWNa<>fD*2<2-(;JeXMJ9!xnOJs8hRR#TS9s&F+Gjs!tZCPN=j#!sUs zW5wge2rIo9RfQLm>PIgomh~EH1@g0Z4dsS}pT7_XZ^{{cf&97522I{f_2YdgS+Z#j zxZprZ0dpS;{n!9PX!N=dLfMaeH9)HyH9?8~0R8iw$zn~1OaIru{jn|nzvxozk$`dF zn>Sqmt23-t>gdD@BE@)Zr5=+2e&vY9u~{! zS2pmuKXzWyZ#vs8Sr#nyqtNOB?tZYkm1)1VpxBR6L$S%$CE}KF^{2x4h8)heXV7$I zc1fl*7+J$qMm*n{+Xbnc;13Jt9CW!XOgG9_`a_Sjc(Canq#45qY8>?Cxolgu2I%%@ zGJNF^GYn?4{qj_SRsaLe3V>iyK3Ew*>7fx$qk-LkT~w$7+JCVg(BQEmw&yM}c2ltk z8V1DH3WN&Z5~xrI>jD{{(KI-D7h7SsCW?-FA>~{dAq&egf+HZqk>}VhFcQctXxSiW zYP}a21yLr*tZt9s_I7v#xi7(D$#Iw+D`QveQvgnDnW*P!)4C(0{#mCEhJqP?-)K;=0fdE6 z@@&IKA*4ZxR#EYO(_no`u)Y}_P8Xk`>GKflLxbPaA~>;j!ilBH!Mc75IRzsjlnm-x zfweHy(X$w}TuaF#2kYg0bUfft(;upO91c3p;jCVqmjthJm{Lt9_)g7$v})LNIOy9h zAbP<%N&$saUI)WDT*N*?E{TGWbxh4$Y0c70SmSqD>`%=uhovvnLa)Lwp{X3+Ynw6s z+7&T0LMZpV`% zM^7tTuU7_44WsZ%|8t=FyN5My0Oj?REZeL@7!-#w#Z`pC;s$R1((r?UFiH}IJT*Z^ zz653}0f$SKqqyEXG+iIDgv%y7t%YN84<^Sspl9yUEM<_to{~g8d<+IB*LT5mRlu9| zlqjY1<+IGU@sW3U=zePe?jD>KY4)J zCMJ`Edsg@c!%TYr>DgI77`6zi8C6qByBT7EnrKQ4d?g5B@EUdpQhlaX9RgU@BS`QG zEwdp=af<$>9$kQdxtr-6L@*<4GbM(GMre7d^IMp}5Ns+O-IykhsXrBnabS-GApqJo zGr_uOSLdYuM=umXO+St1`Bo6Di(pKnY5l1DZ@maO_e*tyRPH0A zL!agQMHOIj6Y0j0psXsU&X1(fS0iwVgbqU0F&eD_!xly|v!(2Yh?F;+;~ucVAEbZ( z+aEi{2=nhpQs|2l4AEXLn_yIa3)4@}8+Wa1g(+NyjdN$WGsjeqIRqaF-on%wwFP=v zJ`bx_&nNh_{~8bL*$vYpQ(-y@uqpgbh<^PpU5L$ASrP&TQH(>ODCkha8f(m>C~-7= ze~$Bi*QIHTsfkfcT_v=G#-$i-hbVGzd-djJ0A`R2n=D5bKbK>wfIYzv^!yFJ|X*7NtMvuoZ1-8UV=jO!OqGhIGo za!^&-nCcr#$snqRg{OEZqy@poInO^7U}|kFvw3vH!n8_@G5YftDjNsU!d)1x+6h-# z)owUr+~SyN5k%{s?#23%(*I|v{l3D1DR6#Y8SDd|J7Dkk#WB10ciNffK^m3Pof^8< z@9$;1dUm>4t}u(00UPHm-+q|3!e_Sh9ng(+6L#(%Pw{~(JD3UHMXTh_{Z{b<@pvY< zPCQicUi__^ggWr|tr5(gGon;8rq;zXv*a4>VC7ZZ6<;BW9JEd6@26n8KZO1stlQUs zXCf>=JAvW?mI=)4@JN7O#2)@u;ZL=rH0t#HH_8Rzof97zNMMHH3$2%XMeAiiUL+-q zVjGTc*4hCRkA_W&W1>_I($uMl_2>TQ?-D~taKM;RIONw7nONP4Fjm4lT<6djF&^xG z58qO|TG;HtCcCIwOFA^z{H zwSS!YanpP`5Iv6k_Z=b@ESlX0O`2hw#F0xOFKwoaoOcHA*fbLsrVAVAx-J_J!cwSd zi1quz4zf6>nWPX-`F093K?YJ_A9{&mG*pb_`DZiION9&(Nz71`B6&eTD)TD--?8S* z`Nc%chqr(D9I#EObFvLgXCZ8y+clRwrhZCgmX1go44ABh(Ya|%qRuqRtAf##G-j3T zrO`|380}1>q|hGynnvrjfL%IV5VGma#ITZ&58enrGb3Q*+`ZmTrK#G;c6&Os-KUFf zYtothG%r7#%N(XY3pUPo1Ghe=eu7lwK#<<1qYQ9LW*N*2!j(o%jWC*)!7S(BSCh~! z=Wh1W1XFKiFg2mwzt|k3a+yp`-bX*^+Ck&R|Kz1NA5+aO;E07}GOKB8CQRexLaaKH zNlBskGHv$g`blu!$^SF=G^{c8V-m=4L}%T_@n4&Fsx75TNEblVG+B zsSa*rGgbD`yoD|xEEn!ybNtD1KqiMm|D6@g&Vj1utNy48JV+6c3eTS?yCPbx=84sv zIg~2upO76PtE6GU;qY67^W3QA_uG>s(D`+WZF*dLe+aH&XE@UgIM#AjAkDWxyU$@8 z zAyNWFC6Pk^>=vOkWkxbX5dxGbsLy9s#x+`(nEJmuc=0TzOmD@1uAKiqFc+l%uR#zr zKpDmsKxaoY|5w+UMe=~_1x(L8qzTqJe+a55P;h?c*917vXTp=Y7Dp!t<}qBwd{XM4 z!m{3n?X(;+#SV3!i4-@Ip!sWneoZo?i}UMk35Y zmm`C!8w~e+2Pp?kiW&DKw4Z&Qe{|x&u!vbsi;JMH^$F5Rg6&1j?MNvN3->Yb-6Bd6 zg?8Kf$4^iAt* znu@o0@1-h*$b#T6f h>EaFula97vu!Ol*RN4iBLw3M)7o|OpX9Y}&^?#yk+${hA diff --git a/diylc/diylc-library/src/org/diylc/components/guitar/SingleCoilPickup.java b/diylc/diylc-library/src/org/diylc/components/guitar/SingleCoilPickup.java index 5c15ac85..884b2df5 100644 --- a/diylc/diylc-library/src/org/diylc/components/guitar/SingleCoilPickup.java +++ b/diylc/diylc-library/src/org/diylc/components/guitar/SingleCoilPickup.java @@ -117,7 +117,7 @@ public class SingleCoilPickup extends AbstractTransparentComponent { } else { finalBorderColor = componentState == ComponentState.SELECTED || componentState == ComponentState.DRAGGING ? SELECTION_COLOR - : getBaseColor().darker(); + : darkerOrLighter(getBaseColor()); } g2d.setColor(finalBorderColor); @@ -132,7 +132,7 @@ public class SingleCoilPickup extends AbstractTransparentComponent { } else { finalBorderColor = componentState == ComponentState.SELECTED || componentState == ComponentState.DRAGGING ? SELECTION_COLOR - : color.darker(); + : darkerOrLighter(color); } g2d.setColor(finalBorderColor); @@ -141,10 +141,10 @@ public class SingleCoilPickup extends AbstractTransparentComponent { g2d.draw(body[3]); if (componentState != ComponentState.DRAGGING && !outlineMode) { - g2d.setColor(getPoleColor().darker()); - g2d.draw(body[2]); g2d.setColor(getPoleColor()); g2d.fill(body[2]); + g2d.setColor(darkerOrLighter(getPoleColor())); + g2d.draw(body[2]); } Color finalLabelColor; diff --git a/diylc/diylc-swing/lib/diylc-core.jar b/diylc/diylc-swing/lib/diylc-core.jar index 4e85d60320015a87fd7cb5b145871b8966e4c4d9..92b6a30c8fb4c3e0eecd852131e8dc3ca54c7805 100644 GIT binary patch delta 12410 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 delta 12085 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 z zAyNWFC6Pk^>=vOkWkxbX5dxGbsLy9s#x+`(nEJmuc=0TzOmD@1uAKiqFc+l%uR#zr zKpDmsKxaoY|5w+UMe=~_1x(L8qzTqJe+a55P;h?c*917vXTp=Y7Dp!t<}qBwd{XM4 z!m{3n?X(;+#SV3!i4-@Ip!sWneoZo?i}UMk35Y zmm`C!8w~e+2Pp?kiW&DKw4Z&Qe{|x&u!vbsi;JMH^$F5Rg6&1j?MNvN3->Yb-6Bd6 zg?8Kf$4^iAt* znu@o0@1-h*$b#T6f h>EaFula97vu!Ol*RN4iBLw3M)7o|OpX9Y}&^?#yk+${hA