From 4d6e994555e9ff0c1a50564424546e2c788bcfc9 Mon Sep 17 00:00:00 2001 From: bancika Date: Sun, 30 Jan 2011 21:50:24 +0000 Subject: [PATCH] added resistor wattage and capacitor voltage --- .../DIYLC/library/main.jar | Bin 77710 -> 80715 bytes .../DIYLC/src/org/diylc/common/Power.java | 5 ---- .../DIYLC/update.xml | 6 +++- .../passive/AxialElectrolyticCapacitor.java | 10 +++++++ .../passive/AxialFilmCapacitor.java | 13 +++++++- .../org/diylc/components/passive/Power.java | 18 +++++++++++ .../passive/RadialCeramicDiskCapacitor.java | 3 +- ...ticRadial.java => RadialElectrolytic.java} | 15 ++++++++-- .../passive/RadialFilmCapacitor.java | 11 +++++++ .../diylc/components/passive/Resistor.java | 10 +++++++ .../components/passive/ResistorSymbol.java | 10 +++++++ .../components/passive/ResistorValue.java | 28 ++++++++++++++++++ .../org/diylc/components/passive/Voltage.java | 11 +++++++ 13 files changed, 130 insertions(+), 10 deletions(-) delete mode 100644 diy-layout-creator --username bancika@gmail.com/DIYLC/src/org/diylc/common/Power.java create mode 100644 diy-layout-creator --username bancika@gmail.com/Library/src/org/diylc/components/passive/Power.java rename diy-layout-creator --username bancika@gmail.com/Library/src/org/diylc/components/passive/{ElectrolyticRadial.java => RadialElectrolytic.java} (91%) create mode 100644 diy-layout-creator --username bancika@gmail.com/Library/src/org/diylc/components/passive/ResistorValue.java create mode 100644 diy-layout-creator --username bancika@gmail.com/Library/src/org/diylc/components/passive/Voltage.java 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 dc6ff14fd6eba84901f6d357f70e9816826db50a..5a66d344facf62eafb2e729ad521c89870299d20 100644 GIT binary patch delta 16685 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 delta 13834 zcmZ|0WmsHIx2{VQ+}+*X-GUR`A-KD{(?D={cXxMp2=2k%odlQUK)!FCcfEUGyMN5P ztLo`7XI1yrqsFMJ@q4i7EigC*=}%xVARn*XhB!EC(5!|y&d`r*AJNBkkK+BB01IFS z&22~!0C0W49U$<5R)EL{-T)jQURK9mFl4KI)yx!~WL)p^XOrD911-|0N~oJlIG1m3Q{9ooRuLzn`-fU;ayRxi5d~ zV-=2IKXe}2tAER?db2PeWh%>_WZpsO$-nWIk!PT zpw5mrZwc~!G>||*_!ATti4s;5NPti3xDUvG=%DCPtYq-lR}owjm&<~BRZkloG}rWr z{j0F(U_dcjs5R6gzBa6?x?x(cbMT|ijoWw@x_EA>uNp%2N39Loc#?NrbxhX0;r`Us zGgIsM;@3~wS@PuD^D8UuYQ2H)rH3*b%pPkx$N_VccsI+S6ZQ&Whu@tjk_X6#)nCCp zy-f^pWpXV5abt@)+ z?YlhM{vC8J>m6~xk8$3uC=O)bT{G~8+%l;}BC${E%MT?-j)66=QI_5RvXNPs?b&YF2Do5Pocj&%9GaCkT&?e_!{{}xa;J8ADHI3+Nf&1IehqKuL? z@f80jb)o;@%*hyYrYxoWOGvQBl3ecvW2vYT!&ta@Fjb|rvQTre>bQ@j;OK0k1yGO8 zWrZZl$@mX9pwB2hk6Q=ywBVuu6jYK`;)?BXv0elWFS6P0W_Ck_HMjtML2+`4!kOIw ztC*B`-&(6T?~Y}E%m&!WDZvtIG{X{6elQVNDek4}Z|*F8)o>rhE!`cfCL_|DZ9cR^ zN#Dj*M18-rFzcLt(wyKy?V^-Do7JE>m4I7TjfXD#qO7jEbgRNB3{cmIy6}kc5MVehox8YkS(sOv5BW3gDH0=SwHEb2`S;U zOr|>eNRiduRz-L2HNLVlBd*AR=4LGZ&mO-x_P878y1g*ywL0UV0OF&C_44?U=0tj( z+jabmgZ=W(L`xuTvYPX{!sXebr0V#>QE4Gbw%~lY=t0DS)++Vr&q&sT;l`18_{pV% zmC;(G>>Lg=_8>Zy(HxI?63*~%^)^-w#(E8gWtSD7Xl|5ZZ8d7XI>G}U()(ndWn4SW ztk*Xbz}Qpb#p+*w%0#*;3@ou1=|{x=MY>MAWAXa6Umoi< zQ3x|ynkyK%N8&49)RkW4u}C)N*P*woUiqs=>{Yzq?uHk-XM~XK6&VyTi)r$?V$+$yC1}0x)z9t>KM#bv` z?MUKIWkVl30)g8(D8GZ4q5qf;{Qiat8oeO%X2=b6*|lY>P`eWyoFw#BQo$r*+AcT+)iF;8wsQ+)$-7(x9Hz5 zyj!!0x))g(#ghR=$bF}{Ra(r!r zG1UuLNOY$UjI}OFW0x*qv_i1NRNZjp^=Rh{>4I*GYL?t6>~v<~Zb>Lf6E?Qdarv>Y zlc$fPYa}~1hE}#J`f5=lX`ShIcH*%qtJEidH`-hbr|c_RvEDMj_^p2k#U#{QnRrF8 zcT9|f7KTxb%~GMoh9{_No$IHeqft`KqPZ@R*Nl3ZZ~rmkNU%vpNt^Yjgw@1P{VCjC z|4wpcOuJU5B5oSnqO19iQe2K%$_wOmctA~_GQO@fVfjMHI^q(8T~YL5HMHHu%~D~< zlEY``9|Bk2b6REibI&O8viK?bpR<(AbMfuntigrPc}|C$^+euCKxxgtiZeAsIbcTt z8v~P(qrsDBMZGMr*UT++hwm#6YIJP1Z-sj(bI3Uc2_)?Mx~66rzl;i{B;sT}JR%sD z?R9*G>^g|R5nt*6Vv&G03e3!gCpSa*_%gmpEzj14W=NS|l$JQ*zLzAa!W2pHzqK_d z4{J-;2Bx5B8ar!AQyp!xJs&Gz;~N8=iH__pX(KE*sZLEy?m)5nN=tMj%q;YgJ1{!e z8k%g~7~PAz2#nY}7rx#oC7h81j;uTVlR0-cHLEReb?%DOfA+Hd{86(k{+yJ#9bY;|1&g)!IWYWWjfF(mLP3k9OAT-;RRNeu(-V z#5tyLcM2sRb`zKpv`B;JY*Prd?2NvzQyW}IIoIyXBR^*-&{YgtZQ6^raz8*J<2*uS z%=18YV-V6FtVl+pdFdty*7{Y9+l=5@@?}WWz>Ad*mje%%HC5FCfXQsOhq7t7SLLn+ z^RUM{*xR@IP2$EP@HgWB%!8ob=RpDj_WBKyXW$?pMX(?s>>vqBi-ZZ*nb<%z3w2a= zEZ<=Agg|7{0Ijm&B62Vrq{dZ4)lt7e@o(12408sDC=isa&ZdI3FH#RaTMuvF4B@jq z<<5?Nhx=aG9dq;hTp6PvC4J+jyy|k=IuLl+xO_Y7+4=)A6QDN`x|bNb)4QXr-U~F~ zgCh?_E;UFLg3UvYOi+}o&x`~*90WWXKM|zqz#F>ky?qa4 z#?VxBB!|>0+F_yw{0$aJrFxK^Qa@G6acAuzXGnCTcvTEIL89RGl|=zy>?NTsi(*~}t4m>ro?t5}DIz>2>xm4bO%8#2 zablq3uq+wFDiPR+m`V7ssCdDnBHPS+z za5WoMo1q4T4yiSMmLOcPK9G@Wk^y8G!dCMb(xMu*pEi!#l%b_)$&Mtfl(JZ~Qo2my zqax`XCi)taz)D$|nzkj2O5-PU%ySmYAkE>hD6KANkv8!VhUNiNS42&XGs~(&nwqIP zQ-vhBa&de`g?&7iRJ8kv^tWl8+n~pdi_gebCGdWzsel%m%SdBjL#pl9eQVVD<>)}Y zl8{!g`W$#ht{qgi4>jA)urVs;*6*0=ne79A3s7%z}R5RCP1I zlvq6nP#rSS7|#YG6Wvoq7s$ueSuUDx7LQ<^Sb{dw4JCC-`C&@QQ@C^jTaC<@Gh!cH zYQR)oGq3NKtyOZ0cV%Eo=e!?zTcAv@IK)0WZe1WO|?TRCvaE@-a*c0)DkLBWg=acY@)_6EBz#rW?YNm z5n?T?#EpEvD=L*n(U1V~l);T65Jb1b>dmkNEAWD%=U}cU%@sI+vT83V_~y7sw2KS9 zwaZ(5$3Fyg@KRSdvvR5keRrp!Ib^SqdSGPL8TF_^sg#{e*LXBVv3^;c3HvH>uy@LQ zrN>P@6I3<49uEHKU{rQEYDldB8bN@GX^I~@`)3CEV#ML<4f~(lqy|ta{hM zU5_JRRhJxV!Q*PDnn$itJ)INmjZb|UXEC+P;mZ;obUT4zaG0`91p`N)!I06}vdznf%Aci-?$w@; z>e?+3;`o->lIGp`-+q4beXGc404`&M_B?Ds% z18W8&YXc{zBsFMt+#l$_A*6B0hFNrLzloq2c0?gjNUd`?bRiQPNH7zPB@1J+Ou!jV zFcnO}Ew@UqQk2*xENx)AZEZAKScxFnn$J7i%@1xo&~L0cJtKO`$zS0|#e$@XIB$1f zbbDQOTzPE)vr2wHJfeaiZ0jN84Q7aDMr=>IOJgDK>_AywFEL#Xu6@lkyK%+1(!Y_z zxH7!4#kexK(Z#rm*nWHT3q=$+zm9`y-Yww!#f(fClMBc}x+#Nly)phIFiD$ZaHFx* zjU|LDFw!L(#lQGhRZ+HpQQZZB?S^cXwxy-HuhBQex&8`*bDgNY=iP4w84u{nO(9aLbQ9?KG zU^0&%A7w%Rl?_J7FY%Hu8}A$k>tZ_68K$*vyxs{~HHSSh&~Qc5P%0tILdyx|?OEfZ z)(`kaf`gwgeazM5WmMw_wTHOeXvv1?7zc~00VV(3hB2_lTi-v(m4wWu)yf!;!6V5TIwYh zGNRaem7mHP^Wh_y_R^Im-{f##ie=Sv=7NFF5`?Ucg%+CC=Sr6N0GkS%(St?N5-ARI zi5i;&_O&c>t)?kQkhfrEZ~b|TU@$TDJLvNR?mFL!r~sMs0{C_-#cb?t}ZpS%5JfZx>qu_)5HfVSO$SU z#oU{+@_#D8A1KfbnXC57EHUQ~EY#J){V|R7xiC~x<+E*;-l8Ijbof_}^b$JH^Yqn9 zRRU4!_sR7ymPs}(*I%iZ@F(tO4b9~%c^#(_l{7nK?O^8{g5_d-#5-s1N`sta-l$u< zRa?n3VS6Y_U!=JDNG5k}F|gNxq&p0kJ|SX|5mzMCyIv^WF%HO|iD2}^HRT$LQL=*b zj_@x8J@r=8?{z&&7vfloC1VD2Gp(WnORh!k|1<`g*(cSv%*n;iO^&OJy@t9Q92gQF zM9f$wZhU!U_9fXVc}xq;*((oJjQsKl?n~V#tUFjk_KMRJcdhj**MD^bgoI`^3NkWJ znF;ZQ<{yPI*NpKJeO2twxu%o2GwYw)oHAzFko^7_5!kb9hw>Xitp78Y#2-;5!TeL{ z@0iFbrC@eBl}hmFwSU?==}DSl`hO|Yd9pL`PEGUcJXJ@)1g>gvfFuZcK7d*l$G|Qt zY#92m_|P>k?F6^5q6dwH0tdV)DsdaI4#=gdl$653r_`5S;L((3iEU-DF@&Zj%LzV!coKobOtFsEt1A>NiWr;lb|@?lfG1I;))mt zKo}69-PuCn2sN#D)%a}`BHcB9-?0hu_QI4QM({t3MyX zL8!SqY1@SbEiec(iX&^yKZ7EJ1~k8`>AWE7Q@&6jq`Ez8+q!b^rrKtm-A`}jneEMA zl+zVfrd$i-x{i8doS$}j-2FgtheHX?7kV0TcH)7sDmk?li$M$|YTCX};Z{CDZl~%D zxD^kaV23kGEE0G2@B$dfjC%!B10jAdc%uuELS+FZtHAPS8g`uF3jgwEuySoxuekDi ziqhGNwTQ&?tbSv3FP9j#1~Ua#aHpuQvlI3tCJ{a8-_KRI_bZzO!JcfIfHbEhAJBG8 zZ=ZOAg^JfM`0fk)&O6Bkv>DG8^%MV#io^kWec;VwlYR2jc4>(E_C0wc{8eui0rq-x z=-Sb2z1~GHdZ#`?`~#LASIjYZi0qbo5HDrmya39?i zk2||=!A_Gq{-xWsXJ=m@?u{T0;_iU2ZSyW@R|b>oPQvHZ|GdtGydz6~@9;JRHtBF&f*#U&WB(;g{gp3J7A}S7R_}uQ{l&J$h2H-NQr>jMC4vz$BF$Gy^u=2L-8t zAkGb(`2_skaIhudarDeI%rw;k7cFbA@2Kw(yB8?IRV&tNpgA2_hi%5qG1=F~bb3uS zLa?{(fGiJ&@aIA!04aM=IrHtLcPGFBYB!B3d&miok8u|qnH97g&-5&uxz}2vW#V@t zogf#5zG^=UzB=;;U?|o202~}Cl!%gd?PVV5BT}N|sF&g=YcW1G%G+j4;>ISTZ~@5I>QRI zXnzL7ox%56*1ssWXbYD%a0ENoE*H_r9ZtYGAquly8)II}qR8*0?&Iw2-a14 zIcS4KAP<>E&rriub}-@HL*p%x*rilST9VXvhJK-*H+JpMg<_THFNr1h4xT3W?yF(|>lhJn8?60AZ(OT3Frz1g^)I4;a1B|Tw9df$sy5JDysl(`nH94#Df?+Gv z`eFq!zY$q~D@(gguH@}v6;y1hBJ?UB5F^y48b6lxpUzgI2Ym0DYS*JvB z0toZOo{s0djC?hVT@rwh4Czwn;zstOoRM%tvn7}_?HLPr*s`RxTnOs(`&s#bO*5A> zv$P%e6sdCij7KL|^gQT+d{1XqoI7_7wjplOOaCKb<2IOE)&gZ%I~`Z;7iw;MTI#fv zJyR83T*mOaVU;V(_3p1`HCAV)%}poIR@{PnCYdYJ3_+miTF1aAJz^;mG_^Bx2%p)g-LUn|`>%&Vi7ICLf^6>9mGaO^M>ArR~fx1IRyh3Rh1r?TKZFNDndcLuU_uH zI|Pou4&eto0PEc$JSnexGvAZPn$?|TA_8R+YWCW=+H$pKx7GB#x1|UC zG!vd961p2nNZM^=R_*^s*d4?XsX#%P${$A*6${fyyAarhbtL@j?f1hy5TcMDS2(qo zENAY?JRJ5LY(fN_I^SpzI*CC@Eq?UXv7XW8bc}@n@4(O#62~5~fM;ri#H%}7=*Tr! zi+jJ@t$Yd|s5{I1%$W^y`thccumRN4+SH<6V31CWHL5R=OpuE>m&F#RnG|;_w$e<) zg8&4Sx)4}>8Qr((A2$zekt@-=q&qJ)qGBViZWwM+w~Ur>Q8{$}wZ}EP3A&U9>(-e( z`T-6K%7vn6C(gZ|GcEtZi*nzBn&_S7#o&||Ffx3)V^{b-5BsNs*0gy9%99v^H zw6g!(* zhBd$|*>Dtg^=pb0mhr4v8n!7nYan`U1Qc#X5q>8jahQj;WV)1A|MYNWqskZXD zS{Z%Z_F4IfI|^<>L%Wlva+U*N2VL$&tk|@#GzHtjmV8d7q-^RoW*pm4Q<`WKN-kTg$?*Eu+rRQAzYzEcX;U;A6G@Azouk( zbB1v(bs|k62OsH-5Yzg}vFC6pw_gsqPaq=7;;58o50pkFre~Pd2slQLL$LRn1o~&g zKr3U;c?E{owDq&m_Y*o;$}nJh5c!xi&(c$25zDw+C57Gw3BpdTUsi>E6XA52I{}dK z@g_es<(h@lM{E#)hgOIABHB4Nm!ceLE;A1zu_rqD zfD2Vuz)$YS!=0W;L1%=%aj4mXU6#R!ryA@{7^v7!m3f>93IuQ9{;<`+XSozYldg_L z&5#y#`m{uQoyIgjSOxs!+gp}bs)8eZCwv;*vAY%e+v&V^4+M7ZN(+Xf2Z-k*h4;M# z0tY4PIjah&3Rd3!f(TZUiglU!3_Uv7yRn@YmVAdMPNhBD79Gj+)wJdv4(sy-;^;%|I&dwmOD1kmCcHF;zq zHke)HHecMOFwRfWVieaqakb#}SAK0z&)lIH-XCO<}6P=;5iO|3NsvtQ|-Cg2N_h zAw?jYQshj_VIdI2ryoMLhJs-rGH7|iGZsUWhl)P+? zv!%Ip)pAku8}|9>>vUQgIB1~4<9VCgrN_F{)Z3<$sqW*JQwpGQw+QTVP!hYu5b_Gx z1NvKfn{8_F2BVYRAEuK&`p52tL+2;NpXXUJn?w5>GE*!b^5;)LyB9lMo0Y^~FNf%q z&5?$XRKAJ*HwSN!7$%Rz?~ooBB6JT}2_q)nWI}r*sOJ5Y?)Q=uIa2Rw&cm!6eF=et zUbCC`e|NJx#@f*YnQp2*>AFvhPu--zXvRJ2=3ma|f=CGE*D?VdZ!ifpV~^>PHPWR{ zK}MECfSuN28~pKdltM4E1!L>+JGOD$neYS>94tRkxTZ6Ok-E#*nVZV=&m;y`Ef;8W z!5;0UB`#~oCk}aS3DNfRZ->~k6b3pPJ73iAuj4ucMa|^!@y7PsoqQU79-wW2QqoqG zUCzS{s|eIoS#1JM6*Y9oS%!#Y=beY*KK<+~>RBxjXVw%(xZ^6rBQ~^&CjJWHDux%u zCY~?kDij$IWTK!4b=R*FvFdoLH^Zda>M(v)}2w|@v~q`;}R{qkQ=*Otc1 z45S&Dl{0l&i?1bbvlkD+w=rB;*idVt&oF7z9E+zBZ~UI`w$9e62pv^HMjI%)5unsk z3sYG%qhz|XpKSV?ZiZRc=nyaeXcg67Q`xG%qKR_LF5|#-E?Q!fc}chkr1;|SiJO_Q ztw$Vp2{*uSjxVlmgwk62Yj<#5E{ zTO~w`hf}$|%Sa|voSGahaD&=r4)@?Yd{(q+nyq4n<@v)os?mL7Swf*4Hr+A;x!fhW zGpZx>O*^Ugiv;)y4vMYrsqi5Upqs3#&05~K)X9D{XC^I84M_xXC;taB=^-_Zxr%ss z)QoZhGyYBBSzL;lV>EH*a$kFHH?_hnxxvewGTELMOtFLRaAW{1&^?*m3>{B2Br-mL z+ZfH6WhLYdhJl5DBoPwt^A(MAd-YuKC#jyEH@BJy-$9&WZTSLsBhZi z9`-e!|4&kY-upf};H&ts9r`OmkNP#_t72cywHdg?Y{52D=_+TXYlF$FSfAbvXY->Q z&oaK37HbGX8O(2gAk8DDZle8oxIz{bQmn4uv`r1z99TVib#~z01HB!C3+zLACh>|L zQyX%3%;|0fCRFTP_1WGI)`m3bY8T3qlA%WW`K2_&mQB?vP@A$@ucunkU8Ey~hu4#e z@W!BAMIfYlpmuT;F~<;L%Q{$ANmZ32>-h3iVVu6TTw8&9{(BL3))mG^@z5H1!%8l@ zN>u6)iBUrJ$s*5!1-{S&uXxY`O{|i0>lbvEM$}U4Zi-=Qr1JTLVMS?v%WzH8%}aLq zu>3Q(8|#^F;6Sv>Kv$7D>hG>hp*8V%jpSHvwa?361XQ!$R!+GPlj`>shmV4yBSyy;qyWOP>#g@k4tPM@pwpbE6>gcex>ihurrdZ*M&hQoy zuAY!}`8OKL5hnG;-X~KvXkO2K{)ZB&NZy#Z0sn0CQ?{Xr#$ zD1^Uys>^J52Og<*|3LoRjc4}G2{ykc1T|q3Ac;Bww?bndR*i~8F4*_B5gOMaKy^pC~w?Zscfdmw5T z(Ka?<+A)@HNX5iPg_(YFMq-W{VI3Kv!V7)_SZ}gHkkn*Be*84{; z;yDD-sg>U-wa8d8YZm5vfC0_-dJ?VqVngzfgYo4|iJD;^1jB|+D z03DWHyI?&0)6Z$kn`KbA=Tntryn>yBDm`AbjA)ssy%Eu6pRC*UkMYtC($eh1C>8=1<5pATSi9NLw57P|<*n`=n#|?x%{3^*87Jog6vStxWuyu#2nx7Z*@)%i z3hoMxH%px)4A1x^*fbc)8}<^U`dq!EfX@>V&}hPDLcdOt36!MUtrHOONI94n^Vynb(MqlX>f4OkR&Sq|l)_b+7OB^mB*}8e zO&qNXD!wym875x|M;v^$E18Nfxqu$npP4ZlYqzv;EP7uzrI^M-ZxYPIFxH~R1|Gse z5>sj=YZ6DffGa!D5h{Oa9^HvP%R1BP7wld*s6X-Fsmp#%{iJ}evJqwLmpPF(W^soH zzd;nDD#i$r)C4s;@JpkiG}Sw0e<~-`_SW9K%VQUek8+nJ8}m9K6!Qip!CPZc$QjyQ zY_P&zcJRzyWH7^BdhmTa%3uea4-oMxg3IrXgr_b?+_YOyDqK+hFj;j;DJ?#N4XB~ zr&arJZ$kJ+_1|-QAHUKh8G6Ub=($-|a%Oy23Xz0`&HXWxsc4Wf;V)@&?)md|X{?lI zT#YWvRb6F9nTo}5YQ~f;gcyxCP2j{a(BkPa!W{mh6UJuBfV3oAnQdI-(84Xk3pbh( z7u{r;Xp;GdUABcWCjB^jTn6wNC+V=rWd;7k#Amw7*hjb82QA|yr#(ZQ$&cc^kDo2m z3%a7O3#vhpm}}y2xUGQN$#)13SDnWTx&u`xzz_b0+y2I?^t*)O%cp>b?IR-Zm>Kj3 z#Bqoa6{fhRK;}68R~q3I{GY`4H6`P|AxRLE^SbgR?2#DqbV@E@68ymD7^G3B?K4rd zox@yL2h=XrN~sCqN<)|YWPATjnp2cX;kaB=#Ec=FVWJ@4=zXgoYXPF06>o)b<6oUB zDU+~DJ{*McOJ=`N7};m3zf5YRq@f}4X7wqP^>vG({Iu^I5Fuc=*$f(_D$IlV4o~U_ z7wuv2MOPfO;j7n50m3>kRP#!?Vbo*6jvAcLhfzmF#1~;!rZe0{wX!FbVw(fv9G>hH z=aV8Ejw&0up`tY#&L>st{LBpk-hmk&Oe+WGoaOewRuk$v8))X{L@Yhg$fsgXa=fD= z+wv=)>|bY{&%t|PTMEiUI_iAMXb}9#LAGUv8MwYsBEQ~R=F2|I)ZXDVE1!{PEp>Py z;BVz^cCEG@TUKSf;K1=7h0eP}E3r#y@Y(M8?$c-XO2Q&;3xOjVz?IOAVznp;GJ_xJ z{qH~bhM*0szegq3_Hh2L20a{T|1GPYa3g-K3dKIc{yo}|^@sU`Ei(`Rnh#;iD-=Kt z;p2@8CV=v9jSn{9eJLQfAqANd!2Ny1<(oh4$Kj=seko;g5H9+Bmh%^AL4_eazzJ73+2B7glVp@Ru2R;AG z`TvrR4xsl@AN5~e(gAco%5wAo%@3B-0}MZizyQ$spbY~+`-9^Q0ILsjF#;?;SnyvW zFahL0%6d%yvD3o@Q2Z#PF#m@p%z|6z5|LYKjyq z01q^>{Np1j@@xS3ltfkl_D3ITJ{qbk|7mz)1z`TY^|AQfQZfJpMEldnrqzF5h5m(Y z|05^+tNho(;XlInhm7iYSCXe7umdRmD*uyG{%=P4U&_(GcO}<99sgGf;a^I!(RU?L z0^cNj$_mSWhv}c03J3`Eztn%GKh!CS900<Zw&XIO#j!7=P&+|({KX_KI}+wzuVcq{hx;ajPsx0KM&{M zzmeVd=jZ*G3DnpBQ6i> IMPROVEMENT - + Resistors can specify power handling + + + IMPROVEMENT + Capacitors can specify voltage handling NEW_FEATURE diff --git a/ diy-layout-creator --username bancika@gmail.com/Library/src/org/diylc/components/passive/AxialElectrolyticCapacitor.java b/ diy-layout-creator --username bancika@gmail.com/Library/src/org/diylc/components/passive/AxialElectrolyticCapacitor.java index 19db2b5d..5fb9c3c0 100644 --- a/ diy-layout-creator --username bancika@gmail.com/Library/src/org/diylc/components/passive/AxialElectrolyticCapacitor.java +++ b/ diy-layout-creator --username bancika@gmail.com/Library/src/org/diylc/components/passive/AxialElectrolyticCapacitor.java @@ -29,6 +29,7 @@ public class AxialElectrolyticCapacitor extends AbstractLeadedComponent { public static Color BODY_COLOR = Color.decode("#FFE303"); public static Color BORDER_COLOR = BODY_COLOR.darker(); - private Capacitance value = new Capacitance(123d, CapacitanceUnit.nF); + private Capacitance value = new Capacitance(22d, CapacitanceUnit.nF); + private Voltage voltage = Voltage._63V; public AxialFilmCapacitor() { super(); @@ -41,6 +42,16 @@ public class AxialFilmCapacitor extends AbstractLeadedComponent { public void setValue(Capacitance value) { this.value = value; } + + @EditableProperty + public Voltage getVoltage() { + return voltage; + } + + public void setVoltage(Voltage voltage) { + this.voltage = voltage; + } + public void drawIcon(Graphics2D g2d, int width, int height) { g2d.rotate(-Math.PI / 4, width / 2, height / 2); diff --git a/ diy-layout-creator --username bancika@gmail.com/Library/src/org/diylc/components/passive/Power.java b/ diy-layout-creator --username bancika@gmail.com/Library/src/org/diylc/components/passive/Power.java new file mode 100644 index 00000000..18f6d77c --- /dev/null +++ b/ diy-layout-creator --username bancika@gmail.com/Library/src/org/diylc/components/passive/Power.java @@ -0,0 +1,18 @@ +package org.diylc.components.passive; + +public enum Power { + + EIGHT("1/8W"), QUARTER("1/4W"), HALF("1/2W"), ONE("1W"), TWO("2W"), FIVE("5W"), TEN("10W"), FIFTY( + "50W"), HUNDRED("100W"); + + String label; + + Power(String label) { + this.label = label; + } + + @Override + public String toString() { + return label; + } +} diff --git a/ diy-layout-creator --username bancika@gmail.com/Library/src/org/diylc/components/passive/RadialCeramicDiskCapacitor.java b/ diy-layout-creator --username bancika@gmail.com/Library/src/org/diylc/components/passive/RadialCeramicDiskCapacitor.java index a08da93c..723b4ccc 100644 --- a/ diy-layout-creator --username bancika@gmail.com/Library/src/org/diylc/components/passive/RadialCeramicDiskCapacitor.java +++ b/ diy-layout-creator --username bancika@gmail.com/Library/src/org/diylc/components/passive/RadialCeramicDiskCapacitor.java @@ -25,7 +25,8 @@ public class RadialCeramicDiskCapacitor extends AbstractLeadedComponent { +public class RadialElectrolytic extends AbstractLeadedComponent { private static final long serialVersionUID = 1L; @@ -30,12 +30,13 @@ public class ElectrolyticRadial extends AbstractLeadedComponent { public static Color TICK_COLOR = Color.white; private Capacitance value = new Capacitance(1d, CapacitanceUnit.uF); + private Voltage voltage = Voltage._63V; private Color markerColor = MARKER_COLOR; private Color tickColor = TICK_COLOR; private boolean polarized = true; - public ElectrolyticRadial() { + public RadialElectrolytic() { super(); this.bodyColor = BODY_COLOR; this.borderColor = BORDER_COLOR; @@ -49,6 +50,16 @@ public class ElectrolyticRadial extends AbstractLeadedComponent { public void setValue(Capacitance value) { this.value = value; } + + @EditableProperty + public Voltage getVoltage() { + return voltage; + } + + public void setVoltage(Voltage voltage) { + this.voltage = voltage; + } + public void drawIcon(Graphics2D g2d, int width, int height) { g2d.setColor(BODY_COLOR); diff --git a/ diy-layout-creator --username bancika@gmail.com/Library/src/org/diylc/components/passive/RadialFilmCapacitor.java b/ diy-layout-creator --username bancika@gmail.com/Library/src/org/diylc/components/passive/RadialFilmCapacitor.java index 770b9fcd..044b7f14 100644 --- a/ diy-layout-creator --username bancika@gmail.com/Library/src/org/diylc/components/passive/RadialFilmCapacitor.java +++ b/ diy-layout-creator --username bancika@gmail.com/Library/src/org/diylc/components/passive/RadialFilmCapacitor.java @@ -26,6 +26,7 @@ public class RadialFilmCapacitor extends AbstractLeadedComponent { public static Color BORDER_COLOR = BODY_COLOR.darker(); private Capacitance value = new Capacitance(123d, CapacitanceUnit.nF); + private Voltage voltage = Voltage._63V; public RadialFilmCapacitor() { super(); @@ -41,6 +42,16 @@ public class RadialFilmCapacitor extends AbstractLeadedComponent { public void setValue(Capacitance value) { this.value = value; } + + @EditableProperty + public Voltage getVoltage() { + return voltage; + } + + public void setVoltage(Voltage voltage) { + this.voltage = voltage; + } + public void drawIcon(Graphics2D g2d, int width, int height) { g2d.rotate(-Math.PI / 4, width / 2, height / 2); diff --git a/ diy-layout-creator --username bancika@gmail.com/Library/src/org/diylc/components/passive/Resistor.java b/ diy-layout-creator --username bancika@gmail.com/Library/src/org/diylc/components/passive/Resistor.java index dfade752..16eeb106 100644 --- a/ diy-layout-creator --username bancika@gmail.com/Library/src/org/diylc/components/passive/Resistor.java +++ b/ diy-layout-creator --username bancika@gmail.com/Library/src/org/diylc/components/passive/Resistor.java @@ -29,6 +29,7 @@ public class Resistor extends AbstractLeadedComponent { public static Color BORDER_COLOR = BODY_COLOR.darker(); private Resistance value = new Resistance(123d, ResistanceUnit.K); + private Power power = Power.HALF; private ResistorColorCode colorCode = ResistorColorCode._5_BAND; public Resistor() { @@ -45,6 +46,15 @@ public class Resistor extends AbstractLeadedComponent { public void setValue(Resistance value) { this.value = value; } + + @EditableProperty + public Power getPower() { + return power; + } + + public void setPower(Power power) { + this.power = power; + } public void drawIcon(Graphics2D g2d, int width, int height) { g2d.rotate(-Math.PI / 4, width / 2, height / 2); diff --git a/ diy-layout-creator --username bancika@gmail.com/Library/src/org/diylc/components/passive/ResistorSymbol.java b/ diy-layout-creator --username bancika@gmail.com/Library/src/org/diylc/components/passive/ResistorSymbol.java index 8c87118e..32c2aa0c 100644 --- a/ diy-layout-creator --username bancika@gmail.com/Library/src/org/diylc/components/passive/ResistorSymbol.java +++ b/ diy-layout-creator --username bancika@gmail.com/Library/src/org/diylc/components/passive/ResistorSymbol.java @@ -23,6 +23,7 @@ public class ResistorSymbol extends AbstractSchematicLeadedSymbol { public static Size DEFAULT_WIDTH = new Size(0.08, SizeUnit.in); private Resistance value = new Resistance(100d, ResistanceUnit.K); + private Power power = Power.HALF; @EditableProperty public Resistance getValue() { @@ -32,6 +33,15 @@ public class ResistorSymbol extends AbstractSchematicLeadedSymbol { public void setValue(Resistance value) { this.value = value; } + + @EditableProperty + public Power getPower() { + return power; + } + + public void setPower(Power power) { + this.power = power; + } public void drawIcon(Graphics2D g2d, int width, int height) { g2d.rotate(-Math.PI / 4, width / 2, height / 2); diff --git a/ diy-layout-creator --username bancika@gmail.com/Library/src/org/diylc/components/passive/ResistorValue.java b/ diy-layout-creator --username bancika@gmail.com/Library/src/org/diylc/components/passive/ResistorValue.java new file mode 100644 index 00000000..a5cb31a1 --- /dev/null +++ b/ diy-layout-creator --username bancika@gmail.com/Library/src/org/diylc/components/passive/ResistorValue.java @@ -0,0 +1,28 @@ +package org.diylc.components.passive; + +import org.diylc.core.measures.Resistance; + +public class ResistorValue { + + private Resistance resistance; + private Power power; + + public ResistorValue(Resistance resistance, Power power) { + super(); + this.resistance = resistance; + this.power = power; + } + + public Resistance getResistance() { + return resistance; + } + + public Power getPower() { + return power; + } + + @Override + public String toString() { + return resistance.toString() + " " + power.toString(); + } +} diff --git a/ diy-layout-creator --username bancika@gmail.com/Library/src/org/diylc/components/passive/Voltage.java b/ diy-layout-creator --username bancika@gmail.com/Library/src/org/diylc/components/passive/Voltage.java new file mode 100644 index 00000000..f8719b24 --- /dev/null +++ b/ diy-layout-creator --username bancika@gmail.com/Library/src/org/diylc/components/passive/Voltage.java @@ -0,0 +1,11 @@ +package org.diylc.components.passive; + +public enum Voltage { + + _16V, _25V, _63V, _100V, _160V, _250V, _300V, _350V, _400V, _500V, _630V, _1KV; + + @Override + public String toString() { + return name().replace("_", ""); + } +}