From f2d56cdf4234ef53ad1c12586fe83c1d80ddc3f6 Mon Sep 17 00:00:00 2001 From: asl Date: Thu, 21 Sep 2017 10:51:15 +0300 Subject: [PATCH] refs #1330: type/size support for polyline arrow --- src/HYDROGUI/HYDROGUI_Polyline.h | 12 +++++++++ src/HYDRO_tests/reference_data/CMakeLists.txt | 1 + .../reference_data/Polyline_Presentation.png | Bin 8424 -> 7533 bytes .../Polyline_Presentation_triangle.png | Bin 0 -> 7467 bytes src/HYDRO_tests/test_HYDROData_PolylineXY.cxx | 23 +++++++++++++++++- 5 files changed, 35 insertions(+), 1 deletion(-) create mode 100644 src/HYDRO_tests/reference_data/Polyline_Presentation_triangle.png diff --git a/src/HYDROGUI/HYDROGUI_Polyline.h b/src/HYDROGUI/HYDROGUI_Polyline.h index 130dc879..18aa9ecb 100644 --- a/src/HYDROGUI/HYDROGUI_Polyline.h +++ b/src/HYDROGUI/HYDROGUI_Polyline.h @@ -44,6 +44,8 @@ public: class HYDROGUI_Arrow : public AIS_Shape { public: + enum Type { None, Triangle, Cone }; + HYDROGUI_Arrow( const TopoDS_Edge& edge ); virtual ~HYDROGUI_Arrow(); @@ -51,8 +53,18 @@ public: const Handle(Prs3d_Presentation)& aPresentation, const Standard_Integer aMode = 0 ); + Type GetType() const; + void SetType( Type ); + + int GetSize() const; + void SetSize( int ); + public: DEFINE_STANDARD_RTTIEXT(HYDROGUI_Arrow, AIS_Shape); + +private: + Type myType; + int mySize; }; #endif diff --git a/src/HYDRO_tests/reference_data/CMakeLists.txt b/src/HYDRO_tests/reference_data/CMakeLists.txt index 021ee7f6..beb7e9d6 100644 --- a/src/HYDRO_tests/reference_data/CMakeLists.txt +++ b/src/HYDRO_tests/reference_data/CMakeLists.txt @@ -89,6 +89,7 @@ SET(REFERENCE_DATA NLD_water_areas_dcw.shp NLD_water_areas_dcw.shx Polyline_Presentation.png + Polyline_Presentation_triangle.png pp1.brep pp2.brep pp3.brep diff --git a/src/HYDRO_tests/reference_data/Polyline_Presentation.png b/src/HYDRO_tests/reference_data/Polyline_Presentation.png index 0e9f0134bf46ea364e08f74c07b031cef2395a8d..b48f1e0efff6ef60300c3fdc781cf52215355057 100644 GIT binary patch literal 7533 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 wKyr0Kd)BW8qG*pXo8K6kb%7 literal 8424 zcmY*<2|U#6_y6;m8O<;Lz9$>(`K&vVXs&Uv5ZIiHfeJe;P>%#uL}O<&=> zbQMBmCPE}X+BBFsyEi@p{zykS`|n0b?jiAuoti5*8zClIvDAJ|&Dk9*ODzai(|*7CnZ&Rw%U~}pBB}3kSm%QqHP*QI@2fp zTw{9cF2`~D$h5bGdG`i;GXK20^~T5nVViGb^ricCXKwHFJ=j_7^VT@~jt9sg^|wzn z{1NT?`?QYk2BMy6eVL*?++nw>R4U5n?B$ClQ+m-bt-*OF+c zVeX5H1Kxw7H9PxFcF5|h+Nuhu7zLRm)n@KEJ8MsM+c$wL)zqm{*W|zquS1B0jDqg( zsEpfA{*;{hhpFu;wV56yr=*?YG`2TAM;Axp(-sF;NVsNNM@97% z25JQnSrJ~YG2#uDnhhQZ<7#~Rc9qTi3*FpBz>PxpJT3cGyC6Qat{LmmDR&M=&_ zb8L+SccW<^KY>UhozM!S2+=7AM##UwqCj=jJ&vrQWKu3NlV&38d5ODbSZFWVO<#W` zEB`^S@-rrmB8(|=h9+*$LubNwi+5mTg_CHaRn=a6Il*=IycAp5?>b}D zecvC6i?+$Xp(sRY;fQ4~TdllLxH2R_Wt_o5QOcvw8{=G$?L;lowYN53LL~9I`fwQy zu>p+Ez$l?U{A`#MUBSaltdCKI8*eu8m?XM#&c;_NFkA>H=|g-*fHscqXb+sr@yFWo zPco{;fc0*bN1l7E@U||MYrg7If%-VAai3%Nwj1qG$=P5U459`;{JOePPNJp7XM2)p z9Cy%?1UveqjM2IrVb`=$F9ByaVhB1k)bj{_-Hno^SKlJA!`(Wyc#VPs?FaB$4HgI9 zyF-F#3t_lExi*t$g)a#(=yiPqhdv6lzU)Qw#L`*QFp5M0q%J0JKE`kW3yN$$4PBRD zcid=My6{frW|R4Inf4@xgAu%27+P`t1J>_C%c8(Lqnk}i*0>(SL2wq4B0OZP&F6BH z_zVI~bCR>#_aavVK3f^1FtalpipdgZ+1`|o@-xpN63bV1V_o-=|J*c1Squj?&@#(Y zc3B@PaiD1(bw$`|9k<)05?2_s-F;6+fJfb*J3q|j75A#!H>%W2&F#s;@P10 zw`2^Cm88ni*zz};||HCtnpYjX$Am1&?G@A=0p0+07Jp8pQ)QwiW9 z8^7?0d%OJCT?DOuu8yhY&Bb5v2lrkC?w=pVtga&qgLim5UQJ_Lx4kaJU_zhQQZa_x!_8mL?DAt}2cn_@KUHjjasIO?xF0+&m(##@CRwpJZ;n|jCBGQEq6Y(EbAht?# zf)f$-MN2~~68yGbB#W-_JmDnnc~Yu35Xk5 zAan)~x}y(JP|J*t_ByeUDNdeR=f|_TW{=`j9(wWR(LWJN)~jaN8oHpk(v&QkCOR6j zxY1azGQpU_5ZsX!`6V+rT#uj1tK!XV zb%U2j2ujw($OFYKnHn`b-JMde(daeUwD_t@9^n&r&4klk3Im|m&pnAjHR&RG$O4} zY1s}dHdWi#>HL{W(KoP~CZ8M0CI1`+yU<)B*`aG*d@)3NShMr zwnH5md_dx3s$`{%UO@1Q677e@+KHjLB$0nJMcLX3#r*-PL>_qnN_8agHc%%q^btvv zB>sV~r7`=?PZ=j&EqR>W&_rg1R1hxs}F`0&5R= zdps%2!c;0vfx}dVcN?mbjMP#P>9E5PVk!OVSo(KanGq1zC?#h+XidZv!f@fgB8I`AUr z)*qzfinc;oj9+~-0b_1zLZ4|&mg@#(q@5?aN@1MVVOdZK#$IPpl^I`M7M&>y$7fL( zBdUAZAYD1ORe{sK_KgNY-*0}jd3V#FC#Ph9i)}WQp!&eJt&tDI3K`0W$#i{OT*$CR z&RaBXSN#)aJXuvv0{6+9p6(4LD@+EnA&RLBjd4SCQaT5>Ow`nM+}`>LrF6kdW8_ z3P5DI9EI3|>uRC~-7YJk9xP@!-XvqF{T!;=20o0&6*<@DZwc3qq`PC?d_bs2kn5JYa~gm1btB0uSV>hkN-D zF@||d#@rEQ8FueN|8QeT-7`3b2DfC8=o5{p)Ur((T{)6Za#!FO>JXFK(oChSQ4Dch zNHo2rJ{a<2Vf-zJp7oGW5n+sOn!#VfJtSJKw3ReuKd3(t#}tM%Ff#J^J#3-FP@i#^ zijLZ&kU#sWszttN1!Y~LMamM zis`rv!rN#}YZF2%dJ&iDBTSqvV4g7bSvQCwHijuej0kx`j6y;T@VjDZ;z&Kjp>MZ7 zRPA4en)N%KwqUC0z2J>R_#{5t+^E@zT{{#u42+(Un?E>$Zo{ zjl@2M4{gY3dz0pXe6Ku$y1!Y}D$!o#siQ}oDdNtymD?YSBzva-cm`_BPUjBxfjL3y z^KZR;Il)5zQ5d*hN>+YL|J@tjS2IE{tjhPW8!YQljm#p zPJdi!e^?I}XFhg(c&6YV|KZWfGlPc{?4k#v1IOMUPs%4XGB_6N@0XHJ_hF4kS~wB0 z`#z=SakrO08W^Q(2kPCD;W?t_%R#ETdRA!j%A?Ab%a!73zR6P?BVP|3eh^18*S(c6 z_WY0AGpOtHm&mmmnQS8mMa*1x@y@;Xu~!o=h(;t>%@fP*J3gwMBab?Nx5iVRkGgLA zxZ-jv7a0Ofj6X2U<`|YJ%&hU~%60FFccOFmU`8;u7YP<#ABrW^OdyDfXz;U5kn$#(>a|tb@YBc;1<&f?>|>9OBhEcG&Iz4o4`=a;M^zhG8i%Y7bu8bs%%{Us zce1<)k!U(r3mT2{vADHeJrOUY4Hj7vo|mDEv*WhY{Bz%i*_U0Q2RbUW;=~n zIenI)LEyjC7cv#I2N~}zRTh`anJk9+xUP*&j#u0P-rhVDQ(wWP|i zTsEBA2{BSI595zi-5v9ngNSk31BGZ14$WJELKeAIUye@qUjEsJBAgEKUI9Xe(27L6 z{Yh5e=Jv$;P>?wc)~(ad6Q=+lRtBo-YLAC#>54*PfQs)f5}7+eVT3)grvxQEA4!8l z;WHT=LGEK?(Lz{I16BM~Fkr9EyK^Q{dCwzEUb?o>Wx*ju?ng*bNT`PK{cEKl%RueH z2`08A1Cx$;aemPR8SR2=J@Pt=929x>2tjm32vyUV=8mfT9R3eY6!DwBSSg5s@V_9! zEBZOP|&T-`XC}h7%&L)31oWd8&dy#SG5o*E?pZ)Ep;>oIwtw#BB+coJJ0} z2~O{IaPeV?wDpjDkQ0S*Hir&*QU!{Gr9@2bn**dfKoOv77(%9KuPUI=fYbG0B;*Ng zhp7--mPL2ilkWW`1ss-1L~25I-bUquBT|UHi9|aHktXH8Zw=_X-tU)>LU{-up7EQ& z22)GU1MNJHFVsOw{)es;;hHm>!YIq8J8bDxd&k63rZlsEE<|SH z9AF|L_G|f1a~82eW~t~9=feM@F@Gl6XNqO;bQgxA{QTO8%e3~Bzl>kx2CESVAU0*p zs$GXnXe|+{JXCV=*9zbWs$s1aBuXJK=)_E6hSMI;sUu{y(8Yf)_{r$%hFL0uNd)hK z-@La0MI?FyIe?n4lkMGYk2sFM;6;%;w8amh)xUN67~C7F9Ydr|`JsM+vPe|&d*KV| zlvi1M@~)ngW;^{pZ6;Av5sNWO z0oT+LiJ(0&1#wD&g31*#QEmK0izEOriFWAYqUo&VR1|si*NH{*szQ0wI@MxS5dPu! z*&2+A%I7VGQIb&Ij?kb22klS>Pc4A$HiRn&E<XCUEMMDU% zjeyJ0RCyQYG<6tIue{mxKlZ;f9lJ+H#lOKCxn^4#^X?-IiGQd1I8$Q1g)53n_d6msIyd=*ATL3XDVVFR-f(IHmg47VOtx9dD-4+c(H%vpS{q1&xZG_agfgI_oH9RY zHQ`jpSHV@$jL^#Y-QQ}4E1@G0x;lFa;7)X^FKQf0dM|F@J)&#|g9`yauewb{)z zmgxKMD2X@+A$7sUQ?wdjA|f0@Xz448|NOfI#0@Ow(oxHA{Uc$)V`K3`jDq*vsCrIo zt6AgZ2c5+!n`0%qfI@3G0Pq*0KKhLsoX$FWsAJeB;qz}aAYtlb<02YxT|xw2C3u+G zn!Qi|)>GDyO~OWC=11A*NS*3B6PFGQC9lnW-k*2PN=^s}W44HBC?F zX{}o>3r#BM&-9_gSASy?KtjFN= zN<{cwCWw(D!rOVMptvsY;?~T7MbPs@`njXnHfbh$G9oWnvq9Mp3Vw+f*z#n`bMyT7 zEq;tfdC760>INk=i-=in%LmDip`-N4fAS_L-J6ib84gNdORscJZ$Hlt-wo>K9!U4b zr-MQ_Cg+OJGDruS(4Q0-x9Gcx=1oe zjm(gv6{(eJHdL+2KURO(w3)1y0J>`9M<;ZZC8qP@@mGR)DOP-kdBZ#v%RTc|Mh2(p z=aL~|Cgq!mETuI?JPJb?U8ZTh_0*zH`^!BR`l|1u5%I-AA`^7@xJ7%^(l6h8X*G!p znVdSFo!VO8%qz#nPnC~dMA_{)5>5B%kbLo5xyNuYr6u*z*6*`8(w0n4G0#r0#@u3~ z5ziVQ;Q=j;o58APojaVjm8q|IL>5rh8Nvmf&trXG^sVwZ`qtl~L9eOw>4xw3<$FJs zC%2?wZvZmt{<#@G)Wu#OtPijHR1+6_e!OPEw@Y<%V`JpY%f;9oXmwiNwDYrCH>$<= zvX}k5jcGA7^zqE4T4$qb%WRABVVkkC!@O}^g~sFABuD0Vy#@HCi2KvXT`G>39s4vz3ewAufha+<^MA^;WxNS=!uPls- ziJK^ur-=_WzR7F0efy+x_V#bz>HS1+nYjLi0k+Q;-@ms2v13Uz@txYdbr{+W4)lD6 zEfU(mR1Sn0G4#_npV*^`h_4EpQ?L6XF*F%BLmLroSLEP(iOAjxVlT)ag^VlB>gABPguTAH8NHhq&g@wO*@ofy{{o9Gxb1+TM6wbcrfB)_v{- z!9r7=!S(s;f_yU>5x#pnwax|~=!~;NAX^)car*CZ-I%pVLaX)9%~iV{d{qg+vHfAUF~4Sn_bq)?S zA9gCdANf^#eCUy#N5#aCLf7eJfdKSmo!ze8A0G4lTnDkSXSmIFu(W^RLwM#K5?c$T zj(lOdxm#hyMAVb;>2A&-WWh>n{A$MQ;K`A?{ufrgSA)ks zsb*I!WMi!s*pQX4Aw#acySB*ysKZ z&sfXx7R^cL$%(;=+T!vbH&!)is3n1%4S7$sdBPxQPW91N7vXteKhYH;Xt85IEV@n{ zWa|j}wrh3Mr7KS6U$l2tg`bFVii?O@mXjucQ&&)vmM z2NsO?=i0g34L|XGo#$JqF)|`v093DSwCQNs7*H|NnRlfw=0{%ev4I~=2L~IkwAqck zN_*Ed-m@=v+-iTM`GjBY9gmfBv*xa6ftnLA@`6k=%XZpcz8&4EYzo7`q zDK%8##0=cNlwBA*-g)vsck#!lx%Yp(Tifyd(&U(Kux7ws^UuaxiH05*4YxblMfH!# z#|}L(3?6h19$6LDeYfs4ENtr^=`740Y>J&6wxiHPpcBq^QY_@fmd5nnm-kpV3HXS7 zdntCf=26rBwhJfg*4>ZV^R{lFuYLHY$CFb9)<1v31_eX5%=xv8%fD9C8rThMc61j{ zE*MYikKLy^eCg77*N%fD--9>y7FB!&qOGoDTO_q%qSv;MEl ze~D)m_zc1r1X=+GI7f#7A(cck=fDJfgB8^PYmO%rkdUoVJKPF(D|r-+W+G@F68{%~ zU<}>SR{ceb)sE@{m&Tns4uX>r`*tH?xFwUVN^pk0C|8c~%+r-htZUmw>4q@rDkPJt zZ|qC!K2-obxkfyW@Y3277#f9Y!pN&Vohoqu2QUB%U>h}$}0Me^$S8f0x(f|lt zvMAcQ>>J8Mzr=aA&OQJ#&xAkNc|DoA04g1;R$4mxC-rr#D>rK1DmJ(zo4$$ero)!j zxkk;Um>B40=~ihCMkqv4>n~8(B(gNv(cHaTZfcruHV&obFM5_QO}cC{7@CNuP>OWw zV;v4R7-Sf5|#Up^(TAN6#_`9*$PG`#c_+xUz(fbVC2m z-MBOkfUj($++^}8Y;xw92ro&N3<+sW_iI;dI!!bB%&I8d6kP*$F{a*A0GL zd}d&3KZj7CTD$n-6XiI*ON|MP)Ox^43hTP`&Tq7&fkkW&71cAeIf_1j} zw4zAN-n;Z|3U>Ti2}a5~pyH$B=2|~zr$&zuY+l~zoE2AW50sGUF{l(9Gr^X%a z9{Mq6E33niW%v470-e*Nb398+MOkCtx7_+ZaO!@n_-=0*r&W$NG)ZMDyq7aAcojsG zvvyl*pbHl=o7o4=?GJ`*ci%BGkhF$3Us(=bYVhLX8H9>L9wcOU*0fSg%Xc1l{a0TA z&rn$khIn-wpNhzMb~_wdNe#(!)dV}6@UU6E7949zNW7~Gyld1uOjgl<Len~@5hyWH~R2^02!J*R**{`;2FJeF( z)ATG!pi`gPq?=0oz}cb{ey2q|MJrP2%yE|`mF>qin{62-K=eT#-7JUNb_eiQ^B*xX zZgu%P*Tc@`c)d!%rpS+yEa&{4xvutHe3nWeE2SGNZ95v5x>ps-EfW<}7Dk7kxqw~p z3_kltMyJ+^lfNSu>>cpywVonLifNRRb~7{VgWX+X0k=8ovrp*JLmq_6s=8XaP;rsk z=nMLumEz(IAT zo*#XQ_YI3#I|v`xWOvadf7o8jXn7HlyPVE{n6w)>WHr`$KIPlNvzV)gx&Q7wLX-wSE>d19<#bpv=M$`+$7e9L zl?4kz#T-=WB>1+M;~IXtU_`_rnku_rPX;u7_59)0YBGj@P4|V~wg3YHc=c{JZ~she zna>9nAykYN%qD}>-&GQBRK&p`r45V2YaGB7DQ;_{NP<%>+uqXs;qQ5T5Gd6QLb;$y z708Ir9?{)xyLAlW!fUodMp}o2n+w`!tkY(yE7sES0#9txtrsaTm`Z|!h zDNg8<{Bmfy`CbBl=eVLgTNn|w2O+7kbbi?pNx}Ihlf1T(xcbZTgxd9EK)ZFMl+ze? z(zb}POIIB<)4pJW1v3jn^J2~q=$@l=X^F+^0}O4KEU;xGmw(({NT7)e-8nA+ct(Aj z^urFR*m)g~tMwHT(AqM&O4>ShRzgbe6REMt2P=AqKkO+YbZ=Es}6vQ#Vz$~r%P#GeV4a$*j0YmZm=g4vX>tRo z;mAPdb|R!P1i*_%N^GYf6XusyUGo83Yve9rI1N!TwIeMV5`mAP7imci$3*eKGEuO0 z$1%6$Tnsnl4*ka{r=|r2I#LYiU1E%gh*B^SBh9#Ej%q6AMJOAZ{;itoG0ZpQ-@7y( z2Rf(BU4ifPqa|SbK5$bIr9#Qq!Q3GqD2PJJwe7DhINBKrgoYeZ{x>elTYATjTG40= zu>D(lJxcY!+$~{Qs0bD#)1UwIJhIAw3p_=n_4XK9hF%k%6Oeedlgi#bJVJoV1R%h< z+gmLT*GlUqNMrn+8z<4#eaOaJf`)uR$r&GRQkmE)mOUkD;=>fPccgaRs<&WjvB$PaK zJ}d(c3K)NE7V<4$`|48-G7VT}?fIdt@~i~yMp*!wWOOxFaPA;ci6g>4ii!YqE+bum z6`sEhWAJl{N>*sU_LvAbh#*ENND!rsGgio+BDkd+uQbVVb0$%4Tpy8u6kP(j0mTUL zy4JfSd@t3;?TjNUA>!&*z;(rGAXt3Yklz%j&z*zue>z&AbNa(Qgt*YJBs|DtxLp>q zb}bLNULR`3OxzVj%G?YfXlc(R(6GMEIlFaf?^4GxU{P4*rJGIykTAZAkOxrmz4X%PXTq(eb#55Dc{s5~aQ_NCX743FKxJ zMVgq&gA_92L{$LzWC?GUWvBzVvf#}zw1}ywGSG>F5}qgtz(5n{sS2HLK*Jd^U&O$y z@Qp|*g+;A)L&k=aCd{4^bz#K2J?DlcZ3E7-uB#oi}`e5K|iqlP||DJxhB z_oPyd5Wr=`06TcA`u@3^$V5>&)~9tsgZ0E|!)ZdF5zx&9ak0R*Xv>E3swFJYZH%C@ zmy#jw;#aY#zX>SZJLciMtKU%q&5~o8R`nz2Yic4%LiZ)zm_)F;yrh2~*y&nt`N}@( z$U?!}N1~i+Kz?9({9#|>ey>Xe;1D-^`F&6=xIPiU4YU@V*vBW7Zou4ar0B-dr`712%L=LPd+NL*P1QJt-+FIW6(twHB$RZ3hR_y#OQ;x4_@b;#y%+sNh9%;~<)=^D;Es+|ZaMaIN^``&u&+l2%0$!C%%_#CfP+-i-&GHdf2 zw@!y2m1n`8o!1~b&!Qsv?MRXQscyhXDZVE3XJO@T)k?k%DTzA_-uqYB0M=dm%$gi> ziTiD3P{s3VQ{N_O%ptSNIEhWJtSre;v+=6%SPK}9KbeyI`m9l-p=IOhe^e3<&k6;C z;6-1`8)rJ>%7zRzu>^k&9BR#!*f-4Pq&u8+I?b_T_B4jeqLRPzy2$PG>xckdvbw5# z?Xo_xIG1X_^ztjWWbyZ2?A;HtN7h}gH7;I>l__oCok(fxZ_{%f9bJlvpuA(x@usld z9M6ZJj=dr7t-uBe4Lq)T6ZvZn+xAw|U~Ut_BFxnpwB2k)l-7GV@*Mfg6q8JZkzCWh z4a$W|=&{^Ml(SLvXIj1XN_+}+^^cYuHBt(dKz_?`#(NGopBg;K(c9D-qwIjXnw;}; ziLiWnmR4KrU~W}x?6IRYsX7GmD%Cyrqx!yllvkalzi#ekzX>xztTcXIo@JXQNxz-l z7C>tC!yX+r7B0Cj-ag`IpuXjkI+9`GM8QjEvC3B} zlI$B$Pm0?#_nO$rVk|2*#N+VBGzae!S&}fz&>es6svMS(a$yaGT=Oc{Sdz)jd0OHF zx~L`CRg?_9X{-Hbo4H>Fc3~yB6EbKNHUcqFZhc@8X|KhGugjF4Q!#<5-JJ9U@lDIN zz5M3CE_Js{PD0!!eO=E!l$)gX_t&heC*;!8l}e2Wf&x30^jIIJnS9e7e+!IyJ|yC@ zX_t*=i{jHG1gktz{^!=0$(Okk80$TW@*(xOOlZ+X)L@lX_n)gaV;W>1Fnf5>VW}eJ z0|!A_D1WhaQIzMI;U5pntQbnHI@CgyohYjtuQYU+$-wzptc2uy&V33bU>!u<5c;LQ zke0%K_49c0>iUR+Wyy2^Mg-%T9=vm-2nJkqGljd{ zcQ00Pp2omNoTi^FWZ;2#CkPkyWZF4PMSfupQ3;YX@f=09&N&s^SxgTQLW;PG^%gq<~# z?WtAP7^{)8az^5ne0L1&X70E2i@M}n{u0YzSnH3~zrA>*Ap+Iad11z&O96TKT&8rE zH$HpDcfWFm#IB7fWw;ziv%nwj1XW>B>QL~TQSei}ZZM^QEAhv)5bw4e0P7ipaPpVmSMUFcjX4P4+L zG}S;0Ei!01Dp?!xRtl?ojxey`P*I*bzSJ&`|YJCJ(Atd+LVG4^T=8X!BPQpmv5O4%ColJ{6t!rzx zJP|<@bipF=YL~|$WzOxQ4~7wm#{Xy)#LK`dD-qJ-s8sQ_CsM^z(dBmUDH&MOBucqv z1jR)0^oYk{ItkKafl%m-!tH1WA?QaBQ-A7V(`jNQt4L({Z8}WuK!&C|9|^qeov&$F)|&ExPY17 zjHTz_5sR^JiPW9Rqdz2-VZJt~`u?zVC_qs>Vnd_XLK2#A zS%7~gk2|Oe>5vSiGNq>)!?S&^SbEPOHE^5L6wEr0pbp0_1}PITeEs6{BgkT*H?DI;ym)V0=fqckZwzE|rqcGb<&?cSB4S?~Dnbc0mb0y>M%efHZuw%fxC_nl&`pZJ z{>4jq_4B>rz>6BRWO&)XFcJY?XvHkmk0m1yBLH?KFmi8598%3zM>Bzz-98_t)W^H% z1%@*cwnD3(Sa<=zeo5Uso%qi${U4!;LY`$>R(KG5LxdDX0Ckb)m&i=g786H+Uzu_AUk!G7)+dDI3u46QD^s|eA2b&u0lWqAItGr%$#RGy zV)03j6c>(dX7B;Pmy#%1>tBy;e}s^V;-19ii%&^Z&s&JhT9DvyW_9Yv`Wqb?wNKQ6 z#nf{Ady~WQv)vfPT|TKek9+L4aLo{n*R#%lM$tg;Mlltd(JG$I)GirSAErIv^S^jH zYq{(=pMEFjibB@13!K!aBPjcuJnQdW4cKaQGK`*;Zrq!k{ivqPz?G~jV50^NED1w? z%RXj`dsd@3>zJ9{dk1RaxSyKr67c!Rk<=+!TU&4|sCP=mb4Rw(7q{yi^j6~5 zX&hbS_c(GV^`R)q&Ar_TlbE%=eVps_G2wcvjB52?fIH{)p|{~UPSIf+p;n&}5b>Y;?QbG>` z=mqVSkpH`sZwLhJpa&o-XY`se^A$aRfKlO+5%hnwVSd#sF?8zOy7xrbgT^sC7Fs~L z$JQ|+EQPY`eZm3kmv+A;*OlrB8P4YJlL5O=osW(uADx~YoerAVwdm1sePr;@x9Zb9 zLp2uDJsVY(8KTIzgpm7PK@*a%yPkY|q4#96H?L;uh2wK#j3qMJ^WB!N@uruNQ?qqK zkXlLKmlRG5o~s@2omLC}`89dE{^H}|pFTA!MvwJds8e4yHB`OsHv9;JfQO@<$Ac&T zjb0Sw|K%-g5I!Dw_TFvYcKpzn?XUsmB|g<}7lyOEpJ~-qwYR>=SBUhS14gbe6%yNWW;JfzXJaGw^`rVx)|FGU}m- z&#DXXEi8Mw+d}PUf0%aBfO_C?oh}9b3K~qnX7z~hPjzfOHEN|jP$ zkl~e^9v(1S)HOMjJC!gHJUuZz`0eE)3&W;?$elvlUH&1KH$VPW!~=`Z^)gJ;u@f~A_&-VT&7%%IT(`sdTQ!**VK2t1wjKF*R2?d_Umsi9O^F` zn5xOEVNRIHsxAL4H+#dNjb<00)8!A~p9?;m(F`Ca*Y zurKmb&F~7Q&czofCKhQ-v3L8)Uq_i=PYz6$L^6lVEuM@tO-w7Qz5ZErI^dm2uo=JT zuYs||ds^#djr|S<|9GlC^>$s*xA@@cAI~kO){G8xO%G5u6}bftr>Re-nREpVy;&Fd zWn=KgPuT>?G*qRP4e9amMed{hJz+eP;sb$hY!PjgudLGk2+C+!dH54cN%7%2(Hdcs zSp2Ic=s!T^0u0^%n#Z>jzmhhr^uzzD^#9)g829>Ts|(Nmp)P5t!e+XN{q0K6nvHK|n+EzWmaAZCSqnMB#Qzju04H=c*eE cQ_FZ-_9=7U(2c$&`bcG1Wo5rIi|rQrKXxWczyJUM literal 0 HcmV?d00001 diff --git a/src/HYDRO_tests/test_HYDROData_PolylineXY.cxx b/src/HYDRO_tests/test_HYDROData_PolylineXY.cxx index b3af935f..dfbf94ae 100644 --- a/src/HYDRO_tests/test_HYDROData_PolylineXY.cxx +++ b/src/HYDRO_tests/test_HYDROData_PolylineXY.cxx @@ -28,6 +28,7 @@ #include #include #include +#include #include #include @@ -258,6 +259,14 @@ void test_HYDROData_PolylineXY::test_presentation() HYDROGUI_Shape* aNewPolylinePrs = new HYDROGUI_Shape( TestViewer::context(), aPolyline2d ); aNewPolylinePrs->update( true, true ); + + // Check default type + Handle(HYDROGUI_Arrow) arr = Handle(HYDROGUI_Arrow)::DownCast( aNewPolylinePrs->getAISObjects()[1] ); + CPPUNIT_ASSERT_EQUAL( HYDROGUI_Arrow::Cone, arr->GetType() ); + + + // Check polyline presentation with default (cone) arrow + TestViewer::eraseAll(true); TestViewer::show( aPointsPrs, AIS_PointCloud::DM_Points, 0, true, "Polyline_Presentation" ); TestViewer::show( aPolyline2d->GetShape(), 0, true, Qt::red ); //TestViewer::show( aNewPolylinePrs, AIS_PointCloud::DM_Points, 0, true, "" ); @@ -265,8 +274,20 @@ void test_HYDROData_PolylineXY::test_presentation() TestViewer::fitAll(); CPPUNIT_ASSERT_IMAGES + + // Check polyline presentation with triangle arrow + arr->SetType( HYDROGUI_Arrow::Triangle ); + TestViewer::eraseAll(true); + TestViewer::show( aPointsPrs, AIS_PointCloud::DM_Points, 0, true, "Polyline_Presentation_triangle" ); + TestViewer::show( aPolyline2d->GetShape(), 0, true, Qt::red ); + //TestViewer::show( aNewPolylinePrs, AIS_PointCloud::DM_Points, 0, true, "" ); + TestViewer::context()->RecomputePrsOnly( arr ); + aNewPolylinePrs->display(); + TestViewer::fitAll(); + CPPUNIT_ASSERT_IMAGES + + //QTest::qWait( 50000 ); aDoc->Close(); - //QTest::qWait( 50000 ); } void test_HYDROData_PolylineXY::test_split_refs_627() -- 2.39.2