From fb5baf957157cf3e2ff6e81a8eec955255f5212b Mon Sep 17 00:00:00 2001 From: bancika Date: Sun, 23 Jan 2011 23:54:24 +0000 Subject: [PATCH] added transparency to pot --- .../DIYLC/library/main.jar | Bin 54583 -> 54724 bytes .../passive/AbstractPotentiometer.java | 5 +++-- .../passive/PotentiometerPanel.java | 8 ++++++++ 3 files changed, 11 insertions(+), 2 deletions(-) diff --git a/ diy-layout-creator --username bancika@gmail.com/DIYLC/library/main.jar b/ diy-layout-creator --username bancika@gmail.com/DIYLC/library/main.jar index 1fe705d81a6d7fa6abb96a5cfd2f73b4fdb38c61..3097666b5ad2976c77fd746e7e0235055b3e5bec 100644 GIT binary patch delta 5370 zcmZ9QWmJ^i*T!LJ9FUHo6_9Qaq!pAJM7oibp_K-4kWPt#AtVH5Xprs@kdC26N`{hd zL=g04@O?h`zdxMc+Sh&Uea`uE*4n$i80T{d4p2)S2bUNN^Cjaa0J#B4_zCwTFlz@Z zW?kXDUSYSeg)xxBmc+mZTMm$n4{N}FguxZI1P0;&DGb~I3fGqED!@1ahGE1801UqY zTk$c>q8z*7OOVRV|7Ny&9E|S4L3^Xe^1j2v#7x5Q8`es!;$q_W(!X#1zkgUoaJ^0S zQ#BO;hG`n(w=i@zoV|%vO~!~ZF{9lNd!UyO;$mUd!q6THP<>|| z20f}b0_;W+%x@B-H>qG}NcHt1NGFNrOWn{n0d}{|<{#=nByLZIn zawqPUjCb|hib%3lbe0XuJ?nVh9VPo7`ul2IJdi`|ZfYkjaaGPe6SqHie8OslUi}ma z!Y&Oz#6Pm6I!M0M1zO{9oI`X3plgI}J@+l0(2YT~vmKrQ~kiPt&KgI)hw)cGGogOk8RlpTRU+3hK3Vle62trRc ze(+lmsl80gUQ*1t51d1pyBc!7Wh~2)CjEB5CQ*r8rlu1tpihs#a?3VMVPKXGQd!KV z%`~TK1lDOtI!EcsxiJCiB63>%Tv^cM65Q;_EzlZEP6KKsgHWQOp#d5xR4>4UuhCC zfBwk$4X))-o6_#{XYRR339Tqpby`0{Lrg95DAO6*n_b>~_=L$~2&!?pOqOOpzTKDZ zqF;OYBkLLY-m&59oVgCN#U(u*S`QgubL)NByjMt>fl~i8xFBaPtVK43^A^@?> zG$cG^zQ{q$!{epkWuQzg->*`>EV0KmqjN}6&0{B2@*zL>T{F)jd=NaZ{k*thRO_Ic zm|=2imfCYb_aTy~6A>WvYByN-gY{fdK#TcJ;BE3Ao7&Ys@q0EnK{ zW#xLilDVS6rUZ9yT~NE>V1J!Dkz#%St#Nt|J;xjMM zsaxphy`XTyOa-YJaW5aegJuE|`JwP#j|g7dw76jRH+*c*V7-tr{?>|T1% zZ$_TP`d`c_w0O-TJZ+2QawA@|)*fk=^a&vX4tid?R8Aqz1iW`n`yE$4vnp$hRn6~>)+CAF?HX%FP_mk)Z99A+&AI2S=BJ>xADp#GfbU0s53ZxFZES46 zX=Xe-{wr|t438~-q$PPLnU5j9%y)nI{TZso_jo;)*&qE@6iX|-`D&ENT5coIKXra^ zRgM#yZF9uUnQeDO&zWueN*=bN(PJx#4yTap4~2Awqp>A-?74x(VD;jP4;VhphhkmiaSk9Mv57=SZ2RqQGX=kE)R~i28ON)YOmr>#EcFFCQtKTlr z+&;6n<38=DUS@?umlj#lE+a$#484LLc3GfZWiF**P@(ez;Gd(ecC@_QPr=K$)`OTA z$1B_2z18QI%`3q#(52aZ?jjj5v@gB60v0YuqJ~2eJj5YAJyOfTf!hqcGpU{L!VdLT z>LhF+$w73hq{Gu|yow{q!GK@EVq^34dkYNj#GGAsA-j(a$6OHj4l5TqN~IEZh?-e8 zu=o@0bR&i-*J%*>s=a}ZIwCJttbX6#z4YW30zUFX6O>f9Z}4Qw`1FI`oE3Wv6~At} zbaPkPf)Nq&TLcU7_Ex+dggZz)96FVn#i+og83WWf4&dWtwa@>i(hd3eqi>Ri4^{W*uK*nZd*&|q%ZAC_!>>=Gb5X%mSn2IA`_L;QtS_IM<>cK4>qkh7Lf}2^Q`9%y_rZ8d5e=Sdyl`N`AkK`Ol7tV-Efw@t^H}V zvR;KhJ7n|GtmeYxCSiIaRJF?sFLNaQvU}^q$=T7g{^zKDaF_AG10};Z6FJhT2~pkZ z%45-9Stidt_EY=%2}ZeX(=^|j;syF*bC6y-t^HY58lFGq`%dV#6`|b;ab1`jXNEMwTMD90X(k@@wVH7|XTPC*IHsw_(|s7TyA0R! z1~ZsQWmLxnH;EfUpdg}GIvi^ZQ6i|}%pEb5I5KUXusc6_ymW>&JSEzQcqbSe&r9(m zz&~xrZoJp#Hf3`Esar7MO2fs5!kU6$(c8t2RVaz-eXR}(`tRJ5 z*;2>`g^o}Sn#xNnU_6eU9XoxB*3rmXJtxIQMbT7fNoP+4RK6e(%Lz zm5Umc!z)(dR;`XT!+Zq_AYK?cSp?2&_?DNd1&fzknX7?9Pw8u$@Ohm+V>|cW^rCSA?pjwoVST@@vexl?0K`bFS19*R4FptG5mh%G7A8z{z=C z{+e}#mujb{Fh-Vm?^EUuVw>xjyCFJuGjxvJ!CkvP;Kk6arF5I4`(8AmLP(R8f!L|e zhazF#7aW~UDMk4XnW93Uoh3Y@zqJ4$pd70a0$fW~D4I5;d^=i(ZA1lyVCA-HC+4V} z_xA3{y8NCTVd}?Kg}}hfVBf zFNY3@^t36vf_cu{(!`uxXKU+=S{)r>6Ww4w=u%)Yp>mz%r&k3GyY(xwDb838^&! zzPx2464PwTvkI<~ir$?9IPTYgyGiTJ?j8{PJ=XEqB!^2eZKpzNtaH*9`x`PDGJ?)K zpkM62^fKi>G|ouY80BLTF?jl}Hng4cN^8EzrD)yt`yPJuMY*qWNeC(QUYFK-qb5DJ}9spC%e)G3}o) zwo)5YYL>g?@&$HT5>jQ~!~U*ktxEoR_6w$Yk#&L-#c6f&qAY_ox>?Vf<2|$jo_NGRegO3; zB5-?j%KrRRk_sFc4LZYBne^dQ$nTNHmUFnI)H02w{GjX49Fl1M1;Sabno7ItDSa{S z0R^lZ6y%&V6pAgF{`u-444`nPa08#J#*bG#?~>$0?B$B_we83)6DZpbIAZZ^_{#?D zBlcnJV&BYqC-uB30JZ^N_Y%eU)}U=-vfRle>l$$#k9-FU>;^CF1hUg@7%MN~uXhg{ zYkS>m@1u%kGFq$#`A}DLalBjn?KHk4dOZU6vEcFRfo@GSa*^yeDj^%pDU^U3u zVysZ+4I<;WQ}S48r3pPN>sLZ*QW(yj>HEQfU#aA7EabACMjeu!^E%c(9yE^-O4(h& zxl(|g7|JfJ3ov)bL^=&EwgerbgSXf`J!$2`Il9uC!FkcMRA(gnsoXnc*GVq*luM)> zs+uLK%$AK;`eV``kfnW2$5)@Tt+Z04-h~$~%YK<;c%-B+mq^mplt!MhkMFNB5c+13 zAXsFcJ#Sv#bGuG)Nk%OANf_Je?N3HCpa%pbJ~VaInZYH6B+|2d?SxR&+ms9H7w5Ay zXi+zQw(*Zc8l>j<0!u85YM$V8cHJl{f0^Tzj5lF+hygB3?EyrLu_zI*RM|RV{->eU z=>l%Np*)Fa?!*Ef1?XHc-GrarB-&aJboO6P4Pr|v$cY4LE0jAP;J3zoA`!3Avj7Pc zsdg3PvyePoskoryD?5a8$uxM%lemJj0D$5mBEJbY2za#jO1;-|*lej_y{ft6K54D> ziA_d`RgYC;ZMf~xDwFt1g#d}?L({%8795nMsY^*quA*zu47Fpx0wY|j~( zq$No59{2aUn5mATGAV*GE@cQHm6=Y^aR$J(tsu(|2aCk?2{oC71(%)3KJDEp*hoNg z(v$YPRRcd#B-YVUCBy(fzM*MB1y0_jp?aHC&&sQOVUF{0IHOVH#U9%(s(&pQnH=fo z-FWYrV8X=J&U0uKj_Seg^THfQhWO>ACeh5m_vWdb?-x>R&!lD~1P56q8?hLNX+94g zxnnu!;|Nn0+Ek^0NgK|M;p*6Dtn>q7B*R~?sM4MK%|pI)Z1+39wx$`4umD9`bp7f+ z;XgSgJ0^K}66@x(zP3DY@6W5&BG!CIP_^OnJM#{mb+#TqRos?zN(-r@)cPFLT`|@1YOd6olm;2|L(EAY+k7hntG(=l%1jMhwHGY7_s6n$cM}^(aRxY42Fly zFyI?D#gvX3cEsRp7=nS-$PI=^o?;?q)H4iTqRjtis5Flo53wT&q6SuA# zz?-Ss-v#kj-4|9l&H@YYrGv$c0x?z6M;QVB&>OW3N(bBjt6p8JbD=k?U<3t>C5#ZZ zISjlh{!e%LPw}hpn}qB!_8a5Ih50>4%{ zV2;&yiDv~8Xa_IVaqW~-{k$+NcOJQ$8w24z>u* rmefDqx8?tN)hAgoJ2_7>0=`xLCss|~TyOANr2X_)6vnUa!Ibzvs7%F` delta 5278 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 diff --git a/ diy-layout-creator --username bancika@gmail.com/Library/src/org/diylc/components/passive/AbstractPotentiometer.java b/ diy-layout-creator --username bancika@gmail.com/Library/src/org/diylc/components/passive/AbstractPotentiometer.java index 9662613c..b6151fbb 100644 --- a/ diy-layout-creator --username bancika@gmail.com/Library/src/org/diylc/components/passive/AbstractPotentiometer.java +++ b/ diy-layout-creator --username bancika@gmail.com/Library/src/org/diylc/components/passive/AbstractPotentiometer.java @@ -3,13 +3,14 @@ package org.diylc.components.passive; import java.awt.Point; import org.diylc.common.Orientation; -import org.diylc.components.AbstractComponent; +import org.diylc.components.AbstractTransparentComponent; import org.diylc.core.VisibilityPolicy; import org.diylc.core.annotations.EditableProperty; import org.diylc.core.measures.Resistance; import org.diylc.core.measures.ResistanceUnit; -public abstract class AbstractPotentiometer extends AbstractComponent { +public abstract class AbstractPotentiometer extends + AbstractTransparentComponent { private static final long serialVersionUID = 1L; diff --git a/ diy-layout-creator --username bancika@gmail.com/Library/src/org/diylc/components/passive/PotentiometerPanel.java b/ diy-layout-creator --username bancika@gmail.com/Library/src/org/diylc/components/passive/PotentiometerPanel.java index 0eccf19e..6476c3b9 100644 --- a/ diy-layout-creator --username bancika@gmail.com/Library/src/org/diylc/components/passive/PotentiometerPanel.java +++ b/ diy-layout-creator --username bancika@gmail.com/Library/src/org/diylc/components/passive/PotentiometerPanel.java @@ -1,6 +1,8 @@ package org.diylc.components.passive; +import java.awt.AlphaComposite; import java.awt.Color; +import java.awt.Composite; import java.awt.FontMetrics; import java.awt.Graphics2D; import java.awt.Point; @@ -162,7 +164,13 @@ public class PotentiometerPanel extends AbstractPotentiometer { for (Area shape : getBody()) { if (shape != null) { g2d.setColor(bodyColor); + Composite oldComposite = g2d.getComposite(); + if (alpha < MAX_ALPHA) { + g2d.setComposite(AlphaComposite.getInstance(AlphaComposite.SRC_OVER, 1f * alpha + / MAX_ALPHA)); + } g2d.fill(shape); + g2d.setComposite(oldComposite); g2d.setColor(componentState == ComponentState.SELECTED || componentState == ComponentState.DRAGGING ? SELECTION_COLOR : borderColor);