From ad76ee16dd4ea9a2c9fe2a1c3e441124e83b1767 Mon Sep 17 00:00:00 2001 From: asl Date: Fri, 23 Oct 2015 09:21:11 +0300 Subject: [PATCH] test on transparent land cover map presentation --- .../LandCoverMap_TransparentPrs.png | Bin 0 -> 8323 bytes .../test_HYDROData_LandCoverMap.cxx | 38 ++++++++++++++++++ src/HYDRO_tests/test_HYDROData_LandCoverMap.h | 2 + 3 files changed, 40 insertions(+) create mode 100644 src/HYDRO_tests/reference_data/LandCoverMap_TransparentPrs.png diff --git a/src/HYDRO_tests/reference_data/LandCoverMap_TransparentPrs.png b/src/HYDRO_tests/reference_data/LandCoverMap_TransparentPrs.png new file mode 100644 index 0000000000000000000000000000000000000000..f0723e17047573aee10fca6666cb3a08d2f415c2 GIT binary patch literal 8323 zcmX|H2|QHm`+v_d?i^X>j6KPm8A~b(ElQYU>{6y~3tg4azFFEs2UAUvrKDYRZ{3@F zNu#f+M`THA%wJj zeLUtPq(&ix2NFNQ$jNO95%6F|i+mRl@QES9rSPs1;S&^%kWPu}4?8+hXAD9V^7U|A zu;X;+i{;YSt7A*MUOnA(L}TM|jrJi zK3-#Jv>WM6(@f=`3rkm?Q7+};VxiG4WawvL*6l&i%HUS4K$P<7_!}QX`bBU9RuJxV zW^VM}Qs>zOeH-4(?(DJ=h|s&%yE-*;-FsnK1eTqeiPWKg7NZ5N1^*EvP~Ee#7q`7;yL#azJny?cxW<9Ah`w}@m48q{!cd}gy6^WWfCf+|?la&Ht) z9#Lme@rru_%cN*6P0Gw$j&Lpyd5oh`0?9+QiVfN%(>LR| zicKJmMvZet*#{72eY_9JrsFJ`7#Nt$oT4eFx*n$v(5P9?Abl^8a0-Tt$u5lUOnC!B z2WzF~bvUVBPajh+d-%>?t2Z8%G!lli7XZ`|B;#MgMz*>X8ZG6ZC6+WoOn5^sJMDN+ znDZtNw)I&MoDb_eSOhI-RzvX6g~udVVXntR5hoC4oZg3+i5eu64iE*I2rT0;7pCQL zND+#&LPCIE$BITjS-7Ic2pFJXAVoDmxuTGnM;bVYa_X9w3CI4TJiNI_TP8LnnP~vl z?#-ZFpBO~%!C46Tc)^>ZA455S?s9;G0?#0<-7N+wcCiS>Vc17*0E28)19mXLg#j%9 zFcraooJAm%_Rs>3-TG*cdER$k({yAs@KOiTWOoJydjjbWSZmsap%&QUWZ0seD~8tq zHy=+1Rl$2&3c^lWxgyFI!x6GDr_*7pI)eL8?Ndbk#jBrc_+E688Zn20O zEdc$dLBa(d4Yb9uk(DGx_W zcpgF6U9ddz*!P2@t?M{QI)_0k-~^20aB; zui1~V%doiS|0Ui464zw;egGQZ7`vEp2ZZn%fBT5Ug1y#y87@q473}Q9N5KCAU zxOZe#*Pr?H<~ojF^UpO{Xg-5(gStb;{xI~}SK#(`=u(RLAd($xM2Rg+-5K*Bq4m-2 z3S3%>e?Mw>FcpTcK{nEWZG3VBJF>-0p4OB2wGg`|0`9EIvpHFj`hX(v&< z7aSSI{(jCfH`p^}gyFRDCYlZQLx+KG=(#w{MBs{;hVR!R-V4lu(IrSEQt=+kBBrXY zc7}+dU&D^YxTXN6qQFVa(m)xN zb7INhLmj1;n<8tM7d?8F=um)-mAM*{L~dPQVDH(rLzj%qN3QFFjq{QTE-Le8XmMTY z(5gL~`8fJUkg}N~7W&Mk$h4j?WBB?+k0SjKb)}yo#~*>?%RUkyV()nR;J~5ILwaML zd&hp_Be@fX#|H|Z9QTxx7}Es7Mb3l;Av?IfZh^wjqyX93U^pgC9hCSi0o`UF+fAcg z5$BvxE^u$k<*n2O5EBfS3qEG5Bc%pueZ1#fOiDOL3vt#cOV>~?|6U|0`vrJ7+O!;J z&H+hUkNG6;%Oj52TC`Dkwf<|h8gl1SV&e{P7t`{0)k+@f(W4-y%;Tx({BRb9adBh> zYb8DB;sBmOm`_D|ZsLt$HJLVW3Q?{}B{11SoaLa$>x{C{WDFrXB%78OmUT^Jwh?4m zS$}adP#AzW@ahmsW*t_iHCaS>s4^toFg1K;oVx1fLqtk>vP6PvKmlTFE>0g}5f-bI zveakhC4lo4g4f-D&G_i5Cqs+sIEySrD0?r8_b6d^{ADXLEyCA;Ya`BI14b@5OIIFe zX8|DLDi6fVJEo_6b);o6>eQv|96H!x2UI}5j6zz%4%6c!4|9mas;7Vsv8dzBKd8_D zFpSomLRhxPc>r9Bv%Er-lo0^FWf5BbF=@Y)bDR4N5QJutr8lASKz39I+mg#i89ofU z-<8-M;n%!75DOo=&ddNdYrGy^^eZZ zynXxcp5W^@c5W)HsBd_F^ZsL7#t(MB@5_O-g`zMU_TD5rOzO=jPUiAFqPI#i^i5(l z^cVfV%6J@gQHOXh+bn;_qDC~m$S9s##G48ikZm@me zx@g)WNo&Edxw<_rchV$s>6o;H-7_nu6{SeIOdN>e7UjABTwso#IZ_sgMFDlGTb9g7 zSoo~MK3r0}Yj9mqC@aKXlb}O?_k?7wEW*YdC25fD#r?&9`K9PQ80Up1fq3QzOvbwB zQWtqePRYjD640P;9VgRZnseLCgGcwlhy|n*V)reL*Q0;8*i}yAr!4<{1y?ns;OFu-u6J?DTct5Rb+;!Y zRV5FP-4>**#^%jPP-n~IuHLuLd2PB)zp^XGVMdmE##{!?(KA!-T%BtyA;c5BNQQmUq-ON?fQofxF{4gxN_t=JV)FguMcjfGorgYul zSxibI(vs9!*(vwUZF}QOR&lZUAd+c^chFbZ;=tgr`xeDJ8v#85XAuEATCZ>YT>If$ z_Xo8<<4Np68)10sVL$gs9}_v_q-ZbOuqr>U)!g}6>phJV zkv5v`;6p8H#yK|(V?ECsoE;7LHIuyMYYz69yX3H!zF9`*y$&?IT8ZPyq8+GGzK`C` zBC6zZ=kw?8m=UMGF={gb-UKDecSPtro{QG!;~OJ5#2k5C@_K0>5rJ=R2g-|skV}9^Ve#nacNo;#8;hWtF76o>a6yvcg0S*)R&b&Pmq7DQW|IVp(rk2 z%!V`lJ=wr4WjPkRjH)S(eDp7+!{L>oS)dN zm!T7*B>Q{R%I?SV#fF;1LV27`^*iipg$WKhYfV~k*9v8$UCN5|!$ka`X|ce$qx5mE z89Mf@bxRp2_h{u zWM)rT{`}^9{g_9nM*J2QvEY10ACi{E^3(R+NQX4He!_UyTwZST;E8{p|ME-q>p0_@ zt!Fs468jr$R>H*b&S+iJ9nv_}JWvv*EXXZU9n;?trkdcoDC;iF&b4>1;uDMbHBdNd zg1swRXC(@mfwL0EPXkc8(}U0g>Gt)UYv@C3_7d?u8YJ;ss|v%G%a@yBBI4pDUbC9a zM!;G$j+RAOma^$e4vbvpKlipQ24S=XtUL>vQtQHM47vC*4blhF%d5T;g(og)u8kS= zgSR;n2E~U%-m`R^h-PRUs=b{8N#>j=Av(Uer7P!TOUsBt!R5EbnU-uHdib{U;>9;n zLM@+7n?D)~lOCID63N+ZeJCV0lLYr_?X|IEKfH|=NT6&qcAMChKjKcNT(}-B)M45^ z2wN^?Ctn1NRvaLg@M&w2ZRw>Y$xv4-B4CoF?9vQd)b=%wl{fkcB+oQRW4fbjg*s-O zN&LDBm%RUtSG3N>b(II9kb4k+>r(Qcx*{zh(J=L76bDP#xsZrN%$P__)1|@9XbhEJ5ona-7ryd8lOfxh`$9o*w#S zL)9eqwXeP=33Nvclw!&2AWANU+-6^swc#|omUPdOmc?+dW*)wu+_G41=AAEnh~u+K z-aR=mxu+|F6vC$>mXGd{e2ld`-x!t}mCph-a0nG9}DZZ?tN z{<-S#K{(vhtGWD*@;Jo|8@@*{b7G#JAdKXZ ziNvogS2k41)#T{RK4wPDbi(ozD_p;hBj5^h^mtI2@*M+cuX#%tDJPTf(a+_P#|Zwo z&G$4vUH*11=;fVW@Fk($PpQ`PaidT7BuXb;8n>cRTRgt>}OLo#ey=Fq985 zNR^fUs}|zCh&%Zgzpa%`m%g)FU0y#~%_>U78IInlzO-i2eBD57-~dPmVj zRsZ9k0J_$lkvsJ6v74U5rk8EXaRQS*BMdjXd{=BwDc`>frwFK2Jw1z50aKvwQE7-^##FY z8*$0YsF%Y{eG7vDN7ivm(=bi3p$AI${GE6qUmWI{eaxQak}!6@?I;EnplHBGF^hqKer&5ORmE z!88dQRsILr##SBy$xowh6NZwZfpS+()w2@Y^zKOx0Mb7p=4M>4RYy@IWn)>tpLB2r zF!v~PCs?#b@(Ce7ik3yeD(eF%-cJLz?t!x=m^+V@wFg^mcMRy6A({oz3!bfQXXNef zP;~;m)Q6#IR}T_N{TP~pT~m+-VFUmeLOEsy0M7{WV2kaJy--MGeHz5N zNK$F(zW-PKwwtzL9?pf-R-~S39ua|k|2+RKF|Y8I?#9H zL@7Y~fL&g0=Q<>%Rxzbn))0sXalw|=I9i;Yxa8+%k)71+) zu$!bw#0JvFB^xx}7UoS{p&hx0jp!3BA`x2GNAkw3)(+a&j*#_Pv?5}BJ^2_zWD;7T z-@U%HMn(FwzPC^d; zp^juaI14eqfBT(+4$(-5OJX;GhHANPrUCRORHgC%x8(VDbAXfKI+fg{2bLE!sSKgF->~GiAZR5V zU4CtzAixh28`Q()WmM?tEwfT}82V)4S*Pv1C5SxJC)<)Gi!gvDz=GyP!r6BPG)CyD z&572|^O_(PWT2gx4gnM~iW2tY9e3~Yb19VJA48^(vo&>-z^@5iZVR#scn8x1WNDT$(Vd9{io#=D@g(@ME!?;YomOG{AN;XavF)zK6x9pIe;U)Xp3G11L=xUeL zTc7S~4o@9^lfo0m4aT$0cJ!_m4m{mc)l(qjOeT?5)q2fol_u2E`mNhv?tH_G8|pqg zT=PEl)t5gUU-Xyg1q|+fRLY9o`6~*sUiNeLQf|PffsaMQ$EqO;zq^ffk*pf>i3^O&?qVQF8406lB-S3VgEo1Jw?3^}J^U@_ z?9jXYtM+{O^6r!MgSYx*mLo>;A6{T4(l}Va zZp|+>n-vLieoR(wo5D;^p|r45&Bqm`uZ^$w(FS<8#Xl94VNzOyKD4;*V1vTbK~ZL6Jez(V+Sf0 z-}!uY`-`phZ!g7mu0Lzi(m^j+mK$$Ukm;s18gKpiAEV7fogb=)+D=uweo_n%-X9!> z2)t|g)S-9(<-au=cf>t4y#X}2ea~PEZ@A+r@71>F8#!lOc7IiiEi$Zql;lWOy)S(I zOg%FE2D^3X$6cLMF2%eKc-2>;SJZWAR$TM3tUF&qUiLj$tbC^Jc=~O3?@9m3*Gf5s zoBD6_l-UDKTb?N^_G%uRBzo0fcYWydUZZ7w`?ud}87mx6Dcl=ubG2*tiCNdLU*FT+ zRmv;+5c_fWtFu~PQq}*BNF~Hh#aQIZzBXm8fv^T_x#xpMQACrdch5g-d(UYa6&4M5 zrQZDLf8oXcDYtJL)%quc$1@|Bf8AbO`0c(?ePP<*w{QpLBM>69otalv)SkqpEFWWA zyR@}){iP^O*GxR_)qe`A1Ugeq*w$`s9j&>^D2Ftw`RP@=BD;i$Fn)}6cFo~f@I9EF zkg~r%#q*h)Oy88S8wDub(o41}L9O6q5-!%V$GbFi8m%Yk(&;5c2{nVc6Fik^KESo! z--zm73vh|K4`urp(<)b2Cj!zS6Jgs~85zr*5?K9QQ`&FR47!J<5$qd*X5K(p71!db zR|K+*bi+@M^T|Hci2T}c^#}tu(bNPrX^FaKBat9^Lg-KqMs|#WhTeSLv9xXQL*yk8 zx4Va+ixK&1W%TK*p1~-%ErAeI@w)p9P #include #include +#include #include #include #include @@ -550,3 +551,40 @@ void test_HYDROData_LandCoverMap::test_dump_python() //TODO: compare files } + +void test_HYDROData_LandCoverMap::test_transparent_prs() +{ + Handle(HYDROData_Document) aDoc = HYDROData_Document::Document(1); + + Handle(HYDROData_StricklerTable) aTable = + Handle(HYDROData_StricklerTable)::DownCast( aDoc->CreateObject( KIND_STRICKLER_TABLE ) ); + CPPUNIT_ASSERT_EQUAL( true, aTable->Import( DEF_STR_PATH ) ); + + Handle(HYDROData_PolylineXY) aPoly = + Handle(HYDROData_PolylineXY)::DownCast( aDoc->CreateObject( KIND_POLYLINEXY ) ); + aPoly->AddSection( "", HYDROData_PolylineXY::SECTION_SPLINE, true ); + aPoly->AddPoint( 0, gp_XY( 0, 0 ) ); + aPoly->AddPoint( 0, gp_XY( 20, 0 ) ); + aPoly->AddPoint( 0, gp_XY( 10, 10 ) ); + aPoly->Update(); + + Handle(HYDROData_ImmersibleZone) aZone = + Handle(HYDROData_ImmersibleZone)::DownCast( aDoc->CreateObject( KIND_IMMERSIBLE_ZONE ) ); + aZone->SetPolyline( aPoly ); + aZone->Update(); + + Handle(HYDROData_LandCoverMap) aMap = + Handle(HYDROData_LandCoverMap)::DownCast( aDoc->CreateObject( KIND_LAND_COVER_MAP ) ); + aMap->LocalPartition( Face( QList() << 1 << 1 << 10 << 10 << 10 << 20 ), "Zones de champs cultivé à végétation haute" ); + aMap->LocalPartition( Face( QList() << 5 << 5 << 10 << 5 << 10 << 8 << 5 << 12 << 5 << 8 ), "Zones de champs cultivé à végétation haute" ); + aMap->SetName( "test_LCM" ); + + TestViewer::show( aZone->GetTopShape(), AIS_Shaded, true, "LandCoverMap_TransparentPrs" ); + + Handle(HYDROGUI_LandCoverMapPrs) aPrs = new HYDROGUI_LandCoverMapPrs( aMap ); + aPrs->SetTable( aTable ); + aPrs->SetTransparency( 0.5 ); + TestViewer::show( aPrs, AIS_Shaded, 0, true, "" ); + + CPPUNIT_ASSERT_IMAGES +} diff --git a/src/HYDRO_tests/test_HYDROData_LandCoverMap.h b/src/HYDRO_tests/test_HYDROData_LandCoverMap.h index 4d0a14d7..609a1802 100644 --- a/src/HYDRO_tests/test_HYDROData_LandCoverMap.h +++ b/src/HYDRO_tests/test_HYDROData_LandCoverMap.h @@ -36,6 +36,7 @@ class test_HYDROData_LandCoverMap : public CppUnit::TestFixture CPPUNIT_TEST( test_land_cover_prs_by_types ); CPPUNIT_TEST( test_land_cover_prs_by_coeff ); CPPUNIT_TEST( test_dump_python ); + CPPUNIT_TEST( test_transparent_prs ); CPPUNIT_TEST_SUITE_END(); public: @@ -50,6 +51,7 @@ public: void test_land_cover_prs_by_types(); void test_land_cover_prs_by_coeff(); void test_dump_python(); + void test_transparent_prs(); }; CPPUNIT_TEST_SUITE_REGISTRATION( test_HYDROData_LandCoverMap ); -- 2.39.2