From 7a8e3cb8eae24c4b4ec3aff6a1fe7a08ac575984 Mon Sep 17 00:00:00 2001 From: Paul RASCLE Date: Sat, 21 May 2016 23:02:52 +0200 Subject: [PATCH] still more HYDRO tests corrections --- src/HYDROData/HYDROData_LandCoverMap.cxx | 22 +++++++++++++++--- .../reference_data/LandCoverMap_Split_2.png | Bin 7692 -> 7808 bytes .../test_HYDROData_LandCoverMap.cxx | 2 +- 3 files changed, 20 insertions(+), 4 deletions(-) diff --git a/src/HYDROData/HYDROData_LandCoverMap.cxx b/src/HYDROData/HYDROData_LandCoverMap.cxx index 9f8986e2..2a5904b1 100644 --- a/src/HYDROData/HYDROData_LandCoverMap.cxx +++ b/src/HYDROData/HYDROData_LandCoverMap.cxx @@ -62,6 +62,7 @@ #include #include +#include #include #include @@ -902,6 +903,7 @@ bool HYDROData_LandCoverMap::LocalPartition( const TopoDS_Shape& theNewShape, co // c. add the new shape if it is face with its type if( theNewShape.ShapeType()==TopAbs_FACE ) aNewFaces.Add( TopoDS::Face( theNewShape ), theNewType ); + //DEBTRACE(theNewShape << " " << theNewType); // convert map of shape to type to compound and list of types StoreLandCovers( aNewFaces ); @@ -932,6 +934,7 @@ void HYDROData_LandCoverMap::StoreLandCovers( const HYDROData_MapOfFaceToStrickl } TopTools_IndexedDataMapOfShapeListOfShape ShHistory; + ShHistory.Clear(); TopoDS_Shape aResult; if( aListOfFaces.Extent() == 1 ) @@ -959,9 +962,21 @@ void HYDROData_LandCoverMap::StoreLandCovers( const HYDROData_MapOfFaceToStrickl //DEBTRACE(" --- " << aFF); if( aFF.IsNull() ) continue; - TopTools_ListOfShape aLS = ShHistory.FindFromKey(aFF); + //DEBTRACE(ShHistory.IsEmpty()); + //DEBTRACE(aFF.Checked()); + TopTools_ListOfShape aLS; + try + { + aLS = ShHistory.FindFromKey(aFF); //TODO: bug to fix. Observed on an incomplete split of a face + } + catch (...) + { + DEBTRACE("TODO: bug to fix. Observed on an incomplete split of a face"); + continue; + } if (aLS.IsEmpty()) { + //DEBTRACE("--- aLS.IsEmpty()"); QString aSType = theMap.FindFromKey(aFF); //DEBTRACE(" --- " << aSType.toStdString()); if (ShF2FHistory.Contains(aFF)) @@ -977,6 +992,7 @@ void HYDROData_LandCoverMap::StoreLandCovers( const HYDROData_MapOfFaceToStrickl } else { + //DEBTRACE("--- !aLS.IsEmpty()"); TopTools_ListIteratorOfListOfShape anIt(aLS); for (; anIt.More(); anIt.Next()) { @@ -986,13 +1002,13 @@ void HYDROData_LandCoverMap::StoreLandCovers( const HYDROData_MapOfFaceToStrickl //if (ShF2FHistory.Contains(aFF)) if (ShF2FHistory.Contains(aMF)) { - aChF2ST.Add(ShF2FHistory.FindFromKey(aMF), aSType); //DEBTRACE("ShF2FHistory.FindFromKey(aMF) " << ShF2FHistory.FindFromKey(aFF)); + aChF2ST.Add(ShF2FHistory.FindFromKey(aMF), aSType); } else { - aChF2ST.Add(aMF, aSType); //DEBTRACE("aMF " << aMF); + aChF2ST.Add(aMF, aSType); } } } diff --git a/src/HYDRO_tests/reference_data/LandCoverMap_Split_2.png b/src/HYDRO_tests/reference_data/LandCoverMap_Split_2.png index b34f64775e94f1ce3770d6e7cc7bc174d2153806..1cb8991e2497d9f36b756e211fbcbc3cd0f0c9d2 100644 GIT binary patch literal 7808 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
CVClUH76n|T&T?Hi!$)m8T zTD%vwTRZddHaI-3sQ$Qtub}P_94a%mop;B8B>f<^5 zNmx#Lm2ivzkCk!wdYb)NI+o)F_*oeT#n>G5FhziC(8Khv59sRASS6ti^l}XB-vAFQV>6AElBlhRVGqi*PI3bYD|3`66Nx z{=0YLivII{x7$i>R z3+SHnjMBy#A2zai5Nd0`r~FIt#Y1ot5$=(aN~^%kRcp)9M$GMnF#$60Tk@%PBvu$+ zl&-&)!(XSADJ=zfU_^%O@ZK`TD9t?seO*fFw5mxTb6|Si!uPU^Y30K*v_XLS4IdX3UC^&`N!U2I*s1zY3_OG zj~>GjYKzRq)yY45q4gPRKc4;6>47rHmc#2*pFP0{l#t6CR@T>#MeD`*FFccRv#rG- z6D9UlMY19Z<`m%{ZtwD5h+eO0JML*>QIDi>Bh+#yN`yy`(%KVjpm-C zzF~|Q&5pwEYll8EP)^a@o0)Fd6_}yzqwb?&hOZ1Z8flUp(cP*5S50b5jWFA@XvVJo z-TJ0Yy?qbne;H`qmC(HN)774*tBZ#lFEW$_<@1E*VZY*m zJFA=i9_n~~ry)?kl}dx-WJd zo&Rve4aG)Vyq>Ko|4@-Axc2$cpChduo?iy^4Lyh6dp;Vmr9u&L?oSQ3h*-tXCJLVL8OwtxR+)0N&M-H8K*%|ov) zFaL1r$E&T{;ggQufrKVaX2MXw+d3V!Pz;+WUXj`qrAZm6tvy219CfpEC`{(ZC=J4m z`0mblNO8Yp*$>z3emy$tud<;}d1IZr6J1r= z(5NZQIW@cRRL|~<13P9qF7NL)-DA3ZB*oD_L~4eaA#UbXU#Qluxbsy=d%y8KXN=yp zmcS339kNUdJ_PN`;&XqrWl8SVh7FvlUEgD75|UP33R^5a8hj2q)=g=?y3%=c<@=$x zb%Q;4gp9-F$_=+z)95DA5@s6lP&Efd$WUd5+8ZMmzArODZg>Ng5Erb_5Y3`%5nnWG zA~!5SS=ZMF4P}NULKHPd#~4c*T37&-B2%9rQs{(in? zFlgrUK5qBU?j1by-qr2{FLHU8K0N+u!>)Go=Kk`R*DrTp8(cncFDt1}la=_wa>MnF ztrgcZ2YOKv=gUM(*(bi&&raLb(|Y~#r&l|=Lq{(A@pkqN4fJ;Kjm#Q=q!wQt>e9dcW#rk#xa%9WmJ#&f zeC<*9LCvp6xBr`f80`J=N?V7TO;sgc^ZaS#$G3HOUv-oB8bK4bt?O)c(wn9o-8;Ab zTRd1}nN_so=Dg)S=M$c9e$pK@d>*!}oQekqC5BX@7OO=+yuX6AVdtBlc3oH3ZU1mO zeE74zsl$+$yjVwhy3%x1Bw?2OUQx0(OERX?$*sR7_4?9D9uu~A{yfvIuil$?r9E@b z^6<6}EaT>irK->_%ZH0+(Ce=ay!y%DOYdsW!KZ`2_Rrd|{Xt>U=ZC*7`t@3WmE*`0 z_fOAy<&L`sZu1J;I^Y00v2_hIWyeHJVvJ_!?e%FxRn1AmhuIVQo3GCv@;rQZl{wEi zeAec*nu|}n8vMAm#h$ym(>#Y-uP+(tJ(AEg(4vh2=U><1GT#h%qx7Q!4kpk|A20m4 zJn{9sUH?9|J=(wT&m+TU!xKMO8TJ-DxzhDy{l%AAGY9Glrkp9Q{o4}qsVmd)u=!i51-l(zR-c(QG3nEx=S{lT69;+7rbt4X!BTg@#~Q|2!jN9MIP`-r0x`hUkV z8#A^I^Wl5p;u2dI{sgu)SUuQLCey3Ai;adOG7E=e_~%v$8-h!NuE?~1@qYU- a3x+-8w(*6HCWa@pGXXxq;xi&i%KrgQ=8%N| diff --git a/src/HYDRO_tests/test_HYDROData_LandCoverMap.cxx b/src/HYDRO_tests/test_HYDROData_LandCoverMap.cxx index 94b63b91..76f6a7f5 100644 --- a/src/HYDRO_tests/test_HYDROData_LandCoverMap.cxx +++ b/src/HYDRO_tests/test_HYDROData_LandCoverMap.cxx @@ -148,7 +148,7 @@ void test_HYDROData_LandCoverMap::test_incomplete_split() TopoDS_Wire aWire = Wire( QList() << 10 << 40 << 30 << 10 << 40 << 10, false ); aPolyline->SetShape( aWire ); - CPPUNIT_ASSERT_EQUAL( true, aMap->Split( aPolyline ) ); + CPPUNIT_ASSERT_EQUAL( false, aMap->Split( aPolyline ) ); TestViewer::show( aMap->GetShape(), AIS_Shaded, true, "LandCoverMap_Split_2" ); TestViewer::show( aWire, 0, true, Qt::green ); -- 2.39.2