From ac81b30e8eda50eed47e14d88abec939f959d9d7 Mon Sep 17 00:00:00 2001 From: bancika Date: Mon, 29 Apr 2013 14:16:25 +0000 Subject: [PATCH] Trace cuts can be placed between two holes for tighter layouts --- .../diylc-library/lib/diylc-core.jar | Bin 211094 -> 211094 bytes .../components/connectivity/TraceCut.java | 17 +++++++++++++---- 2 files changed, 13 insertions(+), 4 deletions(-) diff --git a/ diy-layout-creator --username bancika@gmail.com/diylc-library/lib/diylc-core.jar b/ diy-layout-creator --username bancika@gmail.com/diylc-library/lib/diylc-core.jar index 81f7e9c359458be7fceade71132706f75021cab3..a8367b9a1e1feaebc7ce19a1fe6cb08659685bc9 100644 GIT binary patch delta 3338 zcmXw)c~sQb702hjHw?@$3_AnJDzYQ{s^SuY5|oH2xKs@ZLK2Kd4M~b?p~hpYnBoXO zh#{I2PmBu*md2mNDkdNyMrlaN(dGo~VvI{=$-$tdLf^gj*ZJpj?|t8U-+jyPP5p?u ze#C6fUnuk@9sGu?YR!>+sH!&YCq7tZ3t~Zlr&ySb*~-~;KqE^4TxHRK$1Dwy$ddu( z%+GeQ&)&9=o4{3gJm4!H0~q7~m1un^elLJk_B%O{nKmOU%pn+WbPhuQylX4aw#lOp zWb-{a1Lk@K0&VN9{{ixota>!85IGj{GxC0P z1M;od66C%3YCEX6F*OXksn2M^c+RZt$gbHt%rKt4&>8)ryhq6V{4b3V_gNL;3d~yn z3&v+|bk~EQza<>~$_j7n$M$+O`j_4m$jg-$bw23VD>O?-qY?d{!?ig6e3J|5k9>^zAs^Ht&we<9 z@e?QdQMdOLoz$`;mO;43KneOd1=yW4y+pa^N zHkWUW%8-XJwR&A>z+-CZIKxpmm|S``SFh9cJJ@dxXu#tnN=( zmJ#}KYGYrZruWZGUT_&%cZs#rLc15uJkc)~dIJ}#=5(@QoM6V6Yz0aWU13YnxOiJ4a^@|lm*-fA#%(XY2aS!sd;=Q&{#x-lK|Bj1yF<8w zhJQG(LF053Ps2`rjOG@2Fw}=Jyc>=7Se_40gX)^V@nutklei~F(o^{7XpE=vQ)qlN zgZo%O+>yh7@BrieHC*ow#_>)3XDoPl3-54&NbzrZHf9}vi>qi9@8$Rms-^pQDMqf= z@Zn4lU;LUE2Y?ZDj~n30P$M32d0nJ&Y?yb!Q?I`A3zwHn8nYks0zDtDQVu@h88V<; zd&1|+(^Z@&(Log3kn|Px1x8s!9GdQ0n}Ye@*gW>C_p- zTtJSP1=u5&18$0Z2_=DvT;L8S@_<*FSOoOtVj=KFE{cHdToeG^1?80r^4kRE+v&x# zFkYx9eY0NVfIp@e6~GO4q7c|=NBLd`(wAvGYoNG;JT&22BUZxc*7{x0@F>z291wQVjaZSI*Jltha=Uun#E%9U((oSroN0$#Fb8B z35=h15=(*1BIX01v51wxV-{NHphY|beuguRS28TlwR_TfoV{q> zC0^vWdQp9YmFlmt%6lL$+-a*^hvcYLJPn-TEzd`Czs3P?nJ4`OA6ZAT%12}YyL?18 z(8*VxqvR@I%0H^{wlCFi&g{74t&PkCGX<$lZf z1%H~~DS)^pK(1fLKMkO~35^Q^ss4dLxnFYpW}w_J$>boaw_Rgr5b2J@3O^-0SVV(p zSui#APB3lG-C$Z=>Qri~T4T>tY9b(nik5}Q%OUeyLa6AN7N0YX^7l`Zhat!RK208$ zWNIko?F=RT(o`vrJkXjz@un}L6d5zsSdb^oVV<$5w_4$JL|Hm<&+E`s%KhOE-O!_NA}owe+LaaVxE@BWDM<3Ffn9{sSL z?fdt)a@>Z4d^TQ+W3yWaG<dQaF+0cMpyY-GU}4BZrB`h-CzTda|Anu?j{qJdX4uf@V9j(Ig6 z#%Mq4@~@?D6&u*)7Na&FBFw7^aDbE7rNBW>&P<2jv86c^ws7+FEEvU>9l6lSmTf~} z4-13yV7!f*Sf3BS;h4a&@Er^Hir^{7{Cfh7W6O|9U`i8Nbpw|_R2ItvBQO}kjl;3p zZpM^A7stoUfRz+)Obk}>X45ZV8D|fA0o=4T=Jp-wq?Vj`KahgT&Q0 z?1m8mw8k3k>}NW^m}% zb1;R4+ZSLJ3ol=S`7B(#3~?;9Ux8$xx>0|F0c@G@J@~RP{W|RqcJtLgp@=Q+n{b$g zv$x?g3-8^7UMw`WK{X3`4`DS6Cpw^!gHP6 zJ~CG2vt?bpGFXUCR5dIdN>RBy{tx(HKo5rbC{4An(3Gx<>1i+n@!x`lxIrqEg~8eC zGZs2?)j<~iFjPgjD7d*$eIG)?@8>9MFbVsXsGqpt&Sk1OfGnlIRt223?`>tWP`W|! zGia7=RAp>AU!&UcDEQ=8sx*d#*gMKbPllOvPvLbzVQ-r{OHaM|>dy)<844qwsLAvK z8C#yJA-GS*g{Nv1p045Fg@0tIkM2@A4wX8a9z`hB!wKv4bi#FAj4(1m7ZF#1o2btzrKb^_l%7ls){~nkSdBo=6G?yB z%SNa4W%m=#^wX2bf5=ZyA%aVfAwK8QGl_d$GUt7levb4Z{^DQjFMVI}m;96f*_Y}7 z>Gwu}o9eDvA-BBbn1H5>L+&BkbyoYZ6Ea^kT@qCb*yu22UdFaoK zz&dDO8=>=wXCrh0(JvCu5jiVT^7nXoGZO2fJ-wIk&0ctau+HbbB+nit@e{qQi_&8$ z{#um8r9?~KvS{3Iw4aEU_5EUmb7F9Qw0{yKd0k$P?Je~;_s0D~|MlLuU&yRjskhS0 z)3Fk_J6%T^iE%oWf~LkvQ}4#%=3uk8<7Bv;KG+octG&F~N1BLe@p7QQK3(WKKWHTis9M&-BAMTrVgAKT7nMCP?1l1gYEMwHG8xUQME` z- zsS@W*6aSPn>1&slKc>l{4eBrc<2%l;hFML)MUy>bj!>9fug_f<&%N@78;WW$wzW%kbE>M zOCF=CS$a0r`(u_oI<9Q_$mV5BTw}I;JkA{93puiGeU8*~ { private Color fillColor = FILL_COLOR; private Color borderColor = BORDER_COLOR; private Color boardColor = AbstractBoard.BOARD_COLOR; - private boolean cutBetweenHoles = false; + private Boolean cutBetweenHoles = true; private Size holeSpacing = VeroBoard.SPACING; protected Point point = new Point(0, 0); @@ -46,10 +46,10 @@ public class TraceCut extends AbstractComponent { if (checkPointsClipped(g2d.getClip())) { return; } - int size = getClosestOdd((int) this.size.convertToPixels()); - int holeSpacing = getClosestOdd(this.holeSpacing.convertToPixels()); + int size = getClosestOdd((int) this.size.convertToPixels()); int cutWidth = getClosestOdd((int) CUT_WIDTH.convertToPixels()); - if (cutBetweenHoles) { + if (getCutBetweenHoles()) { + int holeSpacing = getClosestOdd(getHoleSpacing().convertToPixels()); g2d .setColor(componentState == ComponentState.SELECTED || componentState == ComponentState.DRAGGING ? SELECTION_COLOR @@ -147,6 +147,9 @@ public class TraceCut extends AbstractComponent { @EditableProperty(name = "Cut between holes") public boolean getCutBetweenHoles() { + if (cutBetweenHoles == null) { + cutBetweenHoles = false; + } return cutBetweenHoles; } @@ -156,6 +159,9 @@ public class TraceCut extends AbstractComponent { @EditableProperty(name = "Board") public Color getBoardColor() { + if (boardColor == null) { + boardColor = AbstractBoard.BOARD_COLOR; + } return boardColor; } @@ -165,6 +171,9 @@ public class TraceCut extends AbstractComponent { @EditableProperty(name = "Hole spacing") public Size getHoleSpacing() { + if (holeSpacing == null) { + holeSpacing = VeroBoard.SPACING; + } return holeSpacing; }