From 1834187d193fa93a6ac31967ae2fbebf15853888 Mon Sep 17 00:00:00 2001 From: asl Date: Thu, 15 Oct 2015 16:29:56 +0300 Subject: [PATCH] #668: additional split test --- .../reference_data/LandCoverMap_Split_1.png | Bin 7434 -> 7761 bytes .../reference_data/LandCoverMap_Split_2.png | Bin 0 -> 7685 bytes .../test_HYDROData_LandCoverMap.cxx | 34 +++++++++++++++++- src/HYDRO_tests/test_HYDROData_LandCoverMap.h | 6 ++-- 4 files changed, 37 insertions(+), 3 deletions(-) create mode 100644 src/HYDRO_tests/reference_data/LandCoverMap_Split_2.png diff --git a/src/HYDRO_tests/reference_data/LandCoverMap_Split_1.png b/src/HYDRO_tests/reference_data/LandCoverMap_Split_1.png index 24d4ac8c15446e59a2ea2bb8e73d1482d6b80846..d76a7f7e848083ab27c3d36fe1c1245e055feaf4 100644 GIT binary patch literal 7761 zcmX|F3piA3_g{P4nmxkoF>;TYajgg?MH<^gE={HT^=PP2M^d^-Xk#!!O>`M4MyW67 zl%v#1HzrZK2;~&riPAl#lA`}Ro$ve4^LXrcziX}cx7NF^J2QB?zn+en4glx{2Kdeb z(BcE&5^@N7gS*xYpnpWHIB*V$ehK7qIa;%00v5&s=+|ogu-&8d%>jmg3iS1v6Sx2E zqowljh(vYIi${{bL)_jtmW3^Ln07dr`29qM_dCC{dk>p%6d38c zJ8CcP5w;%oZFRg-t4o|5MLwz#UhKZ2H?g2na_5DG+8YY4U%8Xjusk9>;_>F6 z`#=2{NGQ8GWbB%CkH2~}e*JMPe>{PZ{rd}d3mU+IpH_FeEBgM=#{S!Xe6myTcPs(7 z&^=FEv-p^@FpbBo(&G+)Mj9{|7dl`^gWhzv=9plu`E^`oWT%1U12&gA?zjyMo$vLv zPR|CC0-bq5aZ&cZ%$|jSIm{~UIgw9ciG!OaD^OG4C`?<72vzBcWBe@wO7~slEK2E#;}mGs^ALfm5z&Gxes&G zUk-=M7hsD0ecc%(79=gk`6GIoow<1DEul6&rem3jkf_hs)?sXFuYQn`ibIK|O95PT zcd|O`cXQ!jh3obkHbi}u-jL)9OejverLdOawHHf zBA~8Ai#Ehz9f|wL4#^7&Xr#q#(^O#Vi)V@QT!o8^&pjN)x{O4 zn;xcU!v!BVd~)n=Eyky{eouo9VX}=)LJSXM>(>3F2k{Y~7IE?@)fziKsLN_?n#Ru` z2i?2%em@`)GgV3kn#_AJbqGO1x&2ypZ{37pOh~Kh?@PxQs4qxpU^3a$q#d2|33dYY1cZtHix}y$eUu?c>YnEY=F4EBD~3tKI<%P0 zYzm}Q%COeVW(VM%$X`A$x(;_Ai;f>+80~0? z-4Dfau(6LX9$w}Sr&$L8Gtr! zZLl+jGYyu|jJ%sawZ`OC=U@ zMv4J6SFVF5@(yR!avi)2Sq-+?9xL`LGXpoZUCw<3+yemzCUS`r9Nqttb=*Zec}$-Q zpCd_VGUMXkVuu<5P&t1RuzSpaYVHxfVmyxm)yNL>kI!{5IxR}AwjtK7Kn4NdXV-yV zA@P1XWHwd5gJVnk)v_K+WORte|IqF>plv1I(oIMPMAmk;@C4-fm;S-~DaS7&9DdAael(aPoRHH?ATs)AYfG?sI#vV3&)mfpJ zhcI#5RM6y!cA9v`rqVS?qJcRN5J0%N?gVy)hbUSVpx%JISrswbQ~i!0)#@l;)ilxf z^0651!Z)X&HHc9Y=XN(ou0L0?laP)aEmk)mGCIl&o`&Ou6gsq8rIVQB2zq0bJ4iPn zVN&U6iCPaQRQ~R!>gZ#fm;-=yXEtcVn`sR6(g~1PK9A8DPH4b~*mZt9W%{_(yKIW_ zXbk}MdZZt{d~`_D7zDxEoRnJLr54%J5H5WNP=VB%ZD2(&J!XF@02xvfWz2}mMeN>& zbK>6-Fj9>b&Qxf3BG3Vo+SA!?< zD8{vxMdgjlFhT)~yaL0^ht3x!8y=g~GM#}pYE-h*1vLE4wW3$u6|AyD_rXM>lkCbo z@w4TYGe=?g2T%Jg{PA~fSK0h`laATVt>61O^FB$bHcx*C6uRqub|S`L!JkJFre7{Y zS1g%H1cfymG{T9V{G~W?bXy-V7mzHo4z0-iaf(_0Gsc`tyS?Fe!3v5` z_w0|sR2Delu&)nVub&G*{u1nHzYrXdcH3-3ppu}y?R{X<=oxqm?HSt71&0E(ClG;M zM1#$Iw4K5m0WCfZwDGK<;zUxeHHOcAHE+tH=9jlpEHm@$p~Vkv8d$-niaojJ7{2@( zn+LCKXy%Qa14s7)c2X#U{)pAK_Bc_W&a;6Q6c;Gb`B|<*N;^()#c6YbL`vVrQZHYD+Vjat^a`!6(yP zz`k_)63~m3U6#oK)eM|yMVdwKjfKez0|s#B$Ap&vlYgN-`7heJiQ8*gP;lJ&_`D5; z){{^0`N_|ZmveCUg6E$7J{!!g|knFL3)S>3?_47Lq zzFCe#37=N^AYB9e7fa>j!q0po@cF4v1}6r#eJaSR4Emkol250b-9cM z3f>v1PaUF9jExQr!HJPw1O}Y}44sDFDMoR)J~P&BrhZERDm9}ye|JVxu|bU%I3zDF zSK+8RXx+a>xf_yeJWx>Cu6=LW>+n35U!%oX#2Lv}<}-9Mk`j#KA`MxezDAISz6qc( ze_?l|>)r?P4ozZ{zn~r80qrEA`LPH-iqGV1WWAuL33YC$teKuvXu;_*Sn^HeKdSJm z2}6dsyiV;#N9TTAh)<; z$@K_~CarNbw}aBIaKWz|1*e#*Wyn-R!UaR1(uYyg|0Z1I15iLxCd}e8h|G`WKO?E` zw)@Yr9@R}Xo>i?2j3b-sZbmQ4(0SPcT4g`6?rO62)yt!tMFkyQK+lT495#L^YDst9 zYS9AeIy=5g#@e2C4^++yP!`#FjRn~++#NS|7&$6)krK)SY*G?>zppaxWeTeq19vXp zMUck}>s%319gG+FT|lgUWa-l>dwbpJL^V=}!W ztZMy_QXDTpR%1fhRNMiC(WG#uNki5!%M9bPbS?kwSNmpy!uCukH-$~+WO;o4!1n|O zibJE%;vjD{$$nm<%Q+K@HF=&14aLQ?C6fSd8}Qw%Gx|PQpf1uA6Z6&~@lX5r8XQT| zE9oj|DqR%azP9IfT1@MI^dVBoCjYtaBtjhrf6mAkznG54n$LUiP**&6o&FBJ=*u`P z3dhCcf;1pe0s4cFl9*%k3i|B4QLY(8c2$7GL=nr0|S%=V`OcT2Ogu^@6vqm|!vTF_j3H zIU*lmJkM%p9V0b)=|TDZFkI}uD4WAMs0GKl{N=@U$YPN@LEwRMf@7J}1CCqGSiX(5 z7r^~xxY(fM*$|E8k-z!ci-0*$srRQIE<1``jDA3n%}6EilHGbLyZRWRH_@+-8)q?L zo!9577?|v0lc^}hs@=R;v%IkyDVl$NxI2PM8<+WL_%;gZ?gM?w10zs7IuR59g=7M9 zzIbaP zV0=g_+zwrY@~*?@p(?K$>%z-J=U+yyIvcrhKv?3+e?m@+?f4QumtfscsKOxE1 z8G_BR8ecRx4W36a$mPGeW;elUHtH+waM=koL~X|)n1|JrMJ0R+)j^#RN>6Y7M%vJ= zJNxRho?*};W@2~+zo7yyq+7)aov*K-PDR%M^h<)&*o5+hMm|dS;H+96bjwnTf8@Aq{Z|X;m<5yTy2<@iuGPY zmn@CcTSNfr%+cjlv;Ry$ITZ~C&>6(cK}|6*1|)TK7dl5_jm^UDpz97oV8RevOMPnh z3e*(>jgZDfSL2|vLCh#a0N)-jksh&<1jzu-Qv4>8iv<1;hWPBjwuQ`P ze0^+|Np;Fz0ixGTU9Dnt{$$iO{vxc*L|V8QV)&Z?87R)zonFy+#pr)sp>)1R>JuU$ zbdTjCtHVipr~D9aq5)rBsBhshS`17GD!em{oqr1$FaRb9Ere*UgnmA%sG8$YE&8Q^ zVf~sKp)CRghy{!EjE(4tC&Ou_n2x*-N9dR_Wi3_5Ow?}l3(4{I<6xPVRZ+sav-U~pz zv26eRv#K=4- zMIK^{E~Lq_pym3vXey}vycm>e@39d(*a2M51%@R`Tg zbI~rg5fbpqjy4mB9WqIbiDxU)s4KI-tVgebOn6G!WQ7Dy9vtO)~1&_HyF@GzWUDpVilg2ah z(}VvQbx&VYj|$R(z7pluwtFRMJ5~=nTEq^>m(Z=d1Ai?UuQusP`#dTr!VC|#=PAbI zGv%7)i}5QkS`_7&uM8x|xgfTTUu;U{6NR6iCiS9XUXM(DyF7on-4Q{H+Ko^}+3{D5 z!9wlq(6T}RRM9k>SXXwj5h{%PWMEj^duWNi#YIZkqIOycT@=4--BaW;#YSR+zZEah z?D2#xVmWk9Wp>?2UPcLJ`$#TxLB8XpN1SeuJUB0hV*6xklF#+$PhBT)#W@l`xXtCS zi2Wd+A`i9};8YQeC`k36Ba|&dALZhRfHn)STy$WN9CW89>}tepOu1t82~F)n1bnlg zbJ2M>*WALp_ri!GtpFom(#d5QrbI%}YMzXAqJ&Vv<9Efvwe4i_Ffk$Z>^P*aFKjaq zo~6Ay!-%^rltmP5$i|uQ}DL|e?ts4VjERFH;kZ}mKvXu z0I_V(*||d_clI64&xxK7K+H@DUk4w-#Nvr+>;%gF2qPrP$F(^7Y-#8gb!RZI$SCwb^I%PeD7 z-gAkJZ0uM zZE))4Azb|Og80b9Qx7s1C~1$7%{^_A-kMS~aq!#i$*=!;H$Ni(N(<#w_j4$1B_nH> zh2fvFh7CFI=OY=%s&`x^-*YTPx5UnuKRi@?JYAkr|k(VUejTHKyaweC(Ttxc9!nQnCmBLLp(VRd8fUt@Dj(oDOssHyqGa5{kj9@ zn}}O_(LP~D9fv~n9VI?;$Q$Vz^DxDCIuUTuVu5m}2{y}27$d_yknPqALq zlylJ+gM?F;e9~)?geCU${ipoNcIeTGXZ1ElB^WCv7$de~k z40RACPWtYKzH(IbQJrI1=-Bwe(KJ}OLrXu6XAQd~%&DtbMi9w`AZyY6PSxZUNbF&X zzj|F$aab6^EXmxl(c?oC2yi-@2sm#M7b&MOKC9!?DMc2s zvlX@8GRKu!CYaO$tJ(ONqMZ?*2br9W9n-L06h>4^pLEk>6ScIK)XbRY+xC9UD4Mk8 z%WUThA8O{0|Jime&;CizA*+GziA6s;?Vl9B+JFsc{HT*4nk;|!erBVm;Mq^#zxn0i zy;WzvH5#Fx<>t2Woh+` zN$<}t+pyvD)e%d1F1i97mY?9peYnKhx+XDk;OD!l@9#LHot?c4`#(cZ+;l=^IeLt1 zX4GRFW9N_`w__V8ZTgaFU)XoA1iel zb$Eew?Hod-JDTsBgVGv2$lnH?jh+psa;rl{Ury{8xXTiKNZ#`J+pSGiKQp|4w0l>7 zygusZmM4i{2Ufqjr`>tgm*6{hq%MrR19e;>yv*c;cjagqPRoW`dy&$A-}uItO=-h= zw0fszgYJw3m%nV*sM3Be=`MSe)KFk-l5K*Sq(f*(&l7s9>A3;U8%}j!&eFI~_)IyM zNs@E=sex&y-hZrmclXQ_v!uZvjg$MbACxndwWK<#mX(+}IOSZ|mNVf-SNYnQQ~hWO6n*8CdDA zT>8owg0~&cxa&XtI{o%otZoBANP~_D>EpF5SM*iOL(Wwphg*QYtj$2lPT1}fg%eT; zBOH?Z_}b{(n2Rgk8IYg|%7t%VoSqDx`Q+dDb5rG{ho)kZ#j#BIG&t~mYgaPMGVYJY zqS$v2&o(~V_+a&#s!z8jT0QQo$g`hO^{m<7DzX1l(a#_LjfIoGzfTi5 zm%^~ujp%KQDpv#~`J<9oY}#}D>b6b-zw`qBFz z?~DDP|Jpjhn*76yS%}0K_4up`tYURuZNGZYeei20&pzqJ$F3VsOkYI|pA_Gl^`f!p zXI4&i)xehrTNfw5*|xszTyrgHz+IDdisksa?st>hyYiefV(hXD<6o6FCUo$M;=;O% zwmiR?&&$vs-v4>ayR$F;N*`PZiLRztzfe@~cRQo0XzSoNe^GBSXJA8i(dV*F7hfkv zG!_mNn0OCWITxB@&uzWxr{yj#7nAKLwpf0@x}az6tCrHQMV=d8wNHFk`7F^j$x=-{ zJfbbR5%078AgkVahsZ3X>T_dFL3HAsJ)GL{RXsVZ{|rPt;?)$+*Lr{Mb=jFW56-N4 zGQRp-Ly;qjs=?!H5?>F!Gibp)lyjvPueCg~eq8w>HWrgF8l9`--e3IFUo^~e%d__h z{cRCT`(E`t+d84a`)&K;X!h&hjLSCuR{7`ajXySRM%oSjXg#rP>Ej;}8WmcQ1#jK_ z;0%g!XIA<=@MYP`2X*UFOl`lhX3K-W9{+u=f9HGIhn*kn*Ypp5uI_oa>F4wFPx|kc z4laDunDph!&%wIacNA6^`d9Tmx))-eM%8Sp{{EghCHHEMG{+K7&(jUNNc*aiVpi_;}+;DZm&@B>&jb#iYX9pc4$;dp82;8C`FW_?F|9{Otyo*d$ UbgHk=r`TBOe{_LKMW0%rvLx| literal 7434 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 G%lJR8BNT`L diff --git a/src/HYDRO_tests/reference_data/LandCoverMap_Split_2.png b/src/HYDRO_tests/reference_data/LandCoverMap_Split_2.png new file mode 100644 index 0000000000000000000000000000000000000000..1a2e977bd27ab794db54a32f3a73b702583c4403 GIT binary patch literal 7685 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 literal 0 HcmV?d00001 diff --git a/src/HYDRO_tests/test_HYDROData_LandCoverMap.cxx b/src/HYDRO_tests/test_HYDROData_LandCoverMap.cxx index 31518dca..2f077e16 100644 --- a/src/HYDRO_tests/test_HYDROData_LandCoverMap.cxx +++ b/src/HYDRO_tests/test_HYDROData_LandCoverMap.cxx @@ -101,7 +101,7 @@ void test_HYDROData_LandCoverMap::test_add_2_objects() aDoc->Close(); } -void test_HYDROData_LandCoverMap::test_split_by_polyline() +void test_HYDROData_LandCoverMap::test_split() { Handle(HYDROData_Document) aDoc = HYDROData_Document::Document(1); @@ -136,6 +136,38 @@ void test_HYDROData_LandCoverMap::test_split_by_polyline() aDoc->Close(); } +void test_HYDROData_LandCoverMap::test_incomplete_split() +{ + Handle(HYDROData_Document) aDoc = HYDROData_Document::Document(1); + + Handle(HYDROData_LandCoverMap) aMap = + Handle(HYDROData_LandCoverMap)::DownCast( aDoc->CreateObject( KIND_LAND_COVER_MAP ) ); + + CPPUNIT_ASSERT_EQUAL( KIND_LAND_COVER_MAP, aMap->GetKind() ); + + TopoDS_Face aLC = LandCover( QList() << 10 << 10 << 50 << 20 << 30 << 50 << 15 << 30 ); + CPPUNIT_ASSERT_EQUAL( true, aMap->LocalPartition( aLC, "test1" ) ); + + Handle(HYDROData_PolylineXY) aPolyline = + Handle(HYDROData_PolylineXY)::DownCast( aDoc->CreateObject( KIND_POLYLINEXY ) ); + TopoDS_Wire aWire = BRepBuilderAPI_MakeWire( Spline( QList() << 10 << 40 << 30 << 10 << 40 << 10 ) ).Wire(); + aPolyline->SetShape( aWire ); + + CPPUNIT_ASSERT_EQUAL( true, aMap->Split( aPolyline ) ); + + TestViewer::show( aMap->GetShape(), AIS_Shaded, true ); + TestViewer::show( aWire, QColor(), 0 ); + TestViewer::AssertEqual( "LandCoverMap_Split_2" ); + + HYDROData_LandCoverMap::Iterator anIt( aMap ); + CPPUNIT_ASSERT_EQUAL( true, anIt.More() ); + CPPUNIT_ASSERT_EQUAL( QString( "test1" ), anIt.StricklerType() ); + anIt.Next(); + CPPUNIT_ASSERT_EQUAL( false, anIt.More() ); + + aDoc->Close(); +} + void test_HYDROData_LandCoverMap::test_merge() { Handle(HYDROData_Document) aDoc = HYDROData_Document::Document(1); diff --git a/src/HYDRO_tests/test_HYDROData_LandCoverMap.h b/src/HYDRO_tests/test_HYDROData_LandCoverMap.h index 2e7cdd40..f054a687 100644 --- a/src/HYDRO_tests/test_HYDROData_LandCoverMap.h +++ b/src/HYDRO_tests/test_HYDROData_LandCoverMap.h @@ -26,14 +26,16 @@ class test_HYDROData_LandCoverMap : public CppUnit::TestFixture { CPPUNIT_TEST_SUITE( test_HYDROData_LandCoverMap ); CPPUNIT_TEST( test_add_2_objects ); - CPPUNIT_TEST( test_split_by_polyline ); + CPPUNIT_TEST( test_split ); + CPPUNIT_TEST( test_incomplete_split ); CPPUNIT_TEST( test_merge ); CPPUNIT_TEST( test_remove ); CPPUNIT_TEST_SUITE_END(); public: void test_add_2_objects(); - void test_split_by_polyline(); + void test_split(); + void test_incomplete_split(); void test_merge(); void test_remove(); }; -- 2.39.2