From 7de327b9bdfa0041a7ef39fe6936a1313a35a651 Mon Sep 17 00:00:00 2001 From: bancika Date: Fri, 28 Jan 2011 17:48:46 +0000 Subject: [PATCH] fixed point visibility on curved trace added option to hide color bands on the resistor --- .../DIYLC/config.xml | 8 +++--- .../DIYLC/library/main.jar | Bin 61424 -> 61372 bytes .../org/diylc/common/ResistorColorCode.java | 9 ++++--- .../DIYLC/update.xml | 25 ++++++++++++++++++ .../Library/lib/diylc.jar | Bin 321585 -> 321913 bytes .../components/connectivity/CurvedTrace.java | 5 ---- .../diylc/components/passive/Resistor.java | 3 +++ 7 files changed, 38 insertions(+), 12 deletions(-) diff --git a/ diy-layout-creator --username bancika@gmail.com/DIYLC/config.xml b/ diy-layout-creator --username bancika@gmail.com/DIYLC/config.xml index 59d99305..992af535 100644 --- a/ diy-layout-creator --username bancika@gmail.com/DIYLC/config.xml +++ b/ diy-layout-creator --username bancika@gmail.com/DIYLC/config.xml @@ -1,15 +1,15 @@ - metric - true + lastPath + C:\Documents and Settings\Branislav Stojkovic\Desktop zoom 1.0 - lastPath - C:\Documents and Settings\Branislav Stojkovic\Desktop + metric + true default.org.diylc.components.misc.Label:Color 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 28793104796b48447a71c1c5393d7d24ca18bf5f..1ba116e28d53fe260d7d21cb2df509abcb45f3f1 100644 GIT binary patch delta 4826 zcmZWsc|4R|`yXS=mVGD77?C8)*q4-ji3r)3Vg~Wpvo;Sg%Fd07Q1)Flwn8b!R+m$HTGH*Wo&=k>nx$9&J{d%oAXu5<45IoEZq3{1! z(?!GNN5JR}x7GIw{>WFedFbD}bglXaOl{0|cZug6Qi%C%_g&_3@zTxF_lttzn0LVl zTK;%5F7#lLASHl-i^s_r=+joaDCyL*i@z7^d3tq3`s%t3+etfao6^$qQt^4ehi!rW zkxJ(ps(#$GiS)ayiR`Jjdt&RNsZeni`rG6Rlm2Y6A2z_-!@6ccKf*%9yxv`*n?5MjX3Y?jj6h&fPLY6Xk8=H*y_a2m8=PB~jbb-oCy%nzk-Zk+tGY7rsPj ziw@q@ugQ8FU-4K)`l+l{En&W*tlYc+_M<(srEA$w#=?FEgH(NZYT~)Ea%fRIgVh;Z z!Qy2S(1w~L%NuM!suYdU&DT4YM3vfg_Rm&Zw*`K%gZ5ouuh-9g+pDmXTuvCmTS z&AXeC=%z=+MB7Z`veMb=sMODGdzpxb;yyym?-he$lw6GE`v>2pBm5#cweI;eW-IQo zG_|D!1~Pf9nPn?`E?P>zaQY6VOfIsgWD>oFAfmqj}{ z?Wg83>zKm+#-GnV8+O-G^_@-iq z_^&Z7%`U@@n*FZk@%30y#xI%Llp8#po7n6yL)26Em+RcIk{c2ME1DnGVg%u2SI)B) z%AuEO6ZP#ZJBbx`=|q=LqE&Fdu>`A|muFe?E0juFA8lj#f4O)z3NWG+llJ8{4ViWG zFvA;|I0Zy=OasEMO+{{(XA&1yOU^UdNzJ34PJ}J&KV!=ym^0)}`7=yE=ud$@>z-VZ z{Io9j!GjCOwUUC7>MtS8dta&`8ZtOep*`90s9g@cekp$F!}vFc#NuuE&m@Woo?jaN zj|p8X+%eS~9O?OlTze%~EHeWOtQ=O0uvt(F!#Fw@FG)Ms7xB+N_o6h<9ZXDXzV)T@ z=6Oz)vXW1E#m_wN(G1R?=+tk-!EQyTU(tFE7v*LS?f;JS@a$5niJ#S^seB?gCv>-^^kG=@l zZqaN`AyS8xGe6JSM5_LkUnFQ#G8{4JMI|gl2lXNwYkf7=DNG!@caz-Sp|#q#Cxd3W zB~ndUaZ_P?c%WrLCJqU`Z&~#yaC28l<@{*l&)Y9`f80XxQ&+tD1_%AU*Ztc+Kk8+`Da@&BLx6Njk++aR4m z3BJ813eyze0HONx=@5rOUyFes0!(lcUuAamBk+Q*4pw&$X>lBereVBl-JJGL> zTsOwwJ_<%DMe>Mo&$K@pbUzX}^0Sn?N)P%Oub3kP2e_(pN1AP{5f$j?f`Qw{Ig+0l zz~rSmI^o%Q(P#EV0{q@tql`h;u|%uFH#*Wf6gTX$L<3a6GhJ_|&*5GlYzbUi-G8Ov z1+3x}IlRY}S0{`2PosXXSfTpdL)TEz=hLJIl(KGpornn8c@^>lEj0=4k4LwsVkFw) z`NHPpcR4%x=B_Iy)A`CxxzN|(int~*4YHd_=q|(GlNXRhi7d?h$i(B{SS6kvFJ$s zS6#_c-MfA>^RL5MncJ+^Ei%8?bq&OQx=UR04JXIXbT-^jm6#r5VX5{ps*)4s8?LPy zLMvHBZAM2kSdaOs^?vK99ei}cisFKB^cQsV+NP5;(de=yz21mAN(EQz>~MC$eIiIJ zR0p;C2sXZ18luma-f!c|HQ$%RC8l>5`E7AmOJ3uFfY8>RueBkPRXIC@)=f85+8^Ke z2J`r>mm#d$$Dub8VWkawix{=c`GgDL0MK=b%9#(j$7oRx1s@A%b_os1w7^)hfUpjc z=rivJ@=Fz^rlw|cx5V+vGRTm*1TIF@~tut5LPvJgg^kZ$JE!&Fs8HR@LULSde zjG49@ z6IjJr{dt?VZov#*PdlVhTXtH%!&vu7hqgvJi+pP7%i5qykwE$>igwx+q^FWC|5B5i z1&aEy)qMN@_5AJ=-1+v5cAUpIl|X!`Dq`iR=%iKGD)gkOj@7KV`)cw>IM7M z(Tu8`Xsn|D>VGNb-uvBXM$->Q6~s2CPq?Qr(O$ZbJ*APgT#-eh0`V!Q?aH^iid2W4 zX0GKAjpZcBz9?%#1s=?>F$&oxTvU# z;5$*;cINBQY6->G8duCIBw455XRzb}1`x(Dv*-hrkApzAOBx zTNW3(tvPZESt!jKX>VfyT8DOHN)6;ZXCv-&OCdqt7LnlCvzrm+IITc?J035-tM=4dD3lHEpsLxa4Ty^YjY7K2%noc++F>szB|Jb^Fw%0lwl*yf(F$Z*Zn`@?iMNs z%dbPkMz6LyOg_d67|cD;auWzYeeu$dC%0+#hlhK4KWZWQ9gDDTh={mwFClV2&F`go zcPbWMbcn{3n7GOff7Dg$%;gww^q0`ZynfffOdFC|nDlqclFd@T1-iVtyRf6qzjuL; zZTy#&xzD@sn>tH5R|Link2?cJmph|0)`Fh}+<+DlvLk@_?8_!DEVm>Lxm zPV;I>IK*4V3rNzy&gr;|69NiSa22-`ri}hJ8TiWbZtOPePI5zianFcZ$7cy~Xg#xO zhiCQKCs>bJUg=Zo_Qe$1D1M|0$40CF348lD0S|!gQkiS6#S?)T`kr^Qrn`RELVsnT9k%$6BG<( za*L(-52%}1BChiFQE&uO^tDeuf?6&;bU1cr9{c~1keTZ7C{4x4o4K+COXL|r}Gp8qw<@$xj z2U-I-Hls-Y2Rhw2`m>z!ZWhh#0$Z;g;Cs0TOzKf1zsZhQ3dL_YkGizhcJ8ALJl#Le9HfCjWd5T^E{t@N1|oSl0m2Leuqe$0G|tk427hx8>SvJ}Xl7EQeeRgSuKYg+ zs5vfB9JKM{{xd2Fq?Z8#kv=A#RQXq|%6Qh)kPOO3e%QN%1)2H_sXZDuQpu9T2!WhG zZg}xu!%HUtt~Idy0WN&yg{B#RQ;ddZfZVS~bQOsnH~K>h1LX58U|gKiPfkTbArJ%7 z&ee`B|MVIt#*?uC8rB^D>^gX&>{=Qry!&hr2<(_af-SHy&j*~eqmlUUO{n!aF=~=F zVRG`n&(;xGpVtH;?@$25MAz{Q%D8Pb-yK^J_> zywLRAe_2YvW0?hc~^nLQ!8gdTjLd8XddI+c3vcdz})2{MDUEhF|&g#)YI*}-JJ9rhGdf0)oRW?xB zN}{tn{-J5sctKCu%}YQ#$;)?v|Guq1y8noI|L1m0%A6|JBb_Y^>1^eXg+~WGS<|N~ I!5@rbbI2-s5R%;?qxlLlm;cZd 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 rP7p}))Nhttp://code.google.com/p/diy-layout-creator/downloads/list + + + 3 + 0 + 5 + + 2011-01-27 21:00:00.000 CET + + + + BUG_FIX + Curved trace does not show control points + + + IMPROVEMENT + Resistor can show color bands + + + NEW_FEATURE + + + + http://code.google.com/p/diy-layout-creator/downloads/list + + \ No newline at end of file diff --git a/ diy-layout-creator --username bancika@gmail.com/Library/lib/diylc.jar b/ diy-layout-creator --username bancika@gmail.com/Library/lib/diylc.jar index ebd0f3ed5590a21558d255efa4fd751d40a7c8d1..b81007a04c85052a0d4c8902b81ffa4863d179df 100644 GIT binary patch delta 16395 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 delta 15610 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 diff --git a/ diy-layout-creator --username bancika@gmail.com/Library/src/org/diylc/components/connectivity/CurvedTrace.java b/ diy-layout-creator --username bancika@gmail.com/Library/src/org/diylc/components/connectivity/CurvedTrace.java index 7861c1fe..956a1942 100644 --- a/ diy-layout-creator --username bancika@gmail.com/Library/src/org/diylc/components/connectivity/CurvedTrace.java +++ b/ diy-layout-creator --username bancika@gmail.com/Library/src/org/diylc/components/connectivity/CurvedTrace.java @@ -38,11 +38,6 @@ public class CurvedTrace extends AbstractCurvedComponent { g2d.draw(curve); } - @Override - public VisibilityPolicy getControlPointVisibilityPolicy(int index) { - return VisibilityPolicy.NEVER; - } - @EditableProperty(name = "Width") public Size getSize() { return size; 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 bb12585b..2195439b 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 @@ -91,6 +91,9 @@ public class Resistor extends AbstractLeadedComponent { @Override protected void decorateComponentBody(Graphics2D g2d) { // int width = getWidth().convertToPixels(); + if (colorCode == ResistorColorCode.NONE) { + return; + } int height = getClosestOdd(getHeight().convertToPixels()); Color[] bands = value.getColorCode(colorCode); int x = 4;