From 0c76b93db09ce3a19806125424188067e360b7f5 Mon Sep 17 00:00:00 2001 From: Branislav Stojkovic Date: Sat, 26 Jan 2019 15:40:55 +0100 Subject: [PATCH] Reverted Ohm symbol changes that made it render wrong on some systems --- .../org/diylc/core/measures/Resistance.java | 2 +- .../diylc/core/measures/ResistanceUnit.java | 5 +++-- diylc/diylc-library/lib/diylc-core.jar | Bin 243679 -> 243679 bytes diylc/diylc-swing/lib/diylc-core.jar | Bin 243679 -> 243679 bytes diylc/diylc-swing/update.xml | 4 ++++ 5 files changed, 8 insertions(+), 3 deletions(-) diff --git a/diylc/diylc-core/src/org/diylc/core/measures/Resistance.java b/diylc/diylc-core/src/org/diylc/core/measures/Resistance.java index 92d02a85..aa52559a 100644 --- a/diylc/diylc-core/src/org/diylc/core/measures/Resistance.java +++ b/diylc/diylc-core/src/org/diylc/core/measures/Resistance.java @@ -109,7 +109,7 @@ public class Resistance extends AbstractMeasure { } public static Resistance parseResistance(String value) { - value = value.replace("*", "").replace("R", "Ω"); + value = value.replace("*", "").replace("R", "\u2126"); for (ResistanceUnit unit : ResistanceUnit.values()) { if (value.toLowerCase().endsWith(unit.toString().toLowerCase())) { value = value.substring(0, value.length() - unit.toString().length()).trim(); diff --git a/diylc/diylc-core/src/org/diylc/core/measures/ResistanceUnit.java b/diylc/diylc-core/src/org/diylc/core/measures/ResistanceUnit.java index 7ac9bde8..502e20bb 100644 --- a/diylc/diylc-core/src/org/diylc/core/measures/ResistanceUnit.java +++ b/diylc/diylc-core/src/org/diylc/core/measures/ResistanceUnit.java @@ -23,7 +23,7 @@ package org.diylc.core.measures; public enum ResistanceUnit implements Unit { - R(1, "Ω"), K(1e3, "K"), M(1e6, "M"); + R(1, "\u2126"), K(1e3, "K"), M(1e6, "M"); double factor; String display; @@ -35,7 +35,8 @@ public enum ResistanceUnit implements Unit { @Override public double getFactor() { - return factor; + return factor; + } @Override diff --git a/diylc/diylc-library/lib/diylc-core.jar b/diylc/diylc-library/lib/diylc-core.jar index 173d74564c793384fd9f2a7da0b1ab26818e40bb..a1544c712f29484adb79de2125f99b5c875060a4 100644 GIT binary patch delta 4250 zcmY*bX^{lAIy*K1z?Ti>z74u)HVHswqXGWI#sgULX#ijIkpR279Y8d*))}Ar z|H8U4Ak@_h!#{+*hAiH;Q%mEe;mMS{ZSHXbo%KWa7gDMRzqE50>aU}6F)uB868g`_ zTA=+fZY25*_XtGOBx6LIy>)=PyQvQV>eFsOwUl&E^tNQKK%AMC&<*q}g??CdRLLFG zJCzw=b)zGeXb&%^E(~lzs`qu%>&}39NCp8n?aXaZM%E z&}G)%23TMB7CNm`v9qqJ{v((d8t4>SPMTn&_8;cp)tG+v3>2&W$19XyH{EAOa5yH1 z2KfZb!?~^d+|ggx_hM(|Sfc1!V{|zJ;}Wi%#TneMx1l|)ITF`#^42H9J15Z}@pBpa zZ5}*8oweBFkGXe5=EX%=|$cZc& zNjE$88Dk9X*#}g*IItg){4_&0HTIFanT_3qS-duS(mYJ&tuFM~kLT9sC7+XJ= zT}6^Ok5wR<;>FUDG%aMA7`)hrIiYfJ5&M8j-V#=bWcqUUl>rQxyp|qpOVe%l?QK`g>pGt^iYR|uqI4=70TQ(-eEISk^B+CY$?%ZTI9vq@-8_mHUZ31 zoxOwkU_?)$g6tZv%K zwjoJ5#~kp?uH0lUU9jl$CmWt7$OXj+Dti1J>!jM>XStYgyM<*S@qf%tBeDH2GehF| zTwD77Hs*~=+bgycNl*t{h2-X2W`pF-2R4GiS=fAJV?n9);$NU=vEX4yt{L#TNUXc^ zV@NI=@n$4NrrZk2sh&KB&LK`6XyGQuc2Q<{F$;CI1z$vt3cp|0#7ajL9FT?j#ENHQ z>dyZBC6bUqd>WFV;m)15<(tqoc?@qv*B@i~QL1ayeDy_yth-Tp)FSJi zpU6`nRFMZiNcnfEJc(#Kz7DgW+w*uzsvTr9XR=Hhhe=A{VbM)3a^Q{__R9>d?aZ0n z1(n3vTtPC>ovN!R=5ae5q;)b&>?_&lfu3!$DQEk0Zr0C}>6uRvwa z3hoH8O43Sx9Xx)k_%1Ub55u_)mg8HwEs`hM zs06q1L?rKC@?<3OuerdHlHYIxj>RjR^A`-3#ZM|xt$c`j?k%5;q3_>w;SK|Rb`{R> zc7q~A! z1qdfV(?Br}&?Qhz0sr=w}lE1K&LRm%rLPK>}O$Ack)K@SFmF@imw1~Y^2HiZ=$;4n?x|^PdABm zfS#L$7htJ|?=}k`u)ViX{n9Puf47C|yN1);S>aUgw{YPG@pcg+46q_XEC6I%Dc^f5 z%~7OJiP%rQ;eLN8?Av(K7GHQQfKWgt~ZI z<_ito6UZ)05UZh|@g9ov-$V5pHQOqY`UWSGem;@ru}Y$To0CZYXA-TyZ!%$UGOhDm zGRrFKhJ#FTX50(c``xB^;c$Xg+CO$OyxYS^BEWfl8O!kA2XD`ni(Ov>w} zqxeM{7U|?WmHt*8#ZB2qd6E0%u}S^nKI(6oMd+U;moN1*S(Mi`o6tL(>gQ(5?UMfI z*>bxiIw@3dkA~M2imND3 z$7KHZxl~l-k?x*H`8j#=ETsR}Jb6|Uo%6|`luz;3^C_<10r>=_KkxwA^#`b~I7qtZ zLCV{IkorG6NOMjtpv6ZQ&|x(f(Bg*_Qk}3uvd>v)ttg^;-64ug zI7D@?9iljkV)8F7rn!!4__~<($FYR`@fuz!q5geJNnc({d2-Y7uz%O|X@^OVJ4}6V z9VUOjGSb(T(Iu!U!+P0AK(Cyw=r}7g|km7pm#$_NgHZ(y&oOvu{aXqhY;< phP5=mUoG`lYvnP?KBA7k^qzHOAE=YtD)rVn+D`|S^3qh{@jrs;KF9z7 delta 4250 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 delta 4250 zcmY*bd0da#8tYbRe zjw@Wo5-xL*`EcDb6EYbzxaWDE_n-Su-|w@1pXZ$Op7ZO;E8{1xj14{9g??u}y|482 z^n5Z6hx1PhGHpN0zdBpiA7CLH0uaL{ay=iN%0>bFhm8ZU;8Ot>@DTuU+!i2)S?P?= z{J*fSm1CW?7!6{c1Tlg%g&owr74`rV^v43M)*mS|t9AMr9B^>QGaaDvx#2T_Yes*9 z_logVCX=hPO$O-$p6;HAwoA_w9PBppP{ehXt^(}JzWvd@)xR1saiAOK-yCF*Xfk9y zpe}M~1EhNmOGEe5;TDL0+Vsb8-;p0>xVZPIj*w+F@is6G|7~<0*6oRz zi1ADD<_z}qNx}$>8}1T_rYXjF0@k~00d)`3A4?fs-JaW^mX_g(S&dmM5T|D+bpikN zLO)a;dH6p1JCqury3tV!w1<^Zm-!W`95<=0cJ17KLQgNhW7fMKO5Y@5SlzYqBx+o! z!fmg9R$T!T>#}O@0j#fm51m%2*jZO!_X*6)r|1+KPn+P_tv}4dPh;AJ^B`9Bk2l!= zZT%x=1czgCXrOPfJe+&FFKzvFeXev=jwg%G)kfDMFfZx)1)RbCRtwrw8=`R6PT&1Z zc>grUBYrN$xb@@5=x2>K_;HMSQHB1eO+Vlmg)L3Ei>Yr8!?fdCajNRy+fHIy>H9`Q zxyfpB2X;gN8P|z*L*i=4#v|Fd+8YkA-hSnLFm&Z)PfzKO&e76#uOtQpCL zI_=DEeb4Ms-SiyWh9vDGv&S>LeuueqLeZDcH@rxa3yKvadg3DMpxQlRd023-k!2$B zf5y%tvH34EL*npKTl&5h=8c|~H*5!zpf=GHy|l8<(5d!bmy^j4hiZ2b2mA*i{j+P%+=NAd=Ul8{eD>! zF9XqVK<4UmOP+(JJNoh0NJ0kksYoh@@JgJ?Zx~;OJ9pNGZ^F=|(fk~S{uslLk*-n0 zjaLy;ccb#OQR-frz|$aAkq19e`FDvti5OeH4y#|<@kA=B8E7(Vk}MjFMM~fi(M2t? z=MI?mi<8!N`gHDsp5&QaK{CLd)YX%7xGfISJeM28?N>i~aD5=PUVJ}159-1BpeISA zFBb+to-g4m&@*cVcYs_aWhK7_5x-S@rx}nZ;oKVK_*QO%Wb`)P56Rr^{0=-A>YylI zkDiuj?tvc1SS}xI8S;qdJ&>$TuBHC%AiL6t8F~m^Vm@pH`xq`C#?pdp-$M zKYrxG9R~X1DxBfRO?B}S23YJqU&z}eJ(qpOCHVPN)0c<`SmnQ5Y=O5}eY#qBAepdU zEQPU@y#eAc@V)#LARGZr1I1WCmq0NYaC@Mb4teJT#WaaILBa`4mmnNN$p{kg|B!M$ zNX!J3=~l}4U@;5~S!1O{1Pg00@`L3+J5umx4J|`RczKAJ4e{e4Vh-S^5IKlMhYjLu z$ltL+EC9T_K`a5B6iS#KDty3h2^AiY?-)jy6(;6`-4sT;lQxRKf*rq6d;@rUBTe3K zlhl=V_$DEL41JUro5VUm&&|RMutdWTn}z&2@KL{k2K?yW|R01vYQ3B~sNhH)I(lTFZ=$=G&X_8nC`o_B`&wm%`ozrZ~Wa=B7 zO#VyBw4IhI)NgYN`Tv+h3F7@SJ$yqHS!TJEO0(A`vbZ8sgCWg2du5|T#t*);0c zEuD1z)8*$U=ld>Q?uXpwJ@TuU=8Qe^v?bWQpT9!*g z9m%D=Y0IU>Iq##P(lvazkA|?xBhj!t`Hji?@AF7hp=ahrA_?UxqSPchh@q-IVC#;a{ zi-lBYRz!6xib$`lh}QkOh~}|9M0rVvNcZL;$}=yf_|jsU>zIabi)nux4pTf)!|R8s zfA13VFE61wx#@V=zia-fN64RWg!g61j IMPROVEMENT Better selection rendering for a few components, mostly electro-mechanical + + + BUG_FIX + Reverted Ohm symbol changes that made it render wrong on some systems https://github.com/bancika/diy-layout-creator/releases