From c4738cc6d2fb23c60a1922847991007b3ac4e6d7 Mon Sep 17 00:00:00 2001
From: asl <asl@opencascade.com>
Date: Tue, 13 Sep 2016 12:09:30 +0300
Subject: [PATCH] debug of DTM presentation

---
 src/HYDROData/HYDROData_DTM.cxx          |   2 +-
 src/HYDRO_tests/TestViewer.cxx           |  11 +-
 src/HYDRO_tests/TestViewer.h             |  14 ++-
 src/HYDRO_tests/reference_data/DTM_1.png | Bin 0 -> 10414 bytes
 src/HYDRO_tests/test_HYDROData_DTM.cxx   | 131 +++++++++++++++++++++--
 5 files changed, 146 insertions(+), 12 deletions(-)
 create mode 100644 src/HYDRO_tests/reference_data/DTM_1.png

diff --git a/src/HYDROData/HYDROData_DTM.cxx b/src/HYDROData/HYDROData_DTM.cxx
index 9e4da231..4db3a948 100644
--- a/src/HYDROData/HYDROData_DTM.cxx
+++ b/src/HYDROData/HYDROData_DTM.cxx
@@ -520,7 +520,7 @@ HYDROData_Bathymetry::AltitudePoints HYDROData_DTM::Interpolate
   size_t q = p>0 ? 2*mid[0].size() : 1;
   AltitudePoints points;
   points.reserve( p*q );
-  for( size_t i=0; i<q; i++ )
+  for( size_t i=0; i<p; i++ )
     CurveTo3D( theHydraulicAxis, mid[i], wid[i], points );
   return points;
 }
diff --git a/src/HYDRO_tests/TestViewer.cxx b/src/HYDRO_tests/TestViewer.cxx
index 196df1f0..904dbc93 100644
--- a/src/HYDRO_tests/TestViewer.cxx
+++ b/src/HYDRO_tests/TestViewer.cxx
@@ -257,9 +257,16 @@ bool AreImagesEqual( const QImage& theImage1, const QImage& theImage2, double th
   return true;
 }
 
-bool TestViewer::AssertImages( QString& theMessage )
+bool TestViewer::AssertImages( QString& theMessage, const QImage* theImage, const char* theCase )
 {
-  QImage anActualImage = viewWindow()->dumpView();
+  QImage anActualImage;
+  if( theImage )
+    anActualImage = *theImage;
+  else
+    anActualImage = viewWindow()->dumpView();
+
+  if( theCase )
+    myKey = theCase;
 
   QString anExpectedRefFilePath = qgetenv( "HYDRO_ROOT_DIR" ) + "/bin/salome/test/HYDRO";
   anExpectedRefFilePath += "/" + myKey + ".png";
diff --git a/src/HYDRO_tests/TestViewer.h b/src/HYDRO_tests/TestViewer.h
index 9030f33b..7173bb2f 100644
--- a/src/HYDRO_tests/TestViewer.h
+++ b/src/HYDRO_tests/TestViewer.h
@@ -24,6 +24,7 @@ class OCCViewer_ViewWindow;
 class TopoDS_Shape;
 class QString;
 class QColor;
+class QImage;
 class Handle_AIS_InteractiveContext;
 class Handle_AIS_InteractiveObject;
 class Handle_Aspect_ColorScale;
@@ -41,7 +42,7 @@ public:
                     int theMode, int theSelectionMode, bool isFitAll, const char* theKey );
   static void show( const TopoDS_Shape& theShape, int theMode, bool isFitAll, const QColor& theColor );
   static void show( const TopoDS_Shape& theShape, int theMode, bool isFitAll, const char* theKey );
-  static bool AssertImages( QString& theMessage );
+  static bool AssertImages( QString& theMessage, const QImage* = 0, const char* theCase = 0 );
   static QColor GetColor(int i);
 
   static Handle_Aspect_ColorScale colorScale();
@@ -72,6 +73,17 @@ private:
     }                                                      \
   }                                                        \
 
+#define CPPUNIT_ASSERT_IMAGES2( theImage, theCase )        \
+  {                                                        \
+    QString aMessage;                                      \
+    if( !TestViewer::AssertImages( aMessage, theImage, theCase ) ) \
+    {                                                      \
+      TestViewer::showColorScale( false );                 \
+      std::string aMessageStl = aMessage.toStdString();    \
+      CPPUNIT_FAIL( aMessageStl.c_str() );                 \
+    }                                                      \
+  }                                                        \
+
 #define CPPUNIT_ASSERT_SCRIPTS_EQUAL( theBaseName,         \
                                       isExpectedUtf8,      \
                                       isActualUtf8,        \
diff --git a/src/HYDRO_tests/reference_data/DTM_1.png b/src/HYDRO_tests/reference_data/DTM_1.png
new file mode 100644
index 0000000000000000000000000000000000000000..e84a2fcaa7429e7231372eb04a545c5ed4265a53
GIT binary patch
literal 10414
zcmeHt_g7QP_ckIRO}e18pj<$ui69_V6hXSuA#{{prIP>xLO_~|6sZ>wP+DlAg(OH7
z=|q|#p@$M$C?V8*`TQI2dw-a9);Tk?pP9X%J$tP=PvT2M?dy!Zj8s%q*L7ZK8dFhG
zTmG-nQ(u0Op<zwBd|VB9s$)t|PmftJn!kKy@OxnuKt;vU{l9i4L!5<=ib{w|M^nQz
zG;a&5=Of%-FY2(=)1PuTy5NtNamc-lC-)$#>pF89bB_0-t4jGNv>4ZPR-U%ejl~MZ
z68AzM#Bkj^RpaOX$BOGYVzIn67Y?{Mq8zJI2~|ct@1~p-O7EOMq?#8vn~FkR^np-x
zRG~&OZ14Wi+@|`$@RZ7!^F7r!QTi({4A`hY<_OUUJ<_0m;_=^r|NQVDAO0W73lj7w
z^2)Bi083w#>BO%gd;xA~h4rp#WZwuq1O3yxAMey@*LPw$-@kqYG{hF+nBbVH8PR*K
zpqP(o1X9-g`oFx9I2h|RnL0SE11U({q6ef3Ej!vOui{ky*&f|OiQVcg4D*foc&$!#
zHCP&D>ExZ!p2_%mh~{>Pvvb_hl^Abm%@{<`Wwzi8U_Q6Qo8c+0fBOb*%hvg@vvE$;
zSBiM$bI?*b5+WU~EKJ{;0W(o<F8qiQyxO4g==|MG-$)ygsRc4WtH$9lE~BdPE6B!=
zw%zK_)(x+&kD*`NAD_PSRKHktByif@Q(S7&d2G<1ohI~J3{!p(9Cf`bE6}R;T&3G2
z2>BTNM9_k9c&9v9VT~QDw*CupiT3AUVu80>yuqSB<p$=jDX4mJ)$ziSl_1G7!dK|z
z=qIl+efkN(e{wX4oNDd(s}U-)bUDq+g_K62yMcR2X?q;jFlHL6a75x_C(a^fX3_Al
zhQ8*VnZ?H}zLyqAVv5S{;VB#5Co{{7OPuey2JK$@)CPuo$2E_k_2ZgVL&I~Pu7z#7
z1dQxY2u8J8r64b+&uFD!XCXf>5>W*{!-mFo!lm4q$#04N^iS_Bn$ymCL4SiRLeW#_
z*w_lnOs@1U3^YO@U!7EoT&tg=1TzjVTrERItDahX?DF|{#%5N~I^GyiC^Wc1*Kcvc
z1?eId%;3MI6jU@TcIU*DA?qow?dC*|6^;sj-JECb=5>nSS)deCqWi%W3m9mW#XyYk
z_d~-fe;)MI?4#;bc3^vNxr0T_gA_jIsVV`?CL#>lL@M|qRRVcho5Cg6mvta%XYcfp
zCaQO5VxSo>niSh$sWJTJ7u?WMi@EP6-H@WfO)CM8lpO;$4)&}IT0;fzUVPJFfl1s^
zA+hxX%9%L&#+l8_XkuUlkH5}uN10n2^0;)6QBY;y4uOqwP!J}scq9<68iL5Y|I3(%
zph+9{lTVizd_=QwEhy#Fi1E*(xBNFH%tNzSf->W!atS6oPaiWk*~Lwn^vtn~dyL+<
zV}YW2_r8Tyvk;9=iNqx|5n#_V>$Sa(ZU4Jej>_vwOX&X>yHR@USOw?Lt8;+}djXG8
z=_X{IIIg%94oUx@FoxW{HFOUL&>+8>eR#~PY!*7V^wNI7MZA5zXh3wDMZMUg<}f`q
zYY)BTs`tIRKXA2)cIz)=Q1wL`T(B%PQsY*0l~Bkn-HG@U9L++PHM}6=I6xi{=`K64
ze{VYc_YFG=zOMOBMd%OvamVLTnginwd^iaajdK;0=HV2rwAf-AS{<1>TZQah$l5MH
z6~42$+qaH3h$J8XFTc~~+^kZ~2N*}SVC3r-(3s70CEL;%a8{A2$P$jm(W!yfK5&kD
zM81J}av|e>dzoZ_vx4pqnnXZ3W+28pPMuM~H(d^{6z_vM$TA^sNP&&mWYzPNw4HM2
zXD@>Z-M)G8*v9#827&WE>!Lj2Ode|F`x$Cpv)e1S<#H$$X9iX}OK_XgM=(MwPk12!
zEPT@LgtJ9uS`-CZowdCfvXSKgk?VZA57{WDeT;i#AaJ;+Rm@K9OZY8<OpQL9T9s!Y
zoU6UZ@xXet+Ya43!?$6B$(#u+`69Yyo)s8(2hX2}hOR>E>Jt%OV2lj;O^cUq{l!E|
zD=u&P&E25jbfO3i?$Wi0zbm%5gS@%Tm#YpY>$tf2#}%v2Q!B(DNmy}zo2R&_Xiu@N
z__DtHJ6$UQ9~ih$vOLM%P4|CwNwcF24RnS#&L1k6B)^&l%&UB{&e8CdN8a;(h_vu7
zZ*>vT2vrDnkF;v3_4RMobN?Rjpuairdw_G?RAc(At4>x$j6_7K#fP)wTSHdqH(txu
zTW<`x8^}o6;w}H2#Yt_#68pv9;d6#A7umLH5ghI~w^^rAe#o4XBzDXaTQ^j)-Shox
zqw<vgj*^~*?n4pmP}R9wApq56;_mZ0=&#=gnUev2bqZ*~BSp(StoP{WIhqEi8?&2l
z<Gd_uZZs^Ny$o#qG40L}R_7bAmezUBUT2>o(!V{FqPL1iSKqWc_gvyy@|{}(N?29D
z$|(Y{l-jMgeJT)Y=hKV4rw{_K%3oHF!e6eYZ8Fun=I|mm9p%#!RtQi#HY}|pVj`EK
zClhF6ucucEx*nQ)GMC?UKK4i%f8E#lf-^LLW}$j>Ps(d68XOxJ(Ex%Sm=ZaN)e$3S
z)bRxw&bc9<U#}wEC*%9NHl!sUKc-kpf0&2^o>jpt{0vj7NH$R){IyJkq}27Diw=e!
zU2dw%Bhp<xa)$B9xOpH<wQJT+l1c1Xi%aUR=QS}<+8lYo6-x*@w2+}{vPAY_uFnpL
zf4x3@eG(aFeL$Y%T3X1`sPWBp@{%|AHo6Q!Q)uMpgf$kNL}Fuiw8b5Is7scDRcQ#g
zv}vT(C+pa|Y*qBQ>@To)&^(k+uj3Od3Qrrd++ei2HWg(^Igxw24<0!f>V(*z&d6Jy
zlZsEBmCmLQVu5nPiY^<(hFlt0`OOi`;viTy_g=3h&eH@C`FPw@cKR3o;jt(??LxJU
zIrT6sqQ-LE?(UTlT6>djeZ#%y68Um%#dY5?mhY>{yJn92qgtp&z|KJiiLw6Ceij^q
zI4qlpZ9`6#$?$)9l-QCiG~54Xrzmribc=ljVH=N?La2>6GFav;i?@cZ<1*-E6?kXf
zY{dtS|4N!U*O?or_Xuiw%KOOP-se<g{rY_y<Cojm@P=<w_=9)jbiR-X`Ffp~LX4f2
zR%E?~J%^G@QyanVCn|cL(;>dTR@vZv=c05Tn2X%oW?r8Z<3IsJWoGbANT|TMj*WRR
zpbvu~eV0x``68kx^|W<)c*8CRfWB%y)5srPcDZZv`G(cH;4S1xfo%ra|0-0I&CUaQ
zWFA*-mnz~AHVidYVL4UNO9#6my531iuA66X584old21SlmVf8$9O@kvtmh7?q7@X>
zFv@p(H<m{Nn;Cv(2v;&u_<I9Fst)m9E8KeNNisF<_ld&X2{C?R15sjsj~~G?s~z1q
zsUEcv{FQ($Nl(4D8)^2yE|~fmp{_tt?y9F}1w@=#J#)M?WPh*rao+E9GZtbP@Y#8<
zrEQU^kCfR4M@~L&djraRk7ApQn>~=PgZXZ}kg_usY8ooMeIqH#O6}!*27RYE(1uzt
zCF5QB&ymg;h)6^M=0slFeRH<_7pB2UJk74Ax^2T1{!b+`FX=FATU9#tTCz&yHh$!0
zRMSFw8kp>o1?CGGONJNBxm5S}lp$@hlPqNTb+-gH9?6!I-}3WBMB2U-nw%<LsOV0!
z+>rc-o`)a_Y4KvLt+G0v!c3n?R*c6$x@-zpx1DoMjHY#wDd<px>mf61Z*COQ$r_`d
zV-6Y+{B7{fs^1kGer;CyhDoaYg&`aG^#Vx+J);X7vJE2Z@9EQmrQOn?hOiD`9maX`
zMMPM2*kp=;QTonCCQ3W++&OPcquS6@R(I}zlvaYcxzt9xxCHIvc@N5!x&m=7ish(<
z%@@_y9oEup{<Wi)4<;<<*%Hm8+L%_idixGoh!Hwt@^_PwQHh0HuF9gC()~{EysF<}
z_kdAZEEDL@i!fKOmq&Xs^|wN>idR}|Im=&#pZzuP%Vb6jb0?HeoXCs?hR^Jsv1+ho
zV%uq|`nE;6Rk*TF@@qIswMJo(`-4zpfEv<*+Af3_8eqlG?X8ODS&4MyiYkme$QN^u
zv;*q@IZ9GHJ2)=v^Qj5D4oo??OA>tWwFDj8W+0Wx)a}`HT;)AzHB;2)&Y8E};cg<N
zb(;rLc}OU{xUF^+#SlNlIFPk^RFlH0*nOW~fe-2KLGflWQnR+FPL((mKL{H}O}8#9
zt2<Z?HOm}J<u?;5rK?7W)fdV;DR$e&jTtoz=mojKijzx5m$F7(goV$de+@;bPrWIE
z`{4qmMEk^)DardYL|YSYwN+|jz5f_mnl#QTz3kL4B3v2A&|^%i(q>KBS|=+!G!Y6e
zSR-=y+}3EZT0etmC=Zr#)Ot4g1{_}<p8Uri-G7U{5^u{bHuvSe-G(<!&N3zhycam8
zE->>d<znjjLLkz0VrZ|ypk>#DM{R0T-0E}voG`w;jP67o+2tNtxv{c{Ui{$KY@^bx
z-WO6R9^fBbe>SV3bWZI8cqzq(DP!vXagLc3OeNFPEcEXV4ey1hrbi|F#_COn?Pqmz
zBqVb9ji8ezH}#ujj=AM(4-P~(kQR_a_MXHxvy&c!psKN4)EVs4$Cs4c-Tgr9X4&Tc
zI$~Zbwk-vHuv~YNS5Ux@9_|@oryLbqu#f%jxgk(7U~SA3JUPgc7p%5S7NMBfM{(as
zNWp_zgH<nt|9pz^LyV8Wq^<y+i-I5#o;;1{zUw3MCjeR0odFBQLHXbs17z3po%~9&
zTy`@s1DtP{T;^t{_(}mZBl$-w?vW&)igX^Agk<^g-Hn}H44OP-Ce!K{Uhkf2o1J79
zWf`<c6rQY^RqUO%k@B%`2qlXwP8l8EaB+;DmN|oY)qv7I`Y|zd9^yqm0!8K>C?ja=
z4&3}|w~us#$owX6;>neyVZM{LXL|yfkA6la`j&ss)kWe&D~FCECv2<((|z3){p%Lj
z9pWbD`0#4EHWCI#hER_6TLiS#L~Z!Ohh7+HQeX9%V@NXzGdJvUt`QxYFcmejGe;`Y
z(&fD7xU;3dZZOoH_>NDv<CA)F#<?^ntK}!~mRNgZP(!1xWAJm^)drr=(6QX_z(+P#
z`bg0CE;~47nuy=*@=zeNwDW5{d%f@zROup~t4Hd@PjC2n4F2FILG3;#F?j<NZJXej
zvtXZn+C{%_jiy3soiE%Mg=}j6uml(v(4KJ<z1<l?-}+PZy4zMF2-nn=`xRQp!LO~J
z8Z~^J_pTAUEU|+&$B@w08MzG+gB?6!!e>~`0UsAckvVJI?(&lA&1uSCznGvU2=oa|
zJ(ehV+5WR*J%^gOZyFt{@?g7;NmHZc$&SL=57Zr}Q10;xj#|O9yy{(135hGvuV8ip
zpJfwQm@J)oNl-Y?xug!MC75|Ej`ZC?5A__;l%LW%EeFIs<Z-<&Erj@{g0ry|A{lA%
z*R^NhrQR@h4)i|7fPUs_jmNv*wtY#BbK4ETHqM!S-m%;_8>0U0%+TU`y5hBm;Py$?
z!a^7tjvm@qG+ji6HUy{0U`#?h^OHamN$_Q-?!otqsRHFDP)FP7&@*`wQ+H_Xr*VCa
zmf2a$wOxsCOu8LK&yy&V|IF>Vqr!vtJ^DiqSo%Yde{cqW5P5ba&mi<=xhu_WmXqzp
zoKQSBCX%K`dhYFO%gYy5EBjg7Xxj@aVoRSS|A29`${XLOzZNgzK*#|$@1ULsB}`%U
zIvDm#N>+om#hG~?s~GPcN@X=yZIp4oIl#m0$AgddpBu1t*?BkBe@UwILM-Lj*vR{x
zL=NXRM@Vufl$#|MQn27@P4S_K(@~9<V2Q@FY)9q61Y5n1nV%ziA)#O058I*3%64Gj
zQR7x919Ek7{dQHgL34|lepBSvkY7EDbG#(%=7XZp6zaPD_20Bk-OXRkb1YSi|ElaY
z36}zt=(A3%Pb(GgULgc$H)oxQMI=mBsB(u}+E7d7@Yu+cZ?Ol6)lTJpebmom)}G7~
zNlInEd8pPOg7^-9lM#$Sjz;9Z@a5ibPVOhHE_V9=!6~KepIZ#~Fd3Th>-;v4o{pR$
zzWt8EjzH6^<<wdGLa>DvsBFwH-uGJy0%k!MCj5<Eau>;Sr<k9Oy-(97p)vN6e@{2(
zU8Rpbjtao4K&dzdL_1Eq*k%G0(SLfuUp~-xU4B@4J0l5}7&1~SsXvwfS!P@pJ+=u^
zL+b`aX2RD#xr5h)^2ppHu&zd)p2FY({x9#U1vEy4zoL@oOnA?d?@C?3y><hF!|Vy3
zn_d>d8OwwlVW*@k+c$$6dN?a*B}5he`dS7l@whg}@d>uPQeIi~Tz@#Gep=edQ35|Y
z(v(UCe;~zG`l<POc18EYxb?UNklJ#QRYEq0QYC(t#+<BO=ue`$9Sn$t(I3y*13b4*
z)6{odv6Qa!@$(X;EoA8C!4Hf2DbxqwR|qo;J!B~Aj`XuJ(!arHV>U4GtTfM3`(RZ2
z3*OB%rNN&4`0ov^EnvML<KTr+x9Dkg09nrXZxt*wwX4;iRBxV>tAFbfyZuR+L}P@~
z_-Bq?@++pP9;2No+icpr7s#3&UxP=O6Ix!MKUVO$W#IFsh!;DD1i7>Cs&D;k&xeX_
z_+`H)VP(0r-}-NlcFzpwl=M4G@ot&t815WJBq#N1Gj%5VdbV0hz`DBK7%b)UNWhZ{
z!X*qGqlb*DAj<{EzZzNpQcUJHn^2zL-OGUrDs5K-r?bIR;(Nd51qS*q$pO6016tM3
z$TL^08tK8`y5L1UF8G3w6DWu!zg2nhwk*S?&6gtTcs#Gs0+wi8XA;=_f_3X<F3Ep_
z;MgUwh|K>fPH@^gq;pJza8HP#S<*-X8v-hFKD9o3ZsGnXRY_BV2}<UzZ;lm_3>_lU
z{~q)<vZSpl9<=%P4vVN2*0xO6q5{{!3xHS<Bkf{gxpdV&Ois8o=-E0U=F@m3Y+5Ch
z&4(Dc&3F%xtL8LKdAsno!vNTEhCRu@8D>e;Y{rE#p)ZeyFxaxmvcIZwW?H5C)O7w~
zAuh(&4|5u?Aj{hqhk`g~{z3b5o=(Z>&0|8Erfel1XUX-(>-6p1;!3DC&p`<<vO(?J
zu9vbOJv2V?kF7nz6`4`X_X+T)@rEVt>ky%4`=9_H+jaREsXDLQXN?z4g`Vlqh-ohh
zfAR5ozfT5u*G}qJ&kCS^`BR+DX1+B)*2e44`nW{b_iKhmt%}A%!`t%hyT6i(NV;eH
z9x3+9z;R7Ygvii7;n?#QH=KQ^p?>jatlx>UnVs;fDYHXE_dfd)@+$diE`|ZQufmyh
zCkGVCY@OE^C44GASD0m%7*wOKo$l@2ui&}W87~<C@`KdmB<Wos+gd}bz8b>ckNEhQ
ztvaE7tfe<|Ez=a?52AvvEViFKHY)sn!F_fMmBxyCG&h)dZUyB|VHJFjrt1@fng2=w
zH%McI%Ft@oYAk-ix6k~}?E_i8)#t3l>~Hw03vV2yWd(t1?i{~(bG)<rSL08TIa<Ee
zGA#|M+Oz)}zV0?{Q@>pdr>fh(&6H`!-2BZQl}-FKeiAoFnjW|$?21{yqleso8{^H(
zhw3XsAGedDWOEiqU1GCWPEnfDFZ)0mdX+*-k`IOuC3@Jo$w{zh?(9DRxtgpbo}fbc
z{xLN>|LmloXtJvcOrG1Wal2RwAK%*Y?Fs)}gIt?%X*FWTDKLFpgv6&A(I}MXr<ga;
z{uAop`4t>h-stG*wra&BAhX5c_e|Pt|J_n+{8mc1c8O2>al;g~386Y5`@G=`xOOzP
zwZ+k_*Ka0ri!9%UF_(3mHaFQUd29e6(HUy<SU0XR4O}mEF1OSqV2q=#qU=L{?~cXz
zkw9Zu<x_9Af4cI=?<k==OEdO_p(~&5MqTdI8X{fJ?KN+7nX&nnN;iK2pW{c~EQlS?
zJDtjx7^+|fiUK0|2qC#{m5E*Mn5@>OoWGZ8aUB0hrfKxfqMW_ubZ&LfhaQJ-2fuUc
zRIS;h0)HpE42(7}z38ZmJs{&&`--Q5^}>UT0(Huw>Clkm(|Y`ffWrP4uwQfp#ZQY;
zti8kEIPqojWl8~RQcx7pf(j(L<*&(q>2>gJ8XiBTCFqm(=rt7Urfk;P61Ovp4nZl|
zUe|5wt^R5<++;7|jCOX_0M}G@gs+a^)e(p3(u?=-x#}T#$LZi&__})KMCC*4%gado
zq8ogD+UJqFFjCcGOVvInX+lqoC+jdP6=yPAQH=;Y`cWjOtG81UbY7UvGyC8T`4Y6K
z`AIR{UcZ6Vj!l19r{ss#J=S0dHJr%|mUfe6pN`OUJqtdphos0xb+Y=nhc5@5$Ygl~
zWhc#Lk?*AM&|%(B#-kye5puG84L#GDa;qbD(g?~~X~a%g^LD?pxP0iYQ1W)KJ3G-7
zmN|DGZ1?qn*L4Aj=mg_En6i^K;$KLe%==*JwF6BD&=qaa**@6U{f=MGa;$cp2#=T)
z?aK3$pz{!16y=Y(NsgKXe$nrw_JO|Am^Np5#tlU2(cw+pz6s$*Z;*xgS>J_GE4;$m
zctbvD0%&@9%j+xs3IVP>dYEtmJX=E7iG|L@jGj1dHA|KR^lVA+t8x|F(oRb6ReO-8
z1;j7HQFBIS?YMBW>$?scm70zxwGoveH$23R0P?Jsb#uR}mP*Ne<z(Xe*`PFJV+DiJ
zyG&#S;nH)x6}LNobo^gk8;Z4fkF6WU=`_H~>fR{wD_L_1N&<P+mDz7%V?P=~8xHGv
z3}}45Q)j%}Ws@HkO}!|uTkk4ka%^7jGLNhMmR8nqP(1sRx7=Zy-^21mw>hj)h+m3(
zv*y#yTTJINk(+ayU-#;q6a%rE^X-yLg`Zi~-ifE=G#!+&YO`v4`Hq{beEqkbIjY47
zL;mBySvcl%SGC~2*$5BG!o0gcj~O6I?}-ijxy^gY-)y6<PlGTq+TLm1#Jl=5k%@&v
zscu_A?6JY4w4BkN4C>@*(h1*=0U-0}VfDbzL<58o(*ln~SE1b4OI~bsTS-XU&VWyV
zR@wt?%gJ1x&GRXe(VNDkW?3e(XE(I3`JX-z@*?2Oe&+{Xl)4c3Y`3~pCH5-{H*^xk
zX~(j4c$<oysfM{EE32+@D096Ft$IFy_s>3<N-&RBMC<Ou4!zjf`;I$*pd&85@SzrN
z`CxK{Ny~j;6Of-~+a$HP@9sG|>`C4tcmCba!q!9Wc4Xi*qhzrMjqcZb=K<_>UMIVc
zS?ur7<z@+{kjC_Vwa`#n_`v;eV32~i_=SMFa(WJEQ+nS`<0d=w{J3d7?B~qFXk0ln
z3*;H7d<psd(EJectQ__6c%*HG_=K*qhMALfTTU?508nrNI?|sn?fO<4kniNxz1^O^
zKmGfIi_lS6dFA3&I!90A2ZsAGkSY5#xOFq`U2+Xel`o5t0dH`3<Iyi4-;bnHxa$$|
zP4X5KdX9SQhy8G>B|J#=Nk16s&INdh%Por_Im(JXn*HV--nyU(7&;!tnPa6P6_4y&
zmR_tsqjS`3e;yRBK0c!XSLNnS?<(?MSs48k#9rR~91=dH>u;YuCY6oA!LKlHJsdtT
zH86!7;^eAJB#}qMp&t?wvP5#n8dI1D4z+ZF+NWAzKz>8}^i_ocW)yqAdDaXo;I$)V
zrVaBNuo$qDF3(POLI*ZdQPDsDpBCUuwjheTDIwpM#oj285Obx*gJitV+mkdg(nY+_
zL*&j6p$z@8B^1;RxzUy9_su?VKfp6#07y^9-X-(*urUO>_<^+I+Zcz{&Dn%H;j56!
zrNYYXZMO!or_6H!>oHe+{tZ;Ug`knN{5-d21~Jp@Zhm$c_`Bz)6?Zi(zSMENfObC)
z9=0izoDjDkBV$gT$^uEPX5aii$7UeOXcKhj{qj{G2W-1O0Z<*lMsOj!Z2JXf)_}$x
zCHO@J1P{?DlwaeHl%N{Duoj-S1j~+&e0{`U>db8@-=or3<S_wW+WHr9-|v9OkcZh1
z(qslfh~`XkB+V_g6U<#_eFC!sLycB9Y}IO=cmTKQOH>xY!=3i<uA<AIE!8#DKm!@}
z3IDW4^xflyWA{<65=I)qo{fSWG$qX(64i%6`)4=8x)(tax4i+40aZ#l6+Y(=)-%8#
zg{lk+tGHx-b>goAyNb#|TBH}b#g~(@dmDc9imrieGx?^x>SI3|T|*?M3j*x{_vuT3
zyutN;9!uHi@UyojgZG%=X7k5cE<eT7<2nS|YL#pnyPcX6T>=eyQcNDG*|CxG8vOQX
z5^=hT386{Pn(w)IMYrE)BY&SXhhRl>7S;_Bj^k@JEoo&>Y{H~ErPKo13e0u8|DF2o
z!{*HjDd5!v@qHbZ{8%W;6n*XOj7ViI70N$HqDlaw12T|Xy;V7>5#N08+ENLf<7r^!
ze!ji(JqwHI!`_*#A*T&kagfR2i@g+=qD#aMEopzwIE~80G8}sYF8;Vx$!8k7(|;4l
z<=?=SoW}be796{_{%^-{_;DK}SkN@u_c9=X1KAu_^k6EGDFj9eU2_w6XNKtbX2%dm
zfmOEiY|wH6O$wP~4%t0|W6%{|{iRST9ISMOW4`1E^kZxQZ9z$t<!Au^WjA_^HY(4g
zc15=mF9u%z@E~Vq3YXs(keQ}uS5W!Pln88i<L3L-!Mj)*4>P8v23VbPG<#f$L~EE#
zRDUxI2()bg9{JVpl8jB?ZwZb)YbVJYo_dGo_0dMiP|49be~ZJmftXs3=ClJ7S?$=H
z_!W?z@`fP38O7>D=StR301p(OF+KH++!W#wK|J31o4?ZD#RwVExOm}GPvhvT*oY*A
zlHY<(H_a{$4sN7=(n53>2NgToEW9o?yBv{+8e6?zOG&^*%6K<iQ@#4_QFt6bCbn!6
z=tDu?yZIxgcD4PD{z%~8{-^IO{bcw-9lM>U+xKqj<h)U;*w~W08~#n2Zl2DX2eTB^
z(v~#f+xua+@#;&@iL**t4yvr2?SI|(c3h(}7AEYcA0FR-N`=Fme{)!_qE8bI*Srx!
z#j}<XU#hp3Z}38drPJ;Ffmb1&pLa-R)b(d2RNpe;cQ*ZVI69;@D%WCdOwBGOJY{#h
zT6c~ls95nDQWclx{?qmRr*HaC#`XV=oDFuV^@}<`B7jiLRG|P0;HF^B>L*yU+oj@=
OO6R$uX3bNFnEwMyl5Tqd

literal 0
HcmV?d00001

diff --git a/src/HYDRO_tests/test_HYDROData_DTM.cxx b/src/HYDRO_tests/test_HYDROData_DTM.cxx
index 96e779c7..97d122ab 100644
--- a/src/HYDRO_tests/test_HYDROData_DTM.cxx
+++ b/src/HYDRO_tests/test_HYDROData_DTM.cxx
@@ -30,12 +30,119 @@
 #include <AIS_PointCloud.hxx>
 #include <HYDROGUI_ShapeBathymetry.h>
 #include <Aspect_ColorScale.hxx>
-#include <QTest>
+#include <QGraphicsItem>
+#include <QGraphicsScene>
+#include <QGraphicsView>
+#include <QPixmap>
+#include <QApplication>
 
 const double EPS = 1E-3;
 
 NCollection_Sequence<HYDROData_IPolyline::Point> points;
 
+class DTM_item : public QGraphicsItem
+{
+public:
+  DTM_item( HYDROGUI_ShapeBathymetry* theDTM, double d )
+  {
+    Handle(AIS_PointCloud) pc = Handle(AIS_PointCloud)::DownCast( theDTM->getAISObject() );
+    Handle(Graphic3d_ArrayOfPoints) pp = pc->GetPoints();
+    myBB = QRectF();
+    double xmin, xmax, ymin, ymax;
+    myD = d;
+
+    int n = pp->VertexNumber();
+    
+    for( int i=1; i<=n; i++ )
+    {
+      gp_Pnt pnt = pp->Vertice( i );
+      Quantity_Color col = pp->VertexColor( i );
+
+      int r = col.Red()*255;
+      int g = col.Green()*255;
+      int b = col.Blue()*255;
+      int val = ( r << 16 ) + ( g << 8 ) + b;
+      double x = pnt.X();
+      double y = -pnt.Y();
+      QPointF aPnt( x, y );
+      myPoints[val].append( aPnt );
+      if( i==1 )
+      {
+        xmin = x;
+        xmax = x;
+        ymin = y;
+        ymax = y;
+      }
+      else
+      {
+        if( x>xmax )
+          xmax = x;
+        if( x<xmin )
+          xmin = x;
+        if( y>ymax )
+          ymax = y;
+        if( y<ymin )
+          ymin = y;
+      }
+    }
+
+    xmin -= 10;
+    xmax += 10;
+    ymin -= 10;
+    ymax += 10;
+    myBB.setRect( xmin, ymin, xmax-xmin, ymax-ymin );
+  }
+
+  virtual QRectF boundingRect() const
+  {
+    return myBB;
+  }
+
+  virtual void paint( QPainter* p, const QStyleOptionGraphicsItem*, QWidget* )
+  {
+    QMap<int, QList<QPointF> >::const_iterator it = myPoints.begin(), last = myPoints.end();
+    for( ; it!=last; it++ )
+    {
+      int r = ( it.key() >> 16 ) % 256;
+      int g = ( it.key() >> 8  ) % 256;
+      int b = ( it.key() >> 0  ) % 256;
+      QColor aColor( r, g, b );
+      QBrush aBrush( aColor );
+      foreach( QPointF pnt, it.value() )
+      {
+        QRectF r( pnt.x()-myD/2, pnt.y()-myD/2, myD, myD );
+        p->fillRect( r, aBrush );
+      }
+    }
+  }
+
+private:
+  QRectF myBB;
+  double myD;
+  QMap<int, QList<QPointF> > myPoints;
+};
+
+QImage draw_DTM( HYDROGUI_ShapeBathymetry* theDTM, double theD, int theWidth, int theHeight )
+{
+  QGraphicsScene aScene;
+  QGraphicsView aView;
+  DTM_item anItem( theDTM, theD );
+
+  aView.setScene( &aScene );
+  aView.setHorizontalScrollBarPolicy( Qt::ScrollBarAlwaysOff );
+  aView.setVerticalScrollBarPolicy( Qt::ScrollBarAlwaysOff );
+  aScene.addItem( &anItem );
+
+  aView.resize( theWidth, theHeight );
+  QRectF bb = anItem.boundingRect();
+  aView.fitInView( bb, Qt::KeepAspectRatio );
+  QApplication::processEvents();
+
+  QPixmap aPixmap = QPixmap::grabWidget( &aView );
+  return aPixmap.toImage();
+}
+
+
 void test_HYDROData_DTM::setUp()
 {
   points.Clear();
@@ -99,6 +206,14 @@ void test_HYDROData_DTM::test_hydraulic_axis()
   CPPUNIT_ASSERT_DOUBLES_EQUAL(  43.499, distances[1], EPS );
   CPPUNIT_ASSERT_DOUBLES_EQUAL( 211.474, distances[2], EPS );
 
+  gp_Pnt2d p;
+  gp_Vec2d q;
+  HA->D1( 0, p, q );
+  CPPUNIT_ASSERT_DOUBLES_EQUAL( 13.75, p.X(), EPS );
+  CPPUNIT_ASSERT_DOUBLES_EQUAL( 6.25, p.Y(), EPS );
+  CPPUNIT_ASSERT_DOUBLES_EQUAL( 0.568, q.X(), EPS );
+  CPPUNIT_ASSERT_DOUBLES_EQUAL( 0.568, q.Y(), EPS );
+
   aDoc->Close();
 }
 
@@ -409,13 +524,13 @@ void test_HYDROData_DTM::test_presentation()
 
   aProfile1->SetParametricPoints( points );
   aProfile1->GetProfileUZ()->SetSectionType( 0, HYDROData_IPolyline::SECTION_SPLINE );
-  aProfile1->SetLeftPoint( gp_XY( 20, 0 ) );
-  aProfile1->SetRightPoint( gp_XY( 10, 10 ) );
+  aProfile1->SetLeftPoint( gp_XY( 10, 10 ) );
+  aProfile1->SetRightPoint( gp_XY( 20, 0 ) );
 
   aProfile2->SetParametricPoints( points );
   aProfile2->GetProfileUZ()->SetSectionType( 0, HYDROData_IPolyline::SECTION_SPLINE );
-  aProfile2->SetLeftPoint( gp_XY( 100, 0 ) );
-  aProfile2->SetRightPoint( gp_XY( 110, 0 ) );
+  aProfile2->SetLeftPoint( gp_XY( 110, 10 ) );
+  aProfile2->SetRightPoint( gp_XY( 100, 0 ) );
 
   HYDROData_SequenceOfObjects seq;
   seq.Append( aProfile1 );
@@ -427,7 +542,7 @@ void test_HYDROData_DTM::test_presentation()
   CPPUNIT_ASSERT_DOUBLES_EQUAL( 1.0, DTM->GetSpatialStep(), EPS );
   DTM->Update();
   
-  CPPUNIT_ASSERT_EQUAL( 10404, (int)DTM->GetAltitudePoints().size() ); 
+  CPPUNIT_ASSERT_EQUAL( 10200, (int)DTM->GetAltitudePoints().size() ); 
 
   Handle_AIS_InteractiveContext aContext = TestViewer::context();
   HYDROGUI_ShapeBathymetry* aBathPrs = new HYDROGUI_ShapeBathymetry( 0, aContext, DTM );
@@ -440,8 +555,8 @@ void test_HYDROData_DTM::test_presentation()
   aCS->SetNumberOfIntervals( 10 );
   aBathPrs->UpdateWithColorScale( aCS );
   
-  TestViewer::show( aBathPrs->getAISObject(), AIS_PointCloud::DM_Points, 0, true, "DTM_1" );
-  CPPUNIT_ASSERT_IMAGES
+  QImage aDTMPrs = draw_DTM( aBathPrs, 0.5, 600, 600 );
+  CPPUNIT_ASSERT_IMAGES2( &aDTMPrs, "DTM_1" );
   delete aBathPrs;
 
   aDoc->Close();
-- 
2.30.2