From 5de80d5f3262a08ffff229452d1c63953733a8e9 Mon Sep 17 00:00:00 2001 From: vsr Date: Wed, 22 May 2013 15:48:24 +0000 Subject: [PATCH] 0022101: EDF 2492 SMESH: Update Destination field when "Find closest to destination" is unchecked in "Move node" --- doc/salome/gui/SMESH/images/meshtopass.png | Bin 17937 -> 21428 bytes .../gui/SMESH/input/mesh_through_point.doc | 6 +++- src/SMESHGUI/SMESHGUI_MakeNodeAtPointDlg.cxx | 32 +++++++++++++++--- src/SMESHGUI/SMESHGUI_MakeNodeAtPointDlg.h | 3 ++ src/SMESHGUI/SMESH_msg_en.ts | 4 +++ src/SMESHGUI/SMESH_msg_fr.ts | 4 +++ 6 files changed, 44 insertions(+), 5 deletions(-) diff --git a/doc/salome/gui/SMESH/images/meshtopass.png b/doc/salome/gui/SMESH/images/meshtopass.png index 1c426783e94d591b1e8a11f91afa51d28bf623fc..ebddaf4480928da9962cec1b0aa82835e1ff6125 100755 GIT binary patch literal 21428 zcmb@u1z42dzb`r_qqHJjLraHrNhl%RjdXXnw19wsbc=L%gNWoXbV*8gcb~=YzxO?7 z-@Q*f=ic{08HTBMy=#5HpIU^-$%vso$A1oiKu{&bMHL{B2P5F$XXrz4PwZG~Klt{{ zR$Scy0zvzI|L;L89U1|+lg{y-nxm+ZgMq!7t)rQZHAL0S+R(;@RK!xx!GVWV-jTt< zNng*_*3!&C@Ba6}D(~dM)6nmqrex-5X#|nBaW*2gwlOqvCOn9MKu94HqC!fpDciGd zYA+||koMVPQoZ6oeGa96zWeI2l5LlYhq6ZPM9o85^TMj{D(?AJUZgN7m*FkWZ4U>b>iSE+E*kMJNo5D?ZQ##V}2b&h$-dp5R7P!{7GbP zdOTkYAyQG&M~rR8i~fX9xU)NroZf#|Weo}V$dbIxK&cfcC1)h3-Zeaf;%Wg6jIA^o z2%UACoUxSqIhm=fJZ5a11BHo_n#DYBFT*2=NIguC(zc{8DBNPabGFz+mnhX?FHwKR zrEqX zQt8IGcXFiTA8mt1VBun+8%O#VGe z9(`NWS5IPmQMkGjy4H>1EY*LfC($s*nIAuFBk^gu-g2wP%<60o>(LF2kf}NG;bR|N zRrjs^*(MVFE8d&M?iX{5KT>4ZpJtD<;p}ws0H~;VcJv>%`5ViHs)EfV5}#0#4MF`& zB!fSFozg>M1G?v4zqm+BUEHmwPrLgw&-V2mWhskcu0zy~}E;hAMf7$7bulFTyzXQKZJ$LzljM<@Q~A?-3iX zs&#qtt7zk8k7Rd=%+<%D)18N2!#T@DJY?dt1)QZM*Ssjot2xJ&WqElv*yx0RYj~|M zLdWb}c8$>RW<21Xluw_|d})+bdA}{!t-uhiN?%}ot0rVd9?ww8mcMN?!CaQ>k2jzC zr$d&a#HIj2iC^*AT@SUhpHWob&dQBa)d=-(vE$}){+~({CN<{tHpBRD-%|P9qNQ|1 zG4$n~{w~WyGxxI>#3BffPET6hFSeKOni?13?D=LVev88}kvSIDuV~xzBa_{KhqK{+ zi~8|%B_o2kVHgcwS1KZ2H!;)$&3ybfH=fDA=_u-)j>c7sLnkZGuFmF?Q(S4i|9ahJc}Pwcwqq^kuKhJwzibYThrS(_1)R`_NU!yz^4T;RmY0uG*s+v ze>o+7;aj;ZT`n%P8N^U|9$6qTK!>dy?A>6E*nE<8-OS-xy+3nT(jsV9_2nyNYW*Q1 zuK7jCV)pZ-=y=2es0XqUDcPBKt`4v6c z&uR-^Fx#du{!H|bS@W$HlNKkh8C+O;9;pY z={ul&(`fa&swr+JnEr_k`)yp=fy$1LAB)LK_rW1x@Mvw|Li=iT^sX}9fGg|W&choP z=Pv^$VaDb%kuV)&= zWC8fuPzg+7s9&ujx83G1zl%z!-(;gpt;c-kp*>;y2Y7&|riH4is-CnrdRGY)=0_U( zogBliMm`P}9ad7*Jj-#S zKeGVJRiU(;sEGvqb3p;IB6O z&478E!-r(Uf>MZ~GLYEF!*mrnTwzb*;Niv{#3nLhGetz&W zR(Z^M7WGIMThQ~kuf6>d%<+6*HauK9XVn?EpUau`BCLaCXR6xZaCAfA_3rle`Xs`7 zvOCeTrr?n*O1mx9FI)`{_YM2YJA|i=h2!Yh{BT$JiRw&&(aytWJMx_trT1!T33-~C z!fIYetNzAfrCh>!EkZwFyI91^9({0q77;&cbo_MhU9LHZy zh2o7+OQ#Z&VyW!>IlAdpF6?7ys8Aye7z_-{C*JLcW~MJLNi%FGNMQ@Fua_hLI{cnE zGVjCr@rM#EqQC!Yx3PJESa*weo!_Z=={Zxy8_ouoI|*`;&U3q4k*6NpGu52-2>S~a z1}mI(RQj7$f6fwry4DwWSD%#)X3RXXIGL9jG%zONJ()tsn~k&7>4H9XccmuCIG+3c zf9G{Dc|fUUvMmx`=Sana zeU5q;I!xH|Doc{dM_MK5Q@to*Tp>;4@SUeB-~K?da=&v{pwaiy&0^&UYWH-imL<{rHptkj86nA8ZR zB?K~Pw_zqFvI@}EY?+6w{d6NbxUZfWQ`p$pxRWm~`}K?s3Isx zMyNc4i1#rBV#Cj|cM_boz{dohgBpzkfvi96K?X3)fB6Xn(jatr|Ei>J4+#oxbl9KY{_m9_#x$8~Fv?xbJ&g3VZ z1gc>n5x)CRAnTzKF|~PlG_P4+Q&9!Mmt+zTWzTc6a~RYsD3)Y`tdmEcF~(nYIvMvT zJzGGA489_w-Wwtp^Y`=D*VmV!PE8ZA;^}wwBEHB?_ZFTqBD|^ER+h8H2w;M|rFOhP z)0A@T`!0)f;K~>9wYK&w8y@e~MnBXvc%)_G7+QiYRndhchn zksxl@SK#rR8ZdaG)at5qa_|M((b-Yt-D{mWI;$y-Gv#b=-YDI!&oz5grkhafO3Ab&q{PNn+swE4K0-=LOq#8C2-bp; zlef?GdH($L;6SirzQJkhchAcW&XH$+ljR0TwRiz?=H{FEzZKC*_zC&l9haxXor=G% zT%GQ~2L@X0Pb3dJmbY4U| zKqlm1FcYfYS@a(rT3t*PVZR`(@V;?JX;&%M$yU?R(%N2M7iTNZm_5cJvOhaL8A zlo~bf$l5u1cr=pjAdse6jf0c6V$Wb{?GKNIx^aR~NlrJ%=mG{mW0H5o|wSBpX46~A5CIr9rS=>e?7{BJK>o&V* zt8v*a{$|ItIQ-`r7cENUvLjO$V7E2*^z;OSJNh%hJ2pyzp6P0i`;%@x2F zIGp6ADjQ->#ZpOcUfWw4dh2+5>)cMUTY&c-!4CPNJsUv)$xs|RP&Oiq5;x1d$ZCVN zP3zY*3vPG?$i030*4CC;UBLG5&(6;G0fV0&JnD`{&-I$5u+qS2$S5ltEN@&|>NYimp9v_XSHKe8qY2?^!r=QEgZ{q^<7Xatk!*Dik#I~yC@YB~Npb`9(H+Lc1j zOzD=rHxA=c+Rk$6g#7kc`Z$n`ymux9lYB86Q9lX_B;&i9mak+E&+6t_B|;>?>p)Tm z5B@x5^`vg%6{;PpX+&OQdb|A);`r{&rO%Cy$t7?S6buYXmym!IP@qu%_OJgNXZ+vQ zrvHOdHqyBKDy(B5jlZy@#Ci`Xas;Uet|0taif|@RDb(oWzjZVmg0i%f2ri$UVUlxDrkBNa{OMCDw6pbbE zeP<`impX@?<8F!cGJJT)_bHqU?rN=gp&E8_j=eq~^=$=98ynk`7yWw+l&#vx&I*Bo>fYpjTrr2w`G&p_tLa7S_snT9?3mBz^~lj( zSIXgQN5#d(D;FL&mnT2-eQ7!07_j52Pii>ZZJSSImzNY(_?E3HlLlNK?;4oc*ccnj zXs3gBeLAW$oq^kE7?PjAL4fXoa1HPcaU=IlPEKYEC!&)?HrLT3MC&SV%!>q91 zVgV!fZe3g_`|B8CBNX-s9BD#s>K8Xn4V&-ZGtrr~#W?m&`o0BCm?c1d$^<+d9}IMw z=2st9VX`RG2<>B@(nR4zw|B)=!9q`jyE{6vGx<1k^LqDXf~Lc_zMbMhAbIcg4&AR@ zbF;I1&^A>m5&`+BoP7@UT_KBserq@w zw(P3=u_W4_i_rqB$AGv{UMXvZ!&9>*LoH*aclim*M5(SS-_$#(8Q0%;&{(Ya6iGfx ztmnaKMCR7k5g0E*M3t45S5{W4*{j3D!-X@;gw@Jz7k+`_VDaZA=54^hHV7Q8qhZ^eG(_7vj9^lZ=Oy6g!wPdAc-Pl~_q z#tcU9e~mHz57zO&5KQ%FMd8qTpg+VJ$Ci4u?+7;a$sgrlL3r4(mqF00;x~d;nqS z`1i}gBe2TvzHBOID<>t@*Di*hoRkzA8p^2Cgo}^g;B$8?uN_fFDcg{Xq-um^LhYIsUL5UfvbVBc;MRE*;!Ij@*$31z09_)W$z5&AAoumY|*v_ zF_;B@PIR5MZry&sc&zTdH`i=7l7mY8#`U`Hz+@n8<-nDAmlz5|cR>eV_Cy_l0J|M5 zb)pl$InVk-((HK=P0z&0sDs^NnXp%usUs54s7;F<#y-*hk@$W$g|p2ug+b@ZeId*5d2D;UJ``m^ z-g5}V9JFW8>K)Ex-oFoOPQ9r~uu9tc)97MzdbGV9*3*L%Q&~}Qx-*?y?@jrkJzn_y zAw)x{t0znk;GV-L(G2r7IXOXEGUDQsRcmtr=vcK{128|GQ2Ad3-Hj&Qyq@C33n2_iWN0Rk8QtC8qbW~MPoIgsAS5LG#&NK} zKk4&PPzXb{R7?A^W7xxIP6Volo1+%laJeGLs8;rI1Lwop?zDxarIx1V)?8OAy{c+t zaj}(-PFh$PvM>!bbyu8CVZC>3O@}42F7{k#CK9CS$&A*lhTYzKqI4^au#RQS?`rfV zrKJPCy;Ch-S81~z*bEw?0>Fi-2Z@P9jiLT-*$1{q@CB&*9+UU@$uI_}Cb`Bt8oY zIWhu)AQAASxlLBMLBI(%2|&4uSmOS}z3`!ZWo2^{Ag9Ho&+Kmh92R8bQYl>W4mXIX z^1^AB$B?EIM^EKMaSAe=6nCBll$qgQ_JeHYsuP*?}N#>C+kiE!@|J8AS5gTQxFNAFaRK#Dq#x&iMD&BWGCG+@oz{; zw=MWJ=tF@f1T+^EPcC#~R?o8L(EbIFKB|;}NT|^MbF=}f4mXq1(LLHDhdlLf`^cIgn=W9)jN9yf zqF*@~+BnKd&>AI~{rdH5XlAv=M4Ai_zt^Q>fE*ww8X8j_VK|t=fRMOsZh%!x&ya4` zs5ph$=(ursd$mV^i@Sf{foeSltUr8!M@PS4ut+{#sH%5Ziy#n;xIUN&YrQSI3tsAq z~q&0;vTpIIE6ar^S<-fdSFm z`y7S^T09ok@j({}d4NnBA08&=!uIwTjL^@YCtJKcfsXov?w#1ejw6x74l9$Q7LDI*Gap4_z^6ScXhJRI zJUl#P0gT!WKkV5(Jg%;Uj#Q$;XJTSPM@I*Uz)obUNqC8p{AgqAe0!i-BpGY>ByM%@gDz><2k{pnoSts1ug}+%UP%B#!`S$Ejc%*=;TX>`SWicK)POq_hiRQH$qJfB2s602 za%Z#b4aNu$b=S%_Hn&q@K+|3+p`?^$^o&xn)h_-CH+aH%dRC_2%o?}a(oH-wj{pqK z-`^ips1Hn@A>rXChlimz9ODxcwc$6lWo6>x;-vAdKzEkUdLISf-QBIVnNMTZdnil; zq^#N5=5W*@iQC}W<^h6+oAm>7hApiY{rWSxz2jtt+oI7N>E!NsEPEn%OZE)?Nl=Cb zuZ}Ax>(ma5p_`8D5}EqT(2as>G+mSIjdDimsG9sB1 zK7iqMeb5E)2rP1M90)IfRMk`ovt2~E-j!b6T%8Cyo`032Day;s!%|UEQu+#a0Z968 z!fQv@GsaZyUj-xZ*?Zye!h(X{iHWnmL^ePL4BbpkO=V>I zGlcxRSH5P&bqf4@7T_z!4)32`ESFMVmpv3f1KK-L^`q2|Ya77{)q4a7H8a!Fnr{qe zO9tLwhQW)nQneQS;U5z1VkkE6Oh$M1582R{{hFFU`MurV51racsMV~smKs`F9JUW) zNuM4o11;Z8MeH*c-WI73+~BlN>i0E zGkcwkSheMnwBdS;bboN_lC%RO_5Q$il9i>|(es(PY=@6n41Irxii%1WwcZ&{0PgZn zYu*Q#5iua+ybcQJTD$i)kVd;A7<6m2%H?KHnk4T(aGvroD55^juJ3l7)8Yr#&~10^ zcNe(n<^xxogK)3`H`yx%LSOAlU$a7YP;hWA!39+-ZD;^8qg5M?tkP{x9b0z{|uOc4~+y6o(1eveZ}M@I_5QSs`5c7fc? zSNv6$e=6=uu523L5Mg7FGwy8qI}_gHr^}~}XA~2CeSHaC=2&J|RxSUC6#JcH03hnL z6kP_fTg9iONS#bLK_EW~>gyYf1Q4V4MjQh_R4DQb3Wno7Vjn=>u08n2W*CX*&3XiW z60$l>6YxqJzI*`5Apg$nmVY~C2nct^U*K>2e=;U4R=fxR<8Yh?rpP*rWgWUS6gSjUCxLO#79qPCHj zmk0e!N=nM!{&0Z=9S)!Whwy*FR_<7_uhy!36+2?QT9gPhcL*hq%v_dO#M3889lw7k zBqnBG$Gu>Ny}kWgVTA3iN@{|7c+hCRJNF@6Le5@5V>0F3iY``(=II z)JM?ANAM2Zci=l*_;VvzZ}K;W^*p1uz1b!xAkCo;PP(hbK!u zp{-6^;~_EB!!|iDAA|LZw%hs&`xRNh^RVa0Vb9q)Gl7l@E2?w48jq)Iy}m zsI2Z2F%%NJ{XrpWYU%(C^@ZZ;+HX^_sxk@_0mD?0>3ke)Y=9YW?@j_`cyT*AK0UW2 z8aN-fc1Mx?9%rNh!fU}mVH`+g6H6xMARz-b)$f1TfQq>X;I%6jl}XjrCjbf>w1#UF z)T`*I{Rac&EBvAF+j6ZIZy_Py)^tJP&!o^qsh}kr0ddudfEVC12Vf*4RJ5!uEl1@f zK7RZQyr@87m=FfQ?V4G&HC4e2@LvYs4S-fNe@+j95CvwaIdz*3_PR`tR*PZ;EdFY` zIO_aD%tmb*(e!(KoP&uek}s~Wr>A^nx`lD=PBASxnND~9zq=k(%giW>^hy%}4J8Fy zD(WHSgbgiD(O%yg2eRr^z`^vXN1PZWu-CVxi0=K z0LxQTQ&(qufGFtBe5tR$Xb(nT5iGC}j%xCDf^X6$;&ZVJ2nfJndggzXc09z%3{-0$ zp+VL^|4Ri>(7@$&-fnw@v_koxe3AXF!@qw46hM0Xm^ra8BO_yURH@>+-He1oA{jdX zBs1t8w|DDY5A@v-_Amz#0qAuGuw@pqg7K5&CX{2rn*#_;>h@kA*mYB97%<2EpF*Ft zA&`9by|M$V3tC;Kn7!G76n4dUB2T)1`6Hid6~g*Csy2u?oVsfxyC=5aGQMVccJG^r z1IMU)KXrfi@vO?Uoi>-xgZq0$0r7{mtFDbX%iX&$t2Ff=D1M_tAf^zP_n_4M-}$)z z(pbOE)Mhdaj|{&qo}cbYzAw;!!+{@yDZJNuC-9Cv5|?EWC<39hNEzXI0^1OVceB1p z0#v0+v{u0P9TcFFP8yxlhLnP(F7J{7yyZ{CzNxJ-gI&w9J%)}PNK6NB8|5w}<5p8i zs&KrdbT03q8q2M28+xqsWw18iMd zF=NJv1q#+cJ3?R`zVTn)p*Uu7Gg2tlu{AO=Y4yBNxFr|Dcq}wIHPuj8$DGLEse|iI z)PNFrw?DBkT~PoreI!07BTN#b3QuL?0( zC2$2T;r9Q;10?AqGj3li4latg&Rc5QXifl(IznIZlwwyssqV4ps-=5@6@?6iQN@^< z8Evd=RJ-=*ySTVGX_{S7`GX}5*l{pA38ObBI%?XOey-X{Af91O)f_B_jmSNua({8gEI z3AN&K6j9>Ok)IEw^5Sr@@1KV(0Sia5K4(?%iZ!vQsAwC2pkI=ixw$4r%Gm(y(v;>E z6<}dKOG!{>FfcIbgNCYuCheDqh&ajY z*w|Q~+l#dWgRWfZWMeb4Ki~0_IBz;|bgRBoHxvgGSEX5fELWTLaMW!wWC_v(^h?ln zKcjc-O;bD7ix6T#Z!H}iYeT~~u7e*B=Y8S1+#@+JjB{Q&?D8g`o_(EuH|~6LN^<7o_sKP*G64 zVM2OKu!+W-6#pT6xUP;%S9c!Zt`8X71J2(YZItc%Ops&rRJM-R^X2*Sju zsG-5Zk5*Rv?#HIAJll=6pd{{IN zOi4q7$7NRwnCd|GxxaWI>+o1;ro~H>1`DXnKL-c**V29BN_}px-F$rR@YsyY{%nI$ z0Rw$`dFg$*k=y9J6B-dgr3$$2&C!4$xJnm8VkGM7>Zt(M0uzCd&y`sSW7B+Y?3r!5sQlT1x%BD+B6m;{~u@?=X)04MgO)@WDbhgb9jVAwf1 z?`N|%`;W#!%TQ5i@Tha(N*Nv=20@sn89osa5wv(kWpz-fOpL9K!BsV`?Aao$+Cz6c zNl-W^3z*#YAv%f<#sybb6w1xRlarlY{^yRTu*?V^ClZYI`qje>ey7s0r1%)h7;0G# z4i-iR2BJmoW&Oig?OlD4j$IvLxmw?X z?GM)c21L(G7qD2l9+7PFe?u6d9q`_`xHzteFi|qJU;}e~bJLHXVN&p|VGZ;C6m9?k$mXdcLPIZ?V`PCGMd5S& zD-apzTpP2EoUf$)WxijOGX&`=1_x0G;z(6(Z7X14sOYHZ z>h2AWW!C+u19cd_)N8>=N5|{2YU$?2?PeRiROjpK+hlwptZg-mK7aS=wngD(JF|#L zd-U)N)Mn5hD0N9CvlX0@BMCTnH%4+>Z!hVB+Ye3;oNaC8&Wd_SfXr9vPyuK!hA=o$ zLNu|fT+%yvGn#_J!tn4f@ZR3hvCEK7RiDvAB5o7#1ZC7MGDv%zanQBi?#eZ#^Ba9c|14F|`2Xt7p(^uQXOK!f+qWwB%b6={Qvtm0pV$`-{-r z+_kST5nu!Zy~5D&$Kqa?XB%+30MV9Q<5#}b=s^YnrRk}uUPD%(rCK|%Ij{-(wEq10 zGoDE|4TM&>DC$Z|WQOd4(6_t&mqN0#c z8#rg@y*aPz-*!%g`5tXXmipI{*9AEZLG3GQ37X$xZN){^#Dxe#vvZa|ihV@OWIXP4U>EOlEQ&YXJ zPOaRy!1eMMD8Q9%JM z78Z}A!%yZfo~;V)H4OR&Rw9gF$9iS)fKTSy6HN*9elh69`8lD0r&>!7C|C>nPJ_+} z*>Ck{b^~yDqy2@XlT$Tt>chg|0nc6r2*c`gDl3mRevG^b`Q6iFCj2v?w^uSzX?1t^ z_WWQ;ky;iOaCy2zhXL(QYHn_hiHQLeBeH7?v^*UhVs#+%wScrll=v|y$FKk`Ev@Is z$co+{@{5Yzu(05<8h#d04F;*Y><9+U8kBZs#&`=03to_@67ae-G%dqcm!xTO=j6ba`>n_>3*JG=q`~!ieSqf`1<;Kw{b7}eqxOyH0b1#o0hw1 zuyCp}cZoPq+CjzjZayvy%zmeBm0G5trl~qTkyQ##)LPI?MMI@m&q0koZnzq?zrP=( z-sI|gfU)5?`C!m2-?MF^S?nxRBv?aD4Wt}GL=|8~G_PO7(4nBcZU95SBL_K1@0X-r zR0d#R0WcTzvrnHOAoS%&3K;PFaZ7lu6ByGy^8q~vAkgN*W8uJU;PwrycZZ~HjY z?1BUPUAuI)H9s)bo7BGWxnq$`C`zHr_-4LH=n>NWh8EID&&o6-FgFk7W5IYhtWUI( zqz{->PA;EhAd=Hgd@8#cdvKN!)$6aXE4hO%>(20aor@Cd@r3gVDkSCTfs4GkIdR}v zFwrK!-?w7Vf9d*_q_?c9tZHR?e0;n@tq6NQ?*XLwhxHm04ZYl1zXy;oNSp!k*)r&_4g zdM(Cqe|hqilH${YzoGvb8<$1*LZL_Py2kyry|aTEWMAPhX~_`@H>jKp_>ysC^bj&? z*0I4_*CQkLBeJLPA|bs;KbrG5W{Bwf&i9}~L9|_XkW_-_84u443 zQV-M90FQJ3T8R$^$CrB(uQ#7%d=sEzy3xbO#(wV*2FZIY_98U^+=D1h1ODSe;a}gh zPl`yXk3o#p{ju}yJ^shhvGtYN0%3@0z*ZaqJqb)jca*VREIb-)yuS_EAGbKb`2iBR zrsQC6(tnjt8ELd2SO!dKx)IstnGK1}tO`^yi;gE9|Ao}o61g`*;^{FsFhe7&cixoD z<5C_j#qChd7w{~#D+${e)OA)7=AXqwG4vq?aYMj63b~6^NCZ9E~)rZ;c5QQ zh8^5fo1h}N5eq1UU3Ng@+2vV&xXr(VlJkC`?ePZZ^B5QFZY@>Si50rI7{T{eA-%o5 zmwI>TQxk7@>Fj}2O$`Sf=+#+TQc_ZB>*eLZ0EYGe0TT@2a)X znfz|UDyng}o0pt{!=&SRGd2O-Noc0aoEx>hwjrP|8h78`vSCsE&s;Z6rS^HBntOg_ z$eb?V)%%edY#Zp%bHF-Fv*GY2kCjwZP{0rd-V%SRqdO?B(9HAm^Qx+LO-@dt5^z@KJ&jdt2aQ8&_2Os^V0gHm1BR4PAwMX_ z0Rjq`n3y1i!B8ONZ6A6a8|O1Z2|#Z18bIV`W@aiXD$q!l}b^^db z{;ZhmUDiJXi7)7VoyPAWaJ9|mM+#ayzxTCk0@v*KYoeO6vNCkR^L>z6E}o2=aq51l zygYA(9TteOXv-DqF#sA585voP^=#<9oeG>e>N|mni3v?j&6s3xHAlzB+UBjeIXO86 z(n($t8Q9qDt*(v_Ba~%OlMxXiA%9wZT0K+ro@+1w;YfSAfyC#s+=)ErpAQ8xCXMOo z^Q(wtOkt2mZuGw4kxH?aPiq3c9{|YZ^PPZE)HrHh%v*I3K>-1*1k2^WvfHjK|KE1o zzKiD2;VXD^uzT*jB|`a(Hg^>)Fo2=~m5wQWsyN64fI+&~rMjgSy&GEbtE%f+c}}6D zRm4^6-Bs%=Iu+6YfONrP^Vk@sB;sS)=QI}t(WY+say8GzMiWEBy2eJuQD3xBK59}ywn67)4l6Pr)s>IWHH65b0)m3P zFIM80H&i9_lYxje3Z^o+%;31c$_xzQn`w?5SX4Iu@|J+x-1(2UWI0up|KmqMXpr$h znzo#roU-x>;8-?uP28-k(e!ucOOX>r>MG7I9G;x;JFI>wETmH>#>Y>JiD3igvpqKj z#SaEqBvb5Hud0DNlP#R!r@{pY8c>ttm^4e&CWp7&V)L%<2Oo$qIu(WzU@>6|18ore zX#HU;gZsbAV7@i0#Sq>w+dxA@1M8)Iq5CeDiAH-GGJ0@uFmz!upl9yr7n%uMfAAUse1 zXRT(wuy=Sw!(m=+Fr_xK)|xILf9O@JEb22VaaEcm(jNmoVHgz^HDr6cU)V?Hw6~al z#RbUQX<{cN)nu8Pi!%#ZiETXIa5`MXjnKory`27GdvPY&hBmtU(fpWD>T6mSyW7sW zGeaX{eO^~v+B^SQ{nl6Hva@w;sqi`TgZox>tjSAw)Q_6DwYk~g*|9|+DE3dkQE=;W zyr>nAvL(DbowkuB6!iV?-Q=sa^p)+@Oua)_IEmQp`BsOn&*WYE!BSUp=`%$ULEaYa zBVnh^qBlYSpa-K7H@NJjfrQ_k_#IR0_3+G0%Hr)q=_!~Sr+1~@c0&0}YU%CS#xp>C z7nhcpbnA=k5v_NYY`9#2I)Y+$Xncv#^}Yyf`v|5z&xvCay9G8P)u-`4$1e2D*K@Hd zrfaNX-bjuXgSQvFIUi|qI|@Q0qKy&<^0+F!?!i)|pu)US26lB1U6lCvyAocn%Qs;i z&$Tfmv7I-Djm8R;;lJWj1sr%h&0IxA1Fj1tzje#Xuz>tXjN58oB3RyB+}!1AMId;v zGhK`HJ zEbNH_1`Q2}m3b}c-M8SSfJ$Lp`A3QhC{RE&eAy!0G&U-Y=#8Z#R}nkExajEU^s3w- za7u0;l@psC?VfG%;)TIrU|U0wB9G)tQSSp@?)$5=Y$$(0@sj{x>|8)cfB{}y%ph!f z6LgaGJ|bEW3mf}%0f{7y%T2g_b-6?&Ef45vz?=nfaZ z5TxSioSU0NAf#tknb}8&_BH)6fN`yfQ@`7l?mf!)OY-IKdwT#o8Q~2$SAlZj?OE$x z+v92`^B7f93@#p?XgCnKu1bGKyqW5)I5KvA|EA3M%{hFOk zEtq?>BX_l-Cy)*fS;n=Ml^%E`F*k_4f`|s}MMwlOcY%==AeX>0r;KM~W&OBkhU}#1 zk3r_Mv(kD!^(lV{=A=j-B`z!?(t3UP!Ng=uMJYKUfeY|ZFp)t3bMr@f21B0o+-t?0 zqA)F0z?ihO2=VYFu;adc1AeR#n5I%xY{r^>AQ2%cDOr_o1#l1nhh;Y$4#Y2QAcdrG zJJ4)jPRp!}R)Ly=mY)}$~y1-RZ_jmR3vd}8|u7Ni8=N?etNmLejgf_6 z7UH&_X2$G^zwYO`8du?9dC$E80xSSWITXG&v|0OIO-rv)5IXwn) z)~(t%(knqgmAwR$L?(srpsQH$@w;A^>yR6cQy`9k9Ci#7m7v=-1tUiUJ=j`fH@T)K zTbV|cD%0R_hNgZFq7`84MJkuu;wlMeGKI8eR!xCs;&r0}1&xA>R_XcI1_2s{GbyKG zN~d<-dnh90ushf2!Mjw$Fn^kC(=wzL8AScP;{Fpq-&2lDizCLxz0d1#MVy_iUx9p4 z_9O_*Id5)^UZ1J7yXo+@%%-2+Rh5?uK>^J^6WHah=Z3;aY|=%7(d+B#NCQ~e*u=sK z$C@-qNYWo6q1Dyj&>gR^d!U~PTrcUlp|%ONnQfQ>s`Iq9(sbzir)LkGo$rp#fA3== zp%XdU+Y3WMMQH~6Cu*(d6>2L^*WAWV7IX)M5&t&kq2?AAATHm70Rq%usHJZpj`Z&C zrL3%0n8LeWGqL*d^r|6z(F$&S?{4SF0$lmh)aa?=pFH%<$|A3y0b+Wr)AP{Bo5aG< zS2#FyJ?{5b}cRJ9e%7W@K%Ld|?*dC24Tf!gPw-U$MR7gd zPV8lT&HtkWeTq*}+esoDghmYv41ho2=jXQqk1O2r2}^@QQt_ls2$)ge?s0*)M2%b} zmE-LK=njsKgd2kPGn01S-rlqm>R{6&ugF{?kI|-FX(mYa#1h|JhYh5rratOKdi(|5 z*3RkK)%8hyKDZ5ihGu8y95VHy8YpKK%v==r`!Qf`u>R(h`_LQMGGVHAQQ46$ox~-v zl8yKu#_ly}3&1*0_2BlwIQOlst!=n%wPSt&q3E60gL@|BJG%KVMxtpG{UwtFe_JKn zWv?uX1Z^Cnk%#ZTP7*;^&a7;m?6MocUtw8S%ahjOiUD^cHafJ)K=eh?_y2xFFioog z+QsZ1Z4@WlBgm)zpsD4t)wyZ>mIosI6DYg@;-T^MI`)8h*Bn2-cfD0jFP}=qmS1)9W@)Oa(W_T11Fvp5 z5)@OQ)PkKXlXLyVFp8L-mYY*eCfU+C>*m(;MUeds0)H0;EL|$7pH@04bT4yGmRK-~ zM3i&>F$j1p#iXW&W6&}(*3?!qy=D}G^84J*bae$M!5%;yo!?NF_D*^&os~Tc`~~bj z;Oe?bxVv8hO#$RnFooxR?z}(-8YEaiDy33lxQgA}0(dMysn6$B=!vzt_HG{?t#V19 zJ47Vgfc@?4=D_^I7hVTjD=j&$hF3m7GXXCH?%0+)*aHQDO|^Ka8Eu<$tyV8hgS>Ol z1sdEv=@kJE9TUiIdf`knF53%x{sLG4Xy3->=J@rDhagud1VtoplM4u>X~6^pynzE0 zI#w`aIGQI9pc^#vL#xj7L<0Mb3GimeRmUKYx#0@(9}t*mdo?P)zN*M!0WX_{&E0^@ z)Bms$Wf{})Kcz@$txN1*f|3Z<-R9QT-c0?`?CxHWJL;` z5-`8wEU&E1JG`|Ig4 zflN)E3()%4mG&U?7;y?HY+kSBU#|f$`epdO2=pR+U-Rz7{hpaQ-S4*t8=b$n6}^`a zkDK1Ny71F)BT)Sy`vF*mePGQoIc6#erQuMneVodYb0T|XYZ;~_m1G%PQ?iW-Q)4=VB$9B{go(&fQd9OuoKqT0 zPBDyQne0o_8A}b>ry*2mFeXP58qQx`@5lGU`(EeET-QC%%yT{KegFTzjS7bsMC{hu z`@j||m$6~pC9P7W_T`^&G|oq0TXv_~JS3Ol+qaje1nJk{KLoiwMOaVOth!p-N$2rgy5e%-D0^HX2_U-cQUUTTVP#JF7rQ0;s zeBKeW+)%yKOL9GLW+>lpd-Pb!7^)sI`q=f?BTX;1zle=EF4`1W2%qGgqQSg%XyGcm;~3*8+Ib zScxitzqYh>?cQb{twXgz3o=Npx|ccR#q7W49KCOz^#;m#;6toanmi zgr7>Rk_-0KbVm4^RfpUb!+_atI&z%tZbTEBhQSeC z&@t50``w6?9bR5ddT#}D1du=q_gyMZj{sWR)!BvX!d3SNaca(&hR^!#>PuJ-|I8jV zfyJ2aT)4gMaudIq%{Gr5`Nj!67rDeYOkH{fDt@6*h?m}2xlvhVeue+Q-TpX1l_j&M zFnV9`q2fJOdiqZ2BPU}Iq|3T@P`4no3}ESQk~oOcmb`QHqk4?EWA+Awcirv4^^yLD zH)AD;@kvJIK8}tWQR^*WzubB_cq{HNU7hi@w@D}kES ztiwE}C{X3Cw^+I6x?&!AG~tWY^KMZIjiNX)d)g?k25gBo7>6!i5Go_!+#5E4TvBv` zJL4~s3$w5^=YYTIMo9%lWhRpeu`uFmqJgr5Nivf^P+v7a#mRZ?bH>xNP`N-o(KOeRZl@$QUMB>^E1-Ak~N5|@L6DayQwiAEBW$Y0{JX1~GO z#Bi;=cKvchoo5kKCH^l!Q}Z?Qt0D!?@2b7--9j6aRu8(BX$fbbIB6@?#(zV8O#a($ zAT&+q^kQ=mfioXEzG7IKQ=2n}CXy*9-PGJ%*PeP?Vr;F| zbrP&P^O4oGw6wmVK6m^tie-Zh4Tpd@q!Ws?kVx6XzD%Og*5$Sk(_Y^)KtMuP|Lk9G z92)o}BE~}aVdeGY91htwTN5IS4g`6$pC5fTHt>1u27~*1kVuJbO||dswd4=`fFat$ z1D%VzF}+bJ5;{l#l1lV`O3MN6-DI`qG-k6igWzP`!1#kjbiK~A_^Hpnbd0t7ORWT3#&H$Chyn2clR930xAzG-g0^~(DvVw0C1ATA`}vRvKV zGFrSEX8_kVyzurVo2{#(V|n!GNal+(fB=R9xd5+sM~5TquY>I2mMbD`N{$sHtnK!r z=*LxP_wGct~aq3=FKIl3&4lU+BD>MS@fKT5B8w{v-5i z8%R=3OG&u|nOdPmX$lTo7AbcmKcD^65%Y*r5Zf{M{L1Q0*fvr0Y$RUAFhVxxw^@hV zw2xt(<(g;jq-d7ZwOm)GqDU;%1$o%X@!IP2D;eP(8ZBJ#;9COUH5%_sX6#mSYgJ!xP$8| z?ACn$))-OW4mm|4I(r-ELr168AxcTaMkE6QjG_!WAg>67oj(RESIf~VrRLXA@Pl4y z4HE%%<%kzp6GRHsvhkuTO_q=FtAovT+@-nt>CMK&fnGc3;2RO!qsJ^6hfiPo2So-Q APyhe` literal 17937 zcmb`v1z43`zbCwDq(KQu2|)n?>FyQ*>F#dn?h*+B0g-Olw3Kv9Nw>5}w{-4V_&o19 z@67eg%=zYgUfT=Y``&l1_5c5B`A$(@3KNYO4FZ8+%1DbVK_GCG;BO)-GI)o{L8!saB*=cxbweZ0{Df5{O z;&2Fyqt9JGY;C(v(fHPmU0^qm#mc+~ay-Wl zky&ziVHy=e#66w#5DJB6yXXsOo!7r~zr;gcz=+F*wl?i8Ofj);RUUJ zO!E-aiu(H6Ffjcz{D|q&V#(m!n9@0VBDeX6nc#z{{dO~RlK^A(|VW@cm^Z54urx8aEVRsFce- z?mnk9V{?w}4N95t5;}!6Rx~pQB?upJenRo5Y@@U3y988!FkUf>VORxIs7YXb#b6dX?y1_e!<4VQE6<)F*=k)5sfJ z3~+ZcWwj}X6GzW?T2g=K%{^V7LsSvlM+$nM*D_Q>qKvMWF>dwd^c68pZ=LzN%(HiL zJmbRrvDa{-s*^6$@zVAKdqri=Ys`uhldYDhE|1J)B%CcC^$&8JRMjlU-OoEwnLHda zvY_IjfcE!EA7t|(Jm(!Wl!$SC>@23@k$v5IJUU?Q) zsZWG4heC4v3u7~B;y*lnFsQ&`K2_!avMM|96rbZ2Lg~!abA39>C8l=9l-P7k$@;14 zT*epMGPy~j>KA1P3>@PS4EV7r&zV-$ET~N3xEX3^f0$o=fow_$6l&qO!zj**wOSof zJ&Ne!xy8Q{6FSl~jCtV8?8%JPuARXnPTWF@j8S#$&5yR^i>-rQ4>1w7v9LhxJNOKz z3MTKfA1TBmo)!2D8&v*q74}uxm$3^LLM{Z)e!3(b)M(n=UM&C zu~<0JR7xZO54Q8C@Sxk;!Tf4=*_|$L7%sH^0VDk&AHj z*hRbCf`FMQZe*q~%Gb}Or?uXf9}sU7-dQ}7G#QH0^K7JZIz3oJop*^&{Zd^>7rRIh zYL@jrX?-5vz|71{a-3wF&u_lh3#K#~-x3Yi7O^BU$QAQR$v|$H0`E1+YehocuhbJX zkxOPnmievLL*!_B++jTB=2aIX*)wZ|eKKT}HEgSx|GM@^@ELzf37AWGjVZ zOR)S7Yi}AyTX_9I!?RuKmnEfQ+TcWux`nQd0`~|Y&;wgin!B)pPjY;z%A)q1Y zunRSKiS;jhP_*^R@)7ebhz4(_-U@lD`-5M!e$~IGWTt*XMMdB5yniY-ul$sXY7A8@ z0rWp=3{@&Bswftfcj4je9g6>NAM}Raq+7iVqzm#aZLp~!vmS3m6Bn<>dWt=Hamp=9 zD0;Ymp6EGg%IwbCYw(l`YVZ_ObuB+|Bn0Pkx()rBl}n}5v^)mP)LnIeU0}BB?@cBH zoDeK{W&+9F4usXs37cXz_DivRxP!%7#J--*)+ni2ccNBaQFz<)%yis;Me!;6<{sjKW(cY zc+j(ebrEwFE9u#H;}m4uhoQ3k3B0e&lVQ((JM^wsct-@*J{j?FwO{UDhh+$s+Xw7`6cxpgxC-k zcJ|;`t*yaF%snd}6G20SeCSigcAmq1w!GXx6L5%SbK2(U?{v_fp)ZNzCH(yA1sTjEYm)hib z0uLFvac2XcMVrt+fS|%&My7Llei_*Fa2SSeQzhr_!bDLG8oqima`_y&medNO4FtW705dBY7jqPoi;@^7fPUAO!M; zdfB%(YUJ`edB%nzw)pFH#j^UT$X6?`J`5IPUwNxRdmP7|67|h})|s@%prh}?Ez-fG zU)7JcR#KC}hC#>aCoDNOV7(dCUr)kbc@%h@dEmG|g_tS@#3_#4Ir8ye^UrR*R^ZG! zSP(pEoO2lFD0C^yBexx{5n+{?sj|jCYdG)lDd#i4RGl_= z-4vJ{5C)U#3Bc0H$;kn~CwD1db#B{hKum@}|8r+`XAMsbdSOlP#m0L*q=`(A`{qH( z&f&ps>|k#KDi*&_VYQnI_+<9=+xH!(#N1qM_j?ltQ?#BzLsj(!|1m8=1CCK99C;<1whK1lQ%it_f7jtp{OCJ<%D!TBdk^D{y54U(>2gkz3#)hy~>~0n*Qd0Cp zGcoH~gewO_+m^GDiAk=>4mDNww#l4b=S9-0wYEF&G093S11_oimEzid5fg@rsw!?P zc^Gd^3x)7TIykLTsqWD24v2~!y@j2n7(B|&)_b*A|z-S_;I!iwcIxez$NGFGf zPvtO*x-iM5opV!SP-z#}A6<617(!%eAGlz<<^mVUaNlCw@SWSmsSC z_G@1A>%N;vS;Da$4+1FqQ)1_xt>E|$i>o?#g&j}8h{qi6Bxm;|Nn%WT=#Si{V*LH1 zn<>sZ#s0Uc18qtSdb}g#t%_UGu$QcE<|l+5 z4Q|#X@R*5?B@e+Ahoz%o63sZu zvb(DHzWZgLjtHnYVO_4r(qUE6Q z=PF@}-8YNdLa^(M*|%&kbF*1tq(tntU)7N+vLQ9JPA|u%C~PDgS)(roY2I*ZRJ{8Bl-+y1{?K(C%{LJ-gGsJ&0Bj?qbA{^uFE2Q5jnFl-+ zzh1CrADnl(WT5|aeaM2@)v6dPo1gjF6bv0#Rf$6roOk69ExcMV&l-0j?ot38Xi+SP z;eWz@Jsnimw0hh}=&uwN+(0o!nMIQ+Uo7pD1`qi}^Ke(FI!As2u6Le+8=Q<71$KMm za0;d>nAc!#Xa;YmCWtzN>i~B>RmhR5G~ekPNeHg!FTLBHrs)U9QMi>mFWr~>B3J)h zxR_?hwiP3xzi9YVxQ0(U44ub?DEY(>C$=u%ClVC`m_d$D0^LCqMlfg{$GT2COC9~| z!k@h__M0}^-`0NtV^suYTHxQN`FBS*PI}=)(`T}G`hJuE7OB_naYp*_wA6-}D^N<7 zi90NBi6u1Nk5d)9|JNGxS5*=p*DtEHt+Ui5#l?LiG0LcdFQIvj`3|5hC>L zKW&O$`ZY7u66h&RUT~sP>_=%{1{J2D196vWV3p%fY z(|{v79{)N|$F|$b^UJ$-S#cE+Sz;){2J(nw1rp!>Vl0_Cl%w4x2K~iwb(?R2Zv5%) zS1*(@AJ@|5uZ}PLvOrb;g9hGwQN&Eg=r}K7zINZ=f7PEGc(}%bRZZFkyW4|>t}=zu z?y#X54;hypoK=smG5_+K>bXZ@ki6zA_3v2dcS&`<76S7T(Z*z`Eo7+~QV@Xx&*k~G z;8i=68>w4q>a;Y1#}RFNZ#&m3+SgpOV4^}#)(?bi=IjP;g!o`TVb{awoolY`>lIn; zbN&E!&2E8Hn4&IqnBVgsG!#2#8?E3%n5ZFrU~;6E@#@2OS_$ zFzjbc-Ar205>@jS9dEuaYlP+hrr`i70=)^wf;>mBgZ-OL2ENF-dh*jfrepAtH zl@Qu*bPikRNjTT+$c8wdK7E2fA|djR_V{Wwfxb~P*D5}L$V z!ln53?Hh|AC)PFgF8AG!qwE3fbX2M$nwO+x-yEEYj>>;-3e0MsTqTkGh^~35@h-ey zW7b5el>*3R!jZ^Yov&Y$znZ;G;S?{xUohcDN2Ezl~V3Roda94BkO1|YS zt8y*Qp}{(|k9R#ln4Jlk??^ z+fKZbvn5RuQ+%4-)6ikVeDbPUqDUCRHn@b4X+D# z0n--(2>g)jjPizJC40c$D+@EN+|?+C!Rg`$7;*sY;Wyu{o!mi_0>Iq<_HR`UfS0dr zjwYIVM-C>SbiY8+o>Jk2GhgDlM{++PJG?i1Ub!zFp9Uf*P|)wCZ_m07{U!*pW^u6d zzuy&{ECJL>y`*f->c=3XGiBF3V8eO3pqz%THY{jcHdgBTFKqVw9-FNrb^pO;1ozm? z@E)5L+Sn;egNnKJ->jHPUa%p{6VB~=PmEAx7hNF$_Xu^x@F5NQ2UDiaeJV;xr+Bz; zPJgZdFhv!$*-}7{A$manF=4akO>?ngg3fvUNm<92nRSvN+m_3ZVktZ1P*cUAFVxfh zuQCV`o>cG%`ghrX8@+hAH&oY1?%a+)2J5cHtL2#^h0J-A_2&&fwp_E@m#EFmV+|l!{4S8JV@mehYRlE_ENc8qp?0kn^MDOH@=sQBENIlhINZ0b@~gE6 z3!(4)LW+-6YDsrPrkg2r>TxYfCQAnOp1Q|r+O9uyKorBdwK7sOmjIVu({C4S96X&OF#!h_WH z2*QP*Ykwy8x;yrY6A9E2oMLR-A~n(TBfE=?^NpsgtC*|NGts$k$lE3L3YAV_fyhJH znL7zgz1k+ILBiA4x}eOzttPdZJ#5&d8m7|#F!m~JhcXgg6gB+wcl~&l6`>9o+`u`b zwJ-Iqdp$xLv)g*G6)3QP71vL_(BP=O9D74DyDogUjFFB;RhqaC|GC?i+?y@D?G>E+ zxfdk{Jb*bvH|1e-em`0Sstfo7fJP)BH(IE zQ-h*#Al3fGPnrwI`BOV_p@{5rpg0Tch`}0fSq98N6|0{6l)!j_$bbP4K-O2^Ux6&B z;7RRY&vPGk!x4p4vY$S$k+3zdr>>HEyB4Fart{sX(%@&S8Z6LhaTPpk+FVW z@k+Ey?)ig@ru8?@;mT3lbOiuOj#_)(UhR#4{-{2Z%^BlODx#}PMv8@^RP+e&UhZ)( zU7p;A-T#Q<|jnk&J*y?I-}R`cCY1WQQGR zd&?l!@t&D9$5=xx%b^kkj0{oE0aRTKLkHmkFC-Gyu=Ehiv;H=1xEvF4`UH5p$pTpt z+an~5)zwvNy;==h=Gv^=ZdcG;P}9+Vo}@hWG#(7I)r;fQxA+y0d(t|m|GD$_lE{C; z1P$Di$jC@xR5;l14fij;T>Ui8Pm8uKxX##ck#RC#Fv1whW>2EBx9q>Q6EA zto)z;BEp4e+vG>0i&SEZRK^QSS)34{G;trEz@_dBl1JD!XXdgyOQp>~U zwsse_RmUm^xgzeev=E!F2ej*T&V>CS1?fx zZ(BI3k{aZpP%3x&@bjxBvFqWv6^|~2H#x)8F5vjMx9n)=V#!XvVi_3i01PHIeC+ti z9CF~W`^I$kmRXpPZ6vHO+(7G0^sZupCY3LII3vrVLB412#=w?=HT#vd| zliP)W;WQOgYT;Me?7X2xVCmWPAg$cF7zee9wD1Q5JRIXCqSs!P^~~FItfq5V zGm5E_2z`Pms6n8~_L<-n^*xdlBI~XhE-T#`FK?0Ey>hYxkg^`2ndycOdUtt$-*g63C zgzHz=Mn!%7n1)6(F|{D!J)voARn?V+jI9yygcWJ=gPB98bPVs+fpAFb zAh0aD!!~)1Tr6MwDs&~*5NHJu71a>lJhQueHa{tFu7|x2i)-}wbKa|S^GoYtZmoo6 z*Qc%Kj1W*EAN(eGj1`7J@E)nCNM(IOIRW}@x*jmy?uj-)VsnT?;}oA*nGm%e1pYoJ z`7p@3y~J6Qpz}B7>)M73 zX5GE|l8KQ?R!_xqZu;`$G*(824)sIt)n0espX~`kdVQ&|i9a=+?-(jdj}A z1@F=`P#WG~_`7AGtPJ?();46)8Y$XG8#yRtu4TqKO;ba$La;V;qV&4Sr^&&O7sX;i z)vh+jg9XHMIxxi-Uy#8KZ0RiBgejvQmBVddmlnd_km1EYkgkcN-FQH!6aZv~7{q;1TmxJM1UX2>ia%}i1*x%(n{<;>MT!#v>wx|~Lqe5OTXwB>Q zefiBB6V~MAhG`_jN7B#U?M|E1TQd|s!$0Z!$ld{f0<>cAG$velH z{=2e%_Exi>?VPO^ffU%~8+LS6i8m~FYhTs6fvv7eN`CjxHUW_z7Q(->0DpT4;raSS zno-MrnR>;Gj{x=A(nX@meqHcCb68L12k98BfE3A={5yvwQMwz_<$HOPw1WA(aqMqr zfW9&=bi1t{4s_o3=tj59{dC@@^SN`!{DZ$(tgY@2j%bM`&x>^8 z?@p0cH|`Wj#w`45$gm0!z$-u%!7MtU2QOH%=K;Au`%)E zo?|16tFevh90%9EP0+zYm5ukzvJfrEpT%Ts+#~5BkaahOrZd=l_hHNLp2W%Gb&eWh zNQL3T=%W|on`gHGBK#mn`x4CT;@IMFED5K?1D|5T96yq7lvr$*vst3xm&)t&Cn23( zU5F6CYT+L~d?+z(cm#p;so)uBL}jh!VO{w6(kRP-PM8V)L3+TeS7EcED=$s^fSMx4 zWP|L|9WhP@XnY&cTI-b&*ODk8GE}$!I}tIo-Jn6&bVnTn-~k+>uaD-;^Nfo4o#;gP zt~y zm*M9sVcw=XB#p>@G;rhoYteZz?`K$ajHUR-$6@tTO+Qak*Q^J>K59XnZMv!eqhhC0 zX*OH3?e+r+sI(COzdQ%j4$nGkI|bEZta~~I6#LJ&&XzL6MfdK)tnS(_3>jnruzM6p zhaVrzZip-=Kt9SK$%=|x59}T89)DL@IuKc2o8LlDvcI!r18PgSZj6YkYFA76$_QK7 zmvKUDz<$?tS;`d22(Zzo^*7&UeMw2T5nXEZ+4QQzUhHYMUMveiz`n)9wJjObyDc8V zLWijbeDjG4?>6FDozt@jqLGAY_3Tb zuiIo16dGbq`x>}a_m%Of%9y}py}{}3@uT$Qsi)pAzXO5`stN3bnTS zjxw$6IQbB|_MHW$E^I=<1}Yfz)nqV~x3tW*eeKMl#?uS~y~D}y6BDWyxEQR-xb-GWcV!B6I|f#=3?gZU6AXhRwS~yGjj~moH;)DIf-r?=@!Je!s-$ zMmc8=stFm*UxfMPX+5aaz&JfUO%{Hg=l|$~+|$_9evE9%k^@cFUs#fc!GmT4@^|Yg z_KA#fvUwxE)nqF$3^CLIV0~=57a5Z!JfX@~0+Kyp3c3bBzTP~MfPFeVcYbizh=#aB zj|HQTM>Fz!PnjUwUNaY>LLUOebRb%n`>q@RNpVG~T zLW!=uF~I(TTIJ&6qNs|08qI`)%ekZ_BH#4>Q ze_t$$yO*W_QHn&S9vioushcq@c?oK1jlODAT*!u!{UDo>ugI0bv88n+1avBs3h_fa=eZ^vQuNW@nP|@iL!UtOJ24L5NkP=+f$AVEu}r z!EY2(x%5G-kR*;fhkq{xRl^j}-_aNv71OTEphZ)N(>_cP&&y7eiQ54 z7JPU>t$n@7B!?YIwP8zit4i}M^*zd zXg6A&=zbvlp$&=$zw;|`ab8elUQBn^-EG|daT#QD!7fPa{{T{Nu4jL02iWxH?@ckA z@J9YbJo;263V*XOfa?wV0uum9l5E-b|6PVe311zi7V(!zH>Goagl2aZn@|~JQjt+2 zH|*P?_~K=~n%-3j2_#_bR@#&2x6r}HbhcS#%Wxc9d-Le19?#8efWnEjDTKit}? zQ~CP@M|AosaS}oE%rr)3%`Gb{SiqvFos_!MfDdCH~I3wtkBk z3h)atxpkX?1Pcv2Jf#f910x_dpMm?oaXF>)NZ3sXgX!EY+#LJq*4e^Gw6P(>%~D1D4T9@ zxT#qMQJHLWj)8l+yXjreMyC=~5XgP`O@_?6rgBC~jalCTSpg|lZJc)^pPk?w9I8Bl zkbdjl3EubQ%BGMQy)M=RNsTPng6}6&HXzq{s@twIUN}GhC#fi4mu`4)2q^hqG$lc% z3G9JNovOmFvcn@r`2cE5dKT+~u8T@}cg`)}>Z5f4wMmt@MT7t#1MH3pmmM_#jU<+d z6drzz+Xt~)0K_c3vvI+`HjPk&5LDfz?Ri4KuhUQ};j;C}{;tB|o|PyTR4j{;lMs6`&*cRv0>E^cvhG>rwd za6Dz_R>j^F7YaJlsOMLFaC?E8nGHm&=3*74*D+jK#|iQ@cn_XM1hx&pfqMyb3{$B^ zs*Rfkxf!Vl;6K!{=d7+pzjmWB9?CMuq68kuC*+?;-1jQ%>zHG-Bc(9`6<|7vsj32{ z5zYh)fgv6ZggSYrOPs-xI-2J&LAZ&V6zeOwL)Piz7Q-?Av)GOsTVJsCN`v3=BE?MA za1eq5S(}^PHI@z&A+YA<&+W2zu>1YX%t?Pvuii^-K|d;3K zw^ucI*>CQuabMJEE|OZF&TtiyZu(w;URS8~58<_x3t#FhFngvO(NxxFqzZ|4>DIOg zARy<#rq~i;{;lLF3DZO~H2c|)$w;sZL@+doV2<9l=);SZ^nY0-fB6fg|FHAFFySEs z$J0l*pU&Cz-tDvuUhhyjfr0o>!9!XR7&DD}IaE>f!dE zAlJQ)Gg6L~8NUkLgbWL}E%%WsGV!~JTj}If@9R(df1#v(x)m|3MSamBDB5ix^c>st zvRa!l5qjIcvU`aow*NkJ!vuRMoev#yAD;tiGMTmJV`xoAMT|v()-~#f*82k2D_=gf z$K+=E80r)kFLPhe+DD$4RHc%Y%NJR=m%y3(`XEo)s*zcLMgG5(H`f1cd9&^k{6hJs zywS7z|2~O-cl1Emq*fI*U3pSWGYksCWY_LoH^bLXi=?+ww*V-V{)Ts%ny33--^q@! zfiiL`O9%oA!6KPEHB6*_d)$D}Z)y%kj2=0n@ape>e=xaR^aQw~Nl+QRw!1pa<=?>z}J$4_f)d>)vgAcV02+U89jVy5LoLgo zUX2@r!N*AHJf*f$PxUhIN85D&tB{RtoOsT0&3$W2OdBr) zN>qmEZI^EWnOZSEI9DJ~Gn`Gdf$@sQu-%M!k3xYq`xBVOs^@y5SK|UI58ok{Xm2b* zO0^SP9z&rK;E62m_+f+ZIxXrz18(K{vNML3Tx~YvDFGSS(a8C&EGM+ZJrz*5ed;( zetNsF`8_Ekm$Gzt?+_nJ0MZKqt6Pe`LW38BtGcA zG;#v=g4kr^()%_BI3RNXy9l)@^?IT4&gm8)`Ndm3NOEV}ecYkDf_!oT2gI3I7WYCy zYylV560@I0?EV}g6IU@_|IlmRYuVGFr4yKNZ2D2|Z0E(e=8J;y_0J4hHMh6zK9#NN zUI1A5Bv~#SL@k?(m0i`g=~BQY^rM}|j$GnI*N_Eu8)>qtytltQ!n}7JyM$nu3g5qf z2U%vx1A1HDtBiauNC9k*{m}k6XPqge?(Y&x5c@}n-O71w8shs!QNs6KM)jM_m=a`T7wHQZW|~!hC1?j}Sm5csNdGCd6j1cPAQ+P&J{LT~%2 z%MK4CBO~S3dcvx`wY!^N#Tkh%i<`gSSvZaQDB!m>Ah_gNdOMW}k}Tx!vWZu#nZC_Z zstjl#KtDHlL4XcsSC~`M!$dyD`z%$s4{l0^2k{~7J9f$-GH8~-kat__CZKn|^gd=12Pv7m{6OY(Oeg zOm#AFV92%(T-X`T^_SyEh4w9b3@1&N^_az$${;cgf)WN*vj+8@f$RBZVB|_9>2KCQ zn<)slP=5Yi5eY)%PZmu!3nN6?zPKRvOEiyVpwMg2Thi|U(ZxglZISEIv)yWNJZai^ zBJ#)ICVN%Ig>)|Aq5JU*K-&3}hmrh-)B1RrPd}3Z0z}{cjIRierlswlU*d8Tv~^t| zGTq+c0ncSn9z7k+$k~~_Dth=ESk|*&)-f=&XZu=Cj^xIN_4>88{5?swg% z$=Xc%^-+tGK*=;IxK2N9uNp>}W!xw;{+Gze2xzQPjF$p!DjH+sloK>$TYJ+(KNxvVcA|!e% zX%H389+#2y+Hg|)8sFjUJBB$qtuwO>JFb1U9-QqN@=D!=*$RPF(#XSIk?Y|NYzpu` zc<6d(2%WM6WvW?M1Z;jo&SbTQLs^MpAa7y_667H1RB|=GX_bLa^<%!DTE%=g3;wuW zYg-rz0%{z5IpQDXMvm&x(O~V8;`|(K8*21ZrO zKoni}m{6Yh0>aRSHOX}>ye0KQ+BbJKq^NjHD>io43S<|=2VW+-?AU+D9Dmirin1(9b z>J7oh{Zb1k-2Z>8FT(d*l@K5x&x^G2cA@S!cIZP~+^yH=iZvRH#h){T@PUW3COfT| zHYY|#{umj<-@jK*x2U(5{4`ESGHZJEN{ahtuYl;P;JLvUj4_AWygA)R&o>w7)ju}vZ8R1 zuJWGaGLYM+SJw=thYZ5wLxA$$py1l+TOeS5v$^?9Fx>mY!Z^rHnDs>Ya3as6IlGxA zvP}`;-dfzjLpP<~NYh%%Bo8FOLGH<|STZY^cm8nUO%#0}xgLdFG6Kp!q?v`_>g240mlo}j)O2b$i2^WE(W?@wpI4^WGjyv+60xA z)}~H@3d0&dpl>t4XlOd-6k3d2rHiIcmIce|{4jDhqSBupm#Tz<(YYsN9|okxD-%?o z*8L#Rd!SIGU*oY)vw%RIQ0gsOBb;eA+-TLSWBo1f@M*7^M<4rttX|M7xOWl;$9PLL zLUF)it(=22!HETBlsD7{tpm|5OD7;zp(j5q2y*k8HdwGkUPZV}u=L_bOf9u9HI|$? z6Zvn7Bl7|-f!ScN42OuD%RfIqFU1N@7&#}Zxb-C;&K7nyN|LirkbWyMF~Wu$<=>xvwrVWgwUEj{QfT( z5^vO+Q@f4YLGP;C(PN=h$o!p;4kG>>bFOpVSfx|W>kJ?N4&r;HPHJz-%YelI38LqU zYw2_VIlTYE{Rh-w{sXA_FD(-Izbq>dA74^li-~%OJ8G7%Sx6rd2v*zF(BCh-`gwTB z{NGuf@DB%$xJvlE*)tkdhGO~MCBwRpyViKkkWUSz*4U+YI{H2S?YMoEkfn~gX`!XUw>3LPg$G2Qm!}}5DDtRl&iouVo!_+^kC?Xb>yHAj(0%gPY zG{|P6Cj<60Tq3YkU9=W@Jr&>mwe9^^u>T4y=ayi@7SEdJ4hMx=p5I1rlt|Uvh)vN7 z%&WNWRp{aWh*q7(+ELBg`>K^vw7|i0v*S5}B!@6sc(&9?pVUdsFi8yv_Ns0VZXmeBhi-z7=W2ID4hMnPf&G+7InCSN9j5E*3RBU)Hzz%LU=-=>JXRWp>e z&_FQ-vcN&JAb{9Dr+ki;qj8#=g~s6-Lu`Ru&ryaT?jp^o!^UUq6pX#A!KyZ0Lf@^ z5Ypn=+1}p{?Tqy(yBWU7k}ta4sR?yu49l9oirW`Msx{VZAwMCfuOLgBXbnGNsO<^# zKyOhSaCxRQngs<}6BJbm5C8@g#{J9-r-djKI;4Q&zp40$B3P(xa#OV{fg7Fro)7d94PeIs6t{t~%P*&R>Y`RXQw+mQOm8MbwmawyvCa zRxDYDfdy#O{S`~5QWv)lL;L~L@E@$60^@q2+=bfvt;;xEo7+qnAbPV3=)hpgIXb$j zJCC@bga->U0M!Re4?w(@@~U9|*h#nCO@wm*Bono;>P*g5HfpzwxRvSR5sNsL3legb zo`VL{?XeELMXkShsF<@X|pm`|2TWLUZYhs<#Kwkd?^CNwW{%^>t-T;Ayg1h*yUHN;^12V z&a^mHtg>3x)+c1phc*P{G4x2qS6d{-!?HIwcYC!9zyxr(iCVo6-aw%|Yu{t7a(9h$ z+CQ-g#7Z+3jXTa^Lulh4^!5Gfx2LHZ$fs3K{!Q>P?X#RIMTW;UMj(t_{6M=IM>Mms ziUdHVSYyXkwpq7tq3>CM-)mSnv^ z6;ax5)DhVDMmSDh>`|)rg+ssaQ3FokIh`ID(pp2yw-k%tDN|<^$iQ%sex3i}v)szX zPS1+ZM2geTx{;H5*q+-D5Tyl?>P4T$r>A{bR%QpvM2L7?4>!H@*y`>)YE4(T4{{ct zy7V`G-@RWV-L5Qx;lqtsDEw0r9;^{y(sn)HS*V|DG|-MF69@%sVl#*Id|M0z24lFW zLCpLeNwR|T5%W)O*OQrTg~A=5FG9nLwLUTjSsg!c$4#$1N4yH#Ty>OS@T=&xD2_?m zM>SeyVzE=+@-Dz3TU5wd^wGo6Bl<4ry09a9ANK+T^}}mc@8L_wb!K*-ED*0##6try zF>TlMeSPPgYZES4Znwc>ChY2+dbV4(Mf4+25v48SbMNGuuf99`*^}89KRx!@e+R4{#@Bv zkIs0~`j+l#U~wAjL%+GsN6tjot6gioARMTnHY>-7{!3(# zbx7$j!t#40lBP83S4QDue_qDTW)W*1_e^# zG(FTbUVgV`HM%yGFzH%?nXOjRz{Flon$cK)rYm3RW6E}#CtGsf;hJteK3FzCS2<$+ zP(xcg@!GY#Cv>k!FN(lDyTE+odG>tj7wE-9d6|zZ#|0Alv(7$6@H=`O!_A5PHy+O} zejrXIVw$!r?7W$3RT3ld|IaSVxqHZ*KnI%mU!D4NC4Jkh)3pT4rU%yA%qMM#gBl3o z4&c}R&3^om)ba2koB$dvip*5F?Ib$#)d=J6kl6=g(mYR2$L~*iFdQSR8dMs!>()qb z-jTBPz6>HgF44M!K)fq7?hePN?ICS)MexGZviK0fPX$Ix};qZO9=sgWF+Lp%R~(V{|9knoDBc~ diff --git a/doc/salome/gui/SMESH/input/mesh_through_point.doc b/doc/salome/gui/SMESH/input/mesh_through_point.doc index 968bfbc0b..b84df8b1b 100644 --- a/doc/salome/gui/SMESH/input/mesh_through_point.doc +++ b/doc/salome/gui/SMESH/input/mesh_through_point.doc @@ -24,6 +24,10 @@ The following dialog box shall appear: select the necessary node manually (X, Y, Z, dX, dY, dZ fields allow to see original coordinates and displacement of the node to move). \b Preview check-box allows to see the results of the operation. +
  • The Update Destination button is activated when Find +closest to destination option is unchecked. Click the Update +Destination button for update coordinates of the destination point +from original coordinates of the node to move.
  • Click the \b Apply or Apply and Close button.
  • @@ -34,4 +38,4 @@ to see original coordinates and displacement of the node to move).
    See Also a sample TUI Script of a \ref tui_moving_nodes "Moving Nodes" operation. -*/ \ No newline at end of file +*/ diff --git a/src/SMESHGUI/SMESHGUI_MakeNodeAtPointDlg.cxx b/src/SMESHGUI/SMESHGUI_MakeNodeAtPointDlg.cxx index 9c2b90fb0..1c0e05abd 100644 --- a/src/SMESHGUI/SMESHGUI_MakeNodeAtPointDlg.cxx +++ b/src/SMESHGUI/SMESHGUI_MakeNodeAtPointDlg.cxx @@ -175,6 +175,9 @@ QWidget* SMESHGUI_MakeNodeAtPointDlg::createMainFrame (QWidget* theParent) myId = new QLineEdit(myNodeToMoveGrp); myId->setValidator(new SMESHGUI_IdValidator(this, 1)); + myUpdateBtn = new QPushButton(tr("UPDATE_DESTINATION"), myNodeToMoveGrp); + myUpdateBtn->setAutoDefault(true); + QWidget* aCoordWidget = new QWidget(myNodeToMoveGrp); QLabel* aCurrentXLabel = new QLabel(tr("SMESH_X"), aCoordWidget); @@ -243,9 +246,10 @@ QWidget* SMESHGUI_MakeNodeAtPointDlg::createMainFrame (QWidget* theParent) myNodeToMoveGrpLayout->addWidget( idLabel, 0, 0 ); myNodeToMoveGrpLayout->addWidget( myIdBtn, 0, 1 ); myNodeToMoveGrpLayout->addWidget( myId, 0, 2 ); - myNodeToMoveGrpLayout->addWidget( aCoordWidget, 1, 0, 1, 3 ); - myNodeToMoveGrpLayout->addWidget( myAutoSearchChkBox, 2, 0, 1, 3 ); - myNodeToMoveGrpLayout->addWidget( myPreviewChkBox, 3, 0, 1, 3 ); + myNodeToMoveGrpLayout->addWidget( myUpdateBtn, 0, 3 ); + myNodeToMoveGrpLayout->addWidget( aCoordWidget, 1, 0, 1, 4 ); + myNodeToMoveGrpLayout->addWidget( myAutoSearchChkBox, 2, 0, 1, 4 ); + myNodeToMoveGrpLayout->addWidget( myPreviewChkBox, 3, 0, 1, 4 ); QVBoxLayout* aLay = new QVBoxLayout(aFrame); aLay->addWidget(aPixGrp); @@ -297,10 +301,12 @@ void SMESHGUI_MakeNodeAtPointDlg::ButtonToggled (bool on) myIdBtn->setChecked( false ); myIdBtn->setEnabled( false ); myCoordBtn->setChecked( true ); + myUpdateBtn->setEnabled( false ); } else { myId->setReadOnly ( false ); myIdBtn->setEnabled( true ); + myUpdateBtn->setEnabled( true ); } } } @@ -318,6 +324,9 @@ SMESHGUI_MakeNodeAtPointOp::SMESHGUI_MakeNodeAtPointOp() myFilter = 0; myHelpFileName = "mesh_through_point_page.html"; + myNoPreview = false; + myUpdateDestination = false; + // connect signals and slots connect(myDlg->myX, SIGNAL (valueChanged(double)), this, SLOT(redisplayPreview())); connect(myDlg->myY, SIGNAL (valueChanged(double)), this, SLOT(redisplayPreview())); @@ -329,6 +338,14 @@ SMESHGUI_MakeNodeAtPointOp::SMESHGUI_MakeNodeAtPointOp() // IPAL22913: TC6.5.0: selected in "Move node" dialog box node is not highlighted // note: this slot seems to be lost together with removed obsolete SMESHGUI_MoveNodesDlg class connect(myDlg->myId,SIGNAL (textChanged(const QString&)),SLOT(onTextChange(const QString&))); + connect(myDlg->myUpdateBtn, SIGNAL (clicked()), this, SLOT(onUpdateDestination())); +} + +void SMESHGUI_MakeNodeAtPointOp::onUpdateDestination() +{ + myUpdateDestination = true; + redisplayPreview(); + myUpdateDestination = false; } //======================================================================= @@ -667,7 +684,14 @@ void SMESHGUI_MakeNodeAtPointOp::redisplayPreview() double x = aXYZ->operator[](0); double y = aXYZ->operator[](1); double z = aXYZ->operator[](2); - double dx = myDlg->myX->GetValue() - x; + + if ( myUpdateDestination ) { + myDlg->myX->SetValue(x); + myDlg->myY->SetValue(y); + myDlg->myZ->SetValue(z); + } + + double dx = myDlg->myX->GetValue() - x; double dy = myDlg->myY->GetValue() - y; double dz = myDlg->myZ->GetValue() - z; myDlg->myCurrentX->SetValue(x); diff --git a/src/SMESHGUI/SMESHGUI_MakeNodeAtPointDlg.h b/src/SMESHGUI/SMESHGUI_MakeNodeAtPointDlg.h index 07ae2c933..4ab5194e1 100644 --- a/src/SMESHGUI/SMESHGUI_MakeNodeAtPointDlg.h +++ b/src/SMESHGUI/SMESHGUI_MakeNodeAtPointDlg.h @@ -69,6 +69,7 @@ private slots: void onSelectionDone(); void redisplayPreview(); void onTextChange( const QString& ); + void onUpdateDestination(); private: SMESHGUI_MakeNodeAtPointDlg* myDlg; @@ -78,6 +79,7 @@ private: SMESHGUI_MeshEditPreview* mySimulation; SMESH_Actor* myMeshActor; bool myNoPreview; + bool myUpdateDestination; }; /*! @@ -95,6 +97,7 @@ private: QWidget* createMainFrame( QWidget* ); QPushButton* myCoordBtn; + QPushButton* myUpdateBtn; SMESHGUI_SpinBox* myX; SMESHGUI_SpinBox* myY; SMESHGUI_SpinBox* myZ; diff --git a/src/SMESHGUI/SMESH_msg_en.ts b/src/SMESHGUI/SMESH_msg_en.ts index 7fe4e8f7c..2dd8eacf4 100644 --- a/src/SMESHGUI/SMESH_msg_en.ts +++ b/src/SMESHGUI/SMESH_msg_en.ts @@ -3953,6 +3953,10 @@ Please check preferences of Mesh module. UNKNOWN_CONTROL Unknown + + UPDATE_DESTINATION + Update Destination + VOLUME_3D_ELEMENTS Volume diff --git a/src/SMESHGUI/SMESH_msg_fr.ts b/src/SMESHGUI/SMESH_msg_fr.ts index 27645cecb..6aae4287a 100755 --- a/src/SMESHGUI/SMESH_msg_fr.ts +++ b/src/SMESHGUI/SMESH_msg_fr.ts @@ -3929,6 +3929,10 @@ Vérifiez la limite dans les préférences du module Mesh. UNKNOWN_CONTROL Inconnu + + UPDATE_DESTINATION + Update Destination + VOLUME_3D_ELEMENTS Volume