From b6779577d631710b3ece60a9b4b9cda16d5b6fe9 Mon Sep 17 00:00:00 2001
From: isn <isn@opencascade.com>
Date: Thu, 24 Nov 2016 17:59:30 +0300
Subject: [PATCH] debug of tests - new methods (wire3d, face2d, edge3d)

---
 src/HYDRO_tests/TestShape.cxx                 |  44 +++++++++++--
 src/HYDRO_tests/TestShape.h                   |  12 +++-
 .../reference_data/Extraction_Channel.png     | Bin 7771 -> 7390 bytes
 .../test_HYDROData_LandCoverMap.cxx           |  60 +++++++++---------
 src/HYDRO_tests/test_HYDROData_PolylineXY.cxx |  14 ++--
 src/HYDRO_tests/test_HYDROGUI_Shape.cxx       |   2 +-
 6 files changed, 86 insertions(+), 46 deletions(-)

diff --git a/src/HYDRO_tests/TestShape.cxx b/src/HYDRO_tests/TestShape.cxx
index 3cf4ea20..70ce0866 100644
--- a/src/HYDRO_tests/TestShape.cxx
+++ b/src/HYDRO_tests/TestShape.cxx
@@ -27,7 +27,7 @@
 #include <GeomAPI_Interpolate.hxx>
 #include <gp_Circ.hxx>
 
-TopoDS_Edge Edge( const QList<double>& theXYList, bool isClosed )
+TopoDS_Edge Edge2d( const QList<double>& theXYList, bool isClosed )
 {
   int n = theXYList.size()/2;
   Handle(TColgp_HArray1OfPnt) aPointsArray = new TColgp_HArray1OfPnt( 1, n );
@@ -50,14 +50,48 @@ TopoDS_Edge Edge( const QList<double>& theXYList, bool isClosed )
     return TopoDS_Edge();
 }
 
-TopoDS_Wire Wire( const QList<double>& theXYList, bool isClosed )
+TopoDS_Wire Wire2d( const QList<double>& theXYList, bool isClosed )
 {
-  return BRepBuilderAPI_MakeWire( Edge( theXYList, isClosed ) ).Wire();
+  return BRepBuilderAPI_MakeWire( Edge2d( theXYList, isClosed ) ).Wire();
 }
 
-TopoDS_Face Face( const QList<double>& theXYList )
+TopoDS_Edge Edge3d( const QList<double>& theXYZList, bool isClosed )
 {
-  return BRepBuilderAPI_MakeFace( Wire( theXYList, true ), Standard_True ).Face();
+  int n = theXYZList.size()/3;
+  Handle(TColgp_HArray1OfPnt) aPointsArray = new TColgp_HArray1OfPnt( 1, n );
+  for( int i=1; i<=n; i++ )
+  {
+    double x = theXYZList[3*i-3];
+    double y = theXYZList[3*i-2];
+    double z = theXYZList[3*i-1];
+    gp_Pnt aPnt( x, y, z );
+    aPointsArray->SetValue( i, aPnt );
+  }
+  GeomAPI_Interpolate anInterpolator( aPointsArray, isClosed, 1E-3 );
+  anInterpolator.Perform();
+  bool aResult = anInterpolator.IsDone() == Standard_True;
+  if( aResult )
+  {
+    Handle( Geom_BSplineCurve ) aCurve = anInterpolator.Curve();
+    return BRepBuilderAPI_MakeEdge( aCurve ).Edge();
+  }
+  else
+    return TopoDS_Edge();
+}
+
+TopoDS_Wire Wire3d( const QList<double>& theXYZList, bool isClosed )
+{
+  return BRepBuilderAPI_MakeWire( Edge3d( theXYZList, isClosed ) ).Wire();
+}
+
+TopoDS_Face Face2d( const QList<double>& theXYList )
+{
+  return BRepBuilderAPI_MakeFace( Wire2d( theXYList, true ), Standard_True ).Face();
+}
+
+TopoDS_Face Face3d( const QList<double>& theXYZList )
+{
+  return BRepBuilderAPI_MakeFace( Wire3d( theXYZList, true ), Standard_True ).Face();
 }
 
 TopoDS_Wire WireCirc( const gp_Pnt& theCenter, double theRadius )
diff --git a/src/HYDRO_tests/TestShape.h b/src/HYDRO_tests/TestShape.h
index b1e12378..470d3049 100644
--- a/src/HYDRO_tests/TestShape.h
+++ b/src/HYDRO_tests/TestShape.h
@@ -25,8 +25,14 @@ class TopoDS_Wire;
 class TopoDS_Face;
 class gp_Pnt;
 
-TopoDS_Edge Edge( const QList<double>& theXYList, bool isClosed = false );
-TopoDS_Wire Wire( const QList<double>& theXYList, bool isClosed = false );
+TopoDS_Edge Edge2d( const QList<double>& theXYList, bool isClosed = false );
+TopoDS_Wire Wire2d( const QList<double>& theXYList, bool isClosed = false );
+
+TopoDS_Edge Edge3d( const QList<double>& theXYZList, bool isClosed = false );
+TopoDS_Wire Wire3d( const QList<double>& theXYZList, bool isClosed = false );
+
+
 TopoDS_Wire WireCirc( const gp_Pnt& theCenter, double theRadius );
-TopoDS_Face Face( const QList<double>& theXYList );
 
+TopoDS_Face Face2d( const QList<double>& theXYList );
+TopoDS_Face Face3d( const QList<double>& theXYZList );
diff --git a/src/HYDRO_tests/reference_data/Extraction_Channel.png b/src/HYDRO_tests/reference_data/Extraction_Channel.png
index 09ce9a9eb97971885e11b01d9cb174d3f96356c1..9ef6188a053eadbe1d5122c28868cc276f66c49a 100644
GIT binary patch
literal 7390
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

literal 7771
zcmb_hc|6o>+yBj?860NpiVVtDqg2Wg`o&lqnzS*b$&w`%QkG-+C0SCaB;+uh3|h$&
zQpQ$FB1GBuB`30r@ZO`RPUm@g-ap>YJ0I$r`@WX%{k`w&x)<RzGebU}H9Qam@fjOY
z%pnLP4MAuN{3_6ra4yIV{D(cGYkU9?K7M%nFz}t*&B*c$1o2mJeo;3z@=HL_+C^i^
z?gQS5pW2UvopkhJk9&~_TT=M83G(JkJMB4ryD1`4cr*IY$=zYw->$k~;woFu95=|y
z&Ik)OZ#6HaD=MwW+2sn9Qcft*$LO}^tA<T0>2#`GZdWsvm(NM-u9(73$7GGk>{*)=
z+GEXQxFC&7Ilh`BM@CALygvOQ2vBi8p3X+jRsO$05L_7&6LNMrFDIvDCeW)juzzU*
zVgy9A;UISIj>4;*?H`gSX*<rj6?hE<I(D~k(Y8mZ!}?9(5%sCIE-&;iDWWn$xg?mh
z7nKGh?%B%w&@@8CHW*d$e2T&i$CE3d)slSt*#f<{y{N(5uq5v$_G_xzD=$?lmYeNI
z&VqylB~DuK32s5FC`W8y<MYk)_Fjgl)w(=cDes1elKz&@!-%N&NnFAVzSIi`S+Y=T
zjuSc&_RQkng3emaE63(}TPkjg?Q#`0Wd5FdK_g56>9r)D-xSU-8!muUlY?M23Qmr=
z4jv=>!3{v1%zg$(k-gzF6kMK$dYh08tVTWu3xRLj_)xybu43-UX*yjcqUet9m^-qX
zLl=SQun%)5>o>yN-KT@`b!#G4(^R`rH}L{Y5z#G7qcTjS0tIQYEJjlC1dFJsQ7#vU
zZuFx`TMgG2s@ROHT)b7!b1^I#3X))vfw+}n27tK6f{Cb<VQhgDdr^7DxiZWIQ5Fs-
z8?jx3aWSO|$5C?G;;8Er;fHAQ0_d1BT`aXM7xT(-k0=ezOH{e^8JUj@fix`rko$N-
z?B0f`iJkj!0_Z;5ZqyE0t&d*j>aHJe-)eq0i!}AmDiN$6A(CWuHa*x-`wh=!!P7gM
zuZWfePO9*sWG!8h{oGNH){03ecN$6YiIm)I5Rid|dHLK#NNH9{*I8?xcB)9JX^iiD
zq7B^OMa8>#^h_>D6!--{_hzl{jSqp&JSu>c<gD&{XsnSuHP2Eo%3r686k1p?&y=m}
zaPcfCjZiRZ0?<`(ygZ(-&)pSgNjglvY4||ZLzFD3Og)y=<hK5d>*5;mcofT4=6obR
z$|pQBU;XF<d0j-wg2EKaw=%75x}y_!$@=B*GHeS`f>UC8LBrPmp<9!~TN{WBD^Y%@
z7>P9JI1e|;{a5!;@L7Bjt5mDb-F2sGyr+z1pWY*yr4+%XdV5wPWeWvoHyyA9aF0Bq
z!5H6?@zv!GR;;GU8L|NSUb!slMozoS8P;0L@OU?ZN4>E<kC;q*+ii<=#uZMTdv=M~
zr7DWcpq^ISx}PW&lbRl$hDVus=**&^k&)p62XgB@#kaC)m2L%tGU&SPVh$Nd=8Jji
z&J2CRV4f1*O)>&4d@ocYCKFF^c{gvrKNvE!Br<9DJ7cJ&J2uka&X=zOFdm7+$LJ*j
z@j=eG`z~KfFW^zJWGoHe?Y^UXH-T=$OTkB9(}ynAP3*7DcFjpWd_N=%k0L|S`|hfV
z?^pSR?4kR?GP=yuW&u^OcOuoB{f=(Eje?)54kwh-{Sq`{PaeujYSN_y!^w$L#M^li
zp_v7!^EG)>(&cNQMfbAu*TFBwUGsw6DR|mOg`KZ6(j<Zb;yANCCobd92dKY2wu&Wn
zSV&5RAb@UsZp<%qV)!^?!>J7n8)faOEE{+su}ei}++A)zA?)3&HS2YmCkM}vpj>8J
zdK6$S`o#)C&6Hs1lgAloUEV~6J5L$rRb5$;JrDYmhiy4t*}5-XT8pWrd~dHTwx#cO
zi1K@nv+)vG#lyTOZfsxG(i<GYm-qRAI}b~W7S+<MEPy`gzO_7o?tM+2s~dGzPzF{?
ztjY>$+1v)=(MnpHw*n0}!SdBEC5*kL`lOb93kk=ygXT5PcVqLd<9*?~fYR%mWrOV+
z1Kg$dc*Cu+M=j#aI|-JER+}|jK>J1LXJo0dXdpfaewtYD`Ci9k>%us_5(=L9Qj}~o
zZR3~D_=qAuwx2HIM`yRW)#W9nOO;{N?>rCP!jh(u6v*v&#&vfBY>BMrdHaIlBd(>X
zd$!v!(z|5&puPcv;0IGh{jVA^?<rRZ&RUG~zUupi4X%haW(VW4?yqU43ZTzsaYYPF
zt4|Z9*cLjgdE+8(2_+or6)MiwLSb14S~Xqxf+sX~J0ChJR+CNDMhYAAlP(bzZz)@-
zrax9bT!w)%!X-o#%v<*tWoz|gQXBK1(Mc)RX4Hgzt(ES-?I%cwwlrA^pdB=Cf-T^l
zOj=5QM2~ni@12MZ#FJO+ZNETRhSe!X27Pb$)obZK@M;(O@Aq%fq!iX4oJiGxZDg_U
zWA~P(n&eqevAW8*W2(eN(5(~v_=B2SZ6}sOzIM6o^@FGkFURG=mm1N@5)yavb8<TS
zxb(fDyetvk_c7e~gD2btd(hmC6$*B!TOQZ-rs?rP-ftx{ES0Yl2|m)h6r@cvv~{hC
z=S9PajJ5fUx4{XIZ3~I$`&nywEkdD`)p`11dkfK3<>|J&ZBF?)nenv(`s%h?Wg`u9
zvby*_{WDD5v)e@VE4QQ*4)h3DT;IV|+fLQJS3|7jHq0@(L=;nJ9+t(bzuGgTdN=rH
z{Zl7?$W0D~-ewsRItTe4DmR>*KR^zXgPrJ+N@1Be*q?&05Rg{gyj7Q~4LvwiE{qLZ
z2M>X~it~jUYlN}3cw*6(!@=)8xZHN^Co+r?u*F%U?mY~_Z{a%sg_~Hk^__4<BL-sZ
zJe4$5AGcXaSPJT$^Uxi-#f?AGa!#-(2n(r1N+=cOy%e@DbhHEvf*A7-Xx+z6e{i^A
z_--$b=6|h+)a5nERzwUyP{SEJuHlcLEXpv_2E$g_)&z#Hyma(~#NdMW5cJv*Ve^cm
zh<B&FcKdCSq1Ijzg`$tVw93{>404V~ASkg+7|W7_A>=QU&P!ZWLrzmEXj%uFWaENh
z5*81!*HCve)}XPFVu%txcP~)U7m%sjfkH!B@~v46Eg%TL5XQCuH_#3S54smmgqTJw
z={lDFC<cPmYohD3p5!Dis66m+E4V2-n#Qn`mj*`>@pt@?a4j%AhDJkB@V>twScJNp
z$p<=N5x)(hxw}Cq=okk9{#hJx2M3eO`w*^aAz-~OK8QUJx@aQ%i5a&b6cmRj;qP(q
zL&yA_`5~IzQ7ZoIRul??$^agO+eZv*rT{!__@YYAxDE`UGVk3yP)5Sdw<(*x;Q<3t
z!EFAse4OKV`{qCOjsO878UUxSD|V0z5`fhmM+wnJy_GPavknWQU*JT)ItzE10FEF$
z2j+1Av!4TVTMi%ZCXN7$1MjMpJIIP0uy}@qsI@Fm8~_{_{)hq{6D=e_5Mz^`N%`oT
zfYI`TveIrFdI9dwe=)}KQC&SmlL7*<>cx2dP9Q+R0)Vjw*Yco8V5E@rWln$rZKAI{
zC%^}Qgt!8rvy2<^{4@8o!R-B^sVeNhutJE6K>!3F2Ij?77y@5^jN-wZ8L?^)0zvkD
zR&R%|0Jke#f(TK57^tYP*IR}l^gZJDF8>e+eq4-0kN?vd#M2FYod52FX%!J8iVOX{
zkbo%yJp2?D;_1=%q=T9I);5$N_EskLyV<wFeVfs;x%Ff^XNaRd0&9DIjQl%}6%(=t
z2~e*D&b;k^EVhM?CtfIjn(J0#VE1p}RtDW=`7D|^@FOyl_GIV6%DGum1=NIZG=H1N
ztg?t9mCgTbqp2hZ>!0{Bm6F~1o^esX#Qg=}=8QR#qZ0ZH6-fHEEI404F|J0=@7q7r
z`im>2#qjgb)|V|x+}QSgN&m#fPa<OS*XUpAGHEii?ribzGx;;UX4yv0?jR2rRG6!O
z)&KYW|7`VB>xM@lnE|71FHo(5(*Ii7D{Jr@IsYL#THMZ6S8uEK7q7$qle7O&UCEOF
zt@Xx-_78jYO!P*3k(0lga*J|s)Brg%T8@0={`aN%OR729@{cw1E4Tmu3dk!-$<Z`@
zlL!utocuf?ZocN6*UTBxsso%7yHfYQ)t>*On0V~_>iIS8BH%i-2V`Mk6eeE|{znS_
zG~54+*d_eEOd-erD`|+y-{Z9VuUg+0a0arMohkwrWf%5`XV$N6=GJpTh+WJSx(Jxa
z{V3o6v2+Z9ie@gSf(yS^V7y)PtM#|B7~!A%v65+u$%uZ$k39Z~e64B)M(NidJ;GJM
z;f8-Yj0Udu{m@vkg^&56MU{VS0iLzIL&R^})W7NN2732_9^4F^WdF0XPPz4=bP`yp
zios%ae^*gJn*a%_ORMi#&RV==6Zg+`)2?)KL1c;o8tn%b3BI!M_mX<))8Xiwz*$w*
z%tl|ZUHz2k$SLn-%mfE*y!Y}2sUIm+#8?oC;q1ruKzRCtEY;eXjf$KShCjX_qWxo#
zsx_cF;(KBtaK|#!>wB$1j{7WQUU8xZy$|48X<ZMBxcr9zE{7j}iR=ZETR3o#U<cxI
zwxAU**{@wof~o;Eb;7L=nXZ4kj0=FjfM)jP;$_rf-~|?<?qc$<^xH||p#u*aheJOd
zcH91Aw~9MIjFaT#*};ux7ew4RXBa4WizpVlbMWI-`OHT3c<z<0KOO@e+`5Qpa?VOC
z5NLmxr<2$pIKe0YOwKokbaBuf^N%wd8^DXeH^Vdx^iE|Fng84HBFFGJ#}J=?w3H)&
z^uCXQDglBU!#LMB-*;pr^@ipml+U3kAF%DpSuK?S#0*FUgfBjTJp*iM>l+A8oMX(T
zbvn!=V5AHT@Tv|3#Y@AuTvK3k@8uNcIcGs_0c7}dRQOmV@CE>mYo$||d1em^ocf{&
z4TQKzfSIjSfunMmw!ERU2yxDYkQrkh)xdGEgGH(%=@TIPeZGEi0c<TQ-1QsC(CGT;
z1$79bGe33<@7%didofhu7}T(35ebM#*xZMD*QLdPie{<@K?deCZkPWYcaKr9gIc#O
zBF}(=fMcbh2}=foS~ZgwAm*X!bg%O6jxOWXY+vdwNQh{W{bs5+qhHlNvKQrKJUou7
zAWDC}ce2OsWh@!+8UX)hl_h;8B1+Ec5oC6J9z_N|E2w(Vg9Ca1BrK`0ru~-fyt|;7
zD$}b6qy7pT{GetvNeMgzK$2-Q!%b}*IIi$%>Mo==4yj8UnlpN-iXGa+H;(G--k&8M
zz4sN`m$rxFOG;kaQ{lx_uVMo@*&e=={2+!%GW0>?ax11V>Ji-dcEv3^=0#e3Fa0GU
zyLW;l*anT|VSvY*CkZ{}Q<#YfLCqtIXXmqD@qUCRg-FrK-1wTiGCGF<mb^^oc~svZ
zH)MKOStoMhHoxK#)A3`b7q_Z&J0JQqp6v;?YIBoK39x$wE{ksrfxC+(&`@qg&2OeI
z4)g9Y&UhM61A$>>W{}X};&;zu3zvr=i7jqslu)ndM+N~j!Uzm9seI2i--Y)r?SJ@p
zrt$~hQPM#?d^W)QW7T?}9+B4W#|#{@^0N?IxgH*9z39P{Z;v{YdD2vbMBAaDP_vZ}
zCH^oU@S}-Oo8-sW&~N90J>9}=m2bA+=87jWa8v~@rk2}84A8&haO+fg0`9B|DutIN
z!;)bicZnb{rIG~e);184hIitmCiRR^p&O^(d7ocft>A!i%yd5~OrnV?Y&>$8b7dAg
z(WSoqL3q=)j3}Yl(dlBjjdBgdu4`+0*MU>mc8{{M9G9nak^Mb<jYUhAB}_9jy2Y_I
zwx&o&7(qHgNGx*S2$v682JN5e1F9))v%;oCX0x-Ai7wVxS_iRCEOrY?*j#VNE#S1j
zW+Y(_0Z#(Q__X)xnG4F+T}xOAqU?q)U*%Hb79~evp2~Z8tOwK5wLXMzT8GcrI1Ij0
zfur##Y<10?iTENMjE{MEF;pIC^w@_8P^#o~v9B7-*2w8FwauKwGcTq`>=%%w@sFco
zUK#TVId|Lc5|KfF$(^84{NN{v?^RL`ZTbo{h<9(`WPp=_zL3?q9zrTWY4U_ay8x+9
zM?w8{g=(LRE_Ogh2T4$WdF=T8HgT$P7+aO@TPLH#B$;{Q>*`I*VuJCm5A#AL(AfEI
zN+^84U4^P2#y(EB+Eam>s(i^`N`K-Wca3<yAx|AlYaK~J%f7D1v;vq}->(c6>%q)>
zZW<(%xOJE9B>nzZb_snk=gDZ%h{Il;FMZ9O<B?up%^&mz6)Kz4$>8U7ZecyRp|q@=
z#>%%gF&%p_PR318VQ=Kl(ZG+H=}Tv)Yu_aA3S3J1eblEqU1vHou=cDq(P6cWZlAYq
zaEEf>Y$dMl+C9`YbCbs%z9Y&01KW~)YA2G9PTx7)KKHqtu<ZE8F35-_<0vFM<+NG~
z_%{{cWw(2EF5boAaLd0pn5r$#oP69q6W;a$Q|PT`uiYV#;-LHx(}OX}Wa@XFIJ(f1
z9I!N*T;kU0KkL73HXA;re5x?+0x?BSIn>ak2UGBu-zdhy_v`qJ5?P(DYv3@}?e=i^
z)>S3)@~POs!>3MV>>B}(A9J9jP!Z@b-R53sxpqVJHoSmKqn`Ke^*YF1ZlYqMbJct>
zK5xk3R@xjCdEI}XcWZ0M%r&**ZobogU#gETwT$@<?(9_8()zk&)j8i(Qsr+=OSL&g
zXZ5TVFlnf6v@=Ga7ukxigYT2`@nvtL)X(Wray#BwjS~`|mq9l^ehN8ma(8#ns&I{I
z@1z7@$T1s+`+bW`<FAPy<A0iTvj<~g7^~mYCNvllvFy1eZI*tUvEgaQXR7gKl|!|I
zDRWTM4Tlu(j>pMr)?WuIRok>IG8nenosg;V<*ZDbUF*vhq}Z%SWYOlO&n?~Y%Rchj
zlh+){hg5`Qwyxb$W*j?cY2u%Bf+fY?Q6_e!a!|B<GH~+Ca8H9+LsZFJZ%oI@?jVin
z`2*)R*#>v~X=m&Qwel>>mQ{|X<+-@m$ST_u8<qE;m5e*Td23?R$IkAFv9m90ES^wa
z+^E2*7{pfg7LlygZpYL&sA-)X4}$X@YN|bNE2s9lbj(65X_%>}Yad{H+bp%$9zZyN
z#d}i2Dv0YGgw{F=k=QX<yfg(Je$`{{>Cvb;h$Rmrg9S1Xat1x|=Uff^pff~i_Q7DI
z;&<Yf{R5{H-*p+i9GfaCcIAH!SXU5~{ql#fyi%ct^;uQb*sr6f-ZWz3zy<xyddjOt
zyF~mIpKyY75QJ)yr+nPE5W6Ww06c2#d&E^Gv~#cD!XDB>{qM1XGeKg-T_GnP6b^hD
z^KE`2l{n$3JyEreRIoHZa@xCn#AbG>Ke_#E^O4O9pF?+jtqaweN_lKu;MU#A`s!1M
zkuiU0z5n|4pq}*sk9)j3F=4UF@aRJP!qWK6iPI(SUmOWqpV@zSb@&Wo&U`I4l=A7r
zJZ|%-ei6I;_1Wyxv1ZOci$e{`OH+Zb$0wO$y0?|nD_>d!7{0Rqi0X6GX(j|r^jxnc
zFE6h3Y8$VP+O;&-JUDN;;zP=R>g}$AF9Wxh71LsD=Id`R^}N`%G+tXf4IEWV-0XHc
z?RLR(*Yd8vBIY0urJl9XIFjGz*;6HpGYbPtg|nT3%WF6Lb@K*xUpej9OM0`I!&GC*
z&~R1{khVAdItZt4mQrD8qV%*!<e_)X;gb1xoAtkvhibqzZRMucanH&J`9!X*=`T!J
z@J0e0_@bi%rv5A$XQ@3Mj#?Mc^mMjkq2>3nr?ZP{9p1esWCNt8Ou}HFU>pq;506iI
z%{GtcYm*oMavV$Q9V}j&ez;tCX7J4)3q4{bbDfXd&$TK%``W)b&^|I5V=YgSE_s(}
zIBJKoctw;ZtxkH@J=<_}xm+!&U@&QUq4nLeeYS;bF&xm}R@i+eqB4^-<~<0gUn(U8
zd>*^G><4O&|5VvU-m$hRN7OALSz_(EjZAw>9j=j@(*YlPH~YS=wORgLUNSjtl{C9C
zO5022p<jPQ;7HNPlHc{^`;~5)+5vI(pBIzAu3vN#uYY*7c&^QM;r?m=k+CG-kC}mm
zU@8Ka-Wrk?AI6x^_bKf18M%9O@nfg|P)g_npM}=WrJF*F$y|xH(?U7s6OS}sm+}t4
zd|SyhQlTw<{KCkRedBUVWdumfP?^QPp314(U5n21qbj#&>E0>cI@@_!4tGUp5w4w>
zN1o*kd!y*&<>T4n&vyPc+%9?~<5D=DTHc7sxKhcZ7!;0oH2_bwkDO5YmLWzaw%EvZ
zS}T9{vJDp~xHhYWh+0%28^Q#9kAFnvR_LxeV0gKXw;PpP6}0Mr>E$|EAigeJrK)$i
z4n5`r-Opj8Oa<39K5xVfUDW4yN)k^wP(5U1><ukuy+<7pSl1`7iF8=bA*a5~oJ|em
zU-?tsELA@)VpbD+aC|q`LdHP6Iv3OBDQbWSg$XptX+lkoSFsis#Jd&WqQHZ&JUgVq
zsI#~kr4m^w#K3N;$2IUH!xj{jysSZstR^&YY&Tb2smtYig7TnrK$AHIXe<yd_^upG
z#V`Uy=?EHs{fnfSgf2#!#H#|An(<tZsd%}MwFWwyrHDCjXD~B7a~1rQ+yq^5c6PD7
zgQ}C_Rfi4VBqStymM2Hlfos$%J|(_%Q#0t>2f6-rR~TX0u92px%4spyH={hzWd!{X
DM9lYk

diff --git a/src/HYDRO_tests/test_HYDROData_LandCoverMap.cxx b/src/HYDRO_tests/test_HYDROData_LandCoverMap.cxx
index d4cbc6ee..96d67057 100644
--- a/src/HYDRO_tests/test_HYDROData_LandCoverMap.cxx
+++ b/src/HYDRO_tests/test_HYDROData_LandCoverMap.cxx
@@ -61,11 +61,11 @@ void test_HYDROData_LandCoverMap::test_add_2_objects()
 
   CPPUNIT_ASSERT_EQUAL( KIND_LAND_COVER_MAP, aMap->GetKind() );
 
-  TopoDS_Face aLC1 = Face( QList<double>() << 10 << 10 << 50 << 20 << 30 << 50 << 15 << 30 );
+  TopoDS_Face aLC1 = Face2d( QList<double>() << 10 << 10 << 50 << 20 << 30 << 50 << 15 << 30 );
   //DEBTRACE("--- ajout test1 " << aLC1);
   CPPUNIT_ASSERT_EQUAL( true, aMap->LocalPartition( aLC1, "test1" ) );
 
-  TopoDS_Face aLC2 = Face( QList<double>() << 30 << 20 << 60 << 10 << 70 << 35 << 40 << 40 );
+  TopoDS_Face aLC2 = Face2d( QList<double>() << 30 << 20 << 60 << 10 << 70 << 35 << 40 << 40 );
   //DEBTRACE("--- ajout test2 " << aLC2);
   CPPUNIT_ASSERT_EQUAL( true, aMap->LocalPartition( aLC2, "test2" ) );
 
@@ -107,12 +107,12 @@ void test_HYDROData_LandCoverMap::test_split()
 
   CPPUNIT_ASSERT_EQUAL( KIND_LAND_COVER_MAP, aMap->GetKind() );
 
-  TopoDS_Face aLC = Face( QList<double>() << 10 << 10 << 50 << 20 << 30 << 50 << 15 << 30 );
+  TopoDS_Face aLC = Face2d( QList<double>() << 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 = Wire( QList<double>() << 10 << 40 << 30 << 10 << 40 << 10 << 60 << 10, false );
+  TopoDS_Wire aWire = Wire2d( QList<double>() << 10 << 40 << 30 << 10 << 40 << 10 << 60 << 10, false );
   aPolyline->SetShape( aWire );
 
   CPPUNIT_ASSERT_EQUAL( true, aMap->Split( aPolyline ) );
@@ -142,12 +142,12 @@ void test_HYDROData_LandCoverMap::test_incomplete_split()
 
   CPPUNIT_ASSERT_EQUAL( KIND_LAND_COVER_MAP, aMap->GetKind() );
 
-  TopoDS_Face aLC = Face( QList<double>() << 10 << 10 << 50 << 20 << 30 << 50 << 15 << 30 );
+  TopoDS_Face aLC = Face2d( QList<double>() << 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 = Wire( QList<double>() << 10 << 40 << 30 << 10 << 40 << 10, false );
+  TopoDS_Wire aWire = Wire2d( QList<double>() << 10 << 40 << 30 << 10 << 40 << 10, false );
   aPolyline->SetShape( aWire );
 
   CPPUNIT_ASSERT_EQUAL( false, aMap->Split( aPolyline ) );
@@ -174,17 +174,17 @@ void test_HYDROData_LandCoverMap::test_merge()
 
   CPPUNIT_ASSERT_EQUAL( KIND_LAND_COVER_MAP, aMap->GetKind() );
 
-  TopoDS_Face aLC1 = Face( QList<double>() << 12 << 19 << 82 << 9 << 126 << 53 << 107 << 80 << 29 << 75 );
+  TopoDS_Face aLC1 = Face2d( QList<double>() << 12 << 19 << 82 << 9 << 126 << 53 << 107 << 80 << 29 << 75 );
 
   CPPUNIT_ASSERT_EQUAL( true, aMap->LocalPartition( aLC1, "test1" ) );
 
-  TopoDS_Face aLC2 = Face( QList<double>() << 21 << 34 << 24 << 25 << 37   << 37 << 40  << 61 <<
+  TopoDS_Face aLC2 = Face2d( QList<double>() << 21 << 34 << 24 << 25 << 37   << 37 << 40  << 61 <<
                                               44 << 95 << 85 << 100 << 104 << 66 << 107 << 33 <<
                                              128 << 18 << 140 << 50 << 131 << 89 << 104 << 111 <<
                                               31 << 114 );
   CPPUNIT_ASSERT_EQUAL( true, aMap->LocalPartition( aLC2, "test2" ) );
 
-  TopoDS_Face aLC3 = Face( QList<double>() << 4 << 54 << 1   << 47 << 51  << 45 <<
+  TopoDS_Face aLC3 = Face2d( QList<double>() << 4 << 54 << 1   << 47 << 51  << 45 <<
                                             127 << 42 << 145 << 43 << 148 << 60 << 90 << 65 );
   CPPUNIT_ASSERT_EQUAL( true, aMap->LocalPartition( aLC3, "test3" ) );
 
@@ -279,17 +279,17 @@ void test_HYDROData_LandCoverMap::test_remove()
 
   CPPUNIT_ASSERT_EQUAL( KIND_LAND_COVER_MAP, aMap->GetKind() );
 
-  TopoDS_Face aLC1 = Face( QList<double>() << 12 << 19 << 82 << 9 << 126 << 53 << 107 << 80 << 29 << 75 );
+  TopoDS_Face aLC1 = Face2d( QList<double>() << 12 << 19 << 82 << 9 << 126 << 53 << 107 << 80 << 29 << 75 );
 
   CPPUNIT_ASSERT_EQUAL( true, aMap->LocalPartition( aLC1, "test1" ) );
 
-  TopoDS_Face aLC2 = Face( QList<double>() << 21 << 34 << 24 << 25 << 37   << 37 << 40  << 61 <<
+  TopoDS_Face aLC2 = Face2d( QList<double>() << 21 << 34 << 24 << 25 << 37   << 37 << 40  << 61 <<
                                               44 << 95 << 85 << 100 << 104 << 66 << 107 << 33 <<
                                              128 << 18 << 140 << 50 << 131 << 89 << 104 << 111 <<
                                               31 << 114 );
   CPPUNIT_ASSERT_EQUAL( true, aMap->LocalPartition( aLC2, "test2" ) );
 
-  TopoDS_Face aLC3 = Face( QList<double>() << 4 << 54 << 1   << 47 << 51  << 45 <<
+  TopoDS_Face aLC3 = Face2d( QList<double>() << 4 << 54 << 1   << 47 << 51  << 45 <<
                                             127 << 42 << 145 << 43 << 148 << 60 << 90 << 65 );
   CPPUNIT_ASSERT_EQUAL( true, aMap->LocalPartition( aLC3, "test3" ) );
 
@@ -552,11 +552,11 @@ void test_HYDROData_LandCoverMap::test_import_dbf()
   // aST.size() == aDBFV.size()!!
   Handle(HYDROData_PolylineXY) aPolyline =
     Handle(HYDROData_PolylineXY)::DownCast( aDoc->CreateObject( KIND_POLYLINEXY ) );
-  TopoDS_Wire aWire = Wire( QList<double>() << 10 << 40 << 30 << 10 << 40 << 10 << 60 << 10 );
+  TopoDS_Wire aWire = Wire2d( QList<double>() << 10 << 40 << 30 << 10 << 40 << 10 << 60 << 10 );
   aPolyline->SetShape( aWire );
   for (int i = 0; i < 3; i++)
     aMap->Add(aPolyline, "");
-  TopoDS_Face aLC1 = Face( QList<double>() << 10 << 10 << 50 << 20 << 30 << 50 << 15 << 30 );
+  TopoDS_Face aLC1 = Face2d( QList<double>() << 10 << 10 << 50 << 20 << 30 << 50 << 15 << 30 );
   CPPUNIT_ASSERT_EQUAL( true, aMap->LocalPartition( aLC1, "test1" ) );
   
   CPPUNIT_ASSERT_EQUAL( true, aMap->Split( aPolyline ) );
@@ -581,16 +581,16 @@ void test_HYDROData_LandCoverMap::test_land_cover_prs_by_types()
   Handle(HYDROData_LandCoverMap) aMap =
     Handle(HYDROData_LandCoverMap)::DownCast( aDoc->CreateObject( KIND_LAND_COVER_MAP ) );
 
-  TopoDS_Face aLC1 = Face( QList<double>() << 12 << 19 << 82 << 9 << 126 << 53 << 107 << 80 << 29 << 75 );
+  TopoDS_Face aLC1 = Face2d( QList<double>() << 12 << 19 << 82 << 9 << 126 << 53 << 107 << 80 << 29 << 75 );
   CPPUNIT_ASSERT_EQUAL( true, aMap->LocalPartition( aLC1, QString::fromUtf8("Zones de champs cultivé à végétation basse")) );
 
-  TopoDS_Face aLC2 = Face( QList<double>() << 21 << 34 << 24 << 25 << 37   << 37 << 40  << 61 <<
+  TopoDS_Face aLC2 = Face2d( QList<double>() << 21 << 34 << 24 << 25 << 37   << 37 << 40  << 61 <<
                                               44 << 95 << 85 << 100 << 104 << 66 << 107 << 33 <<
                                              128 << 18 << 140 << 50 << 131 << 89 << 104 << 111 <<
                                               31 << 114 );
   CPPUNIT_ASSERT_EQUAL( true, aMap->LocalPartition( aLC2, QString::fromUtf8("Zones de champs cultivé à végétation haute")) );
 
-  TopoDS_Face aLC3 = Face( QList<double>() << 4 << 54 << 1   << 47 << 51  << 45 <<
+  TopoDS_Face aLC3 = Face2d( QList<double>() << 4 << 54 << 1   << 47 << 51  << 45 <<
                                             127 << 42 << 145 << 43 << 148 << 60 << 90 << 65 );
   CPPUNIT_ASSERT_EQUAL( true, aMap->LocalPartition( aLC3, QString::fromUtf8("Zones de champs, prairies, sans cultures")) );
 
@@ -617,16 +617,16 @@ void test_HYDROData_LandCoverMap::test_land_cover_prs_by_coeff()
   Handle(HYDROData_LandCoverMap) aMap =
     Handle(HYDROData_LandCoverMap)::DownCast( aDoc->CreateObject( KIND_LAND_COVER_MAP ) );
 
-  TopoDS_Face aLC1 = Face( QList<double>() << 12 << 19 << 82 << 9 << 126 << 53 << 107 << 80 << 29 << 75 );
+  TopoDS_Face aLC1 = Face2d( QList<double>() << 12 << 19 << 82 << 9 << 126 << 53 << 107 << 80 << 29 << 75 );
   CPPUNIT_ASSERT_EQUAL( true, aMap->LocalPartition( aLC1, QString::fromUtf8("Zones de champs cultivé à végétation basse")) );
 
-  TopoDS_Face aLC2 = Face( QList<double>() << 21 << 34 << 24 << 25 << 37   << 37 << 40  << 61 <<
+  TopoDS_Face aLC2 = Face2d( QList<double>() << 21 << 34 << 24 << 25 << 37   << 37 << 40  << 61 <<
                                               44 << 95 << 85 << 100 << 104 << 66 << 107 << 33 <<
                                              128 << 18 << 140 << 50 << 131 << 89 << 104 << 111 <<
                                               31 << 114 );
   CPPUNIT_ASSERT_EQUAL( true, aMap->LocalPartition( aLC2, QString::fromUtf8("Zones de champs cultivé à végétation haute")) );
 
-  TopoDS_Face aLC3 = Face( QList<double>() << 4 << 54 << 1   << 47 << 51  << 45 <<
+  TopoDS_Face aLC3 = Face2d( QList<double>() << 4 << 54 << 1   << 47 << 51  << 45 <<
                                             127 << 42 << 145 << 43 << 148 << 60 << 90 << 65 );
   CPPUNIT_ASSERT_EQUAL( true, aMap->LocalPartition( aLC3, QString::fromUtf8("Zones de champs, prairies, sans cultures")) );
 
@@ -656,17 +656,17 @@ void test_HYDROData_LandCoverMap::test_dump_python()
 
   CPPUNIT_ASSERT_EQUAL( KIND_LAND_COVER_MAP, aMap->GetKind() );
 
-  TopoDS_Face aLC1 = Face( QList<double>() << 12 << 19 << 82 << 9 << 126 << 53 << 107 << 80 << 29 << 75 );
+  TopoDS_Face aLC1 = Face2d( QList<double>() << 12 << 19 << 82 << 9 << 126 << 53 << 107 << 80 << 29 << 75 );
 
   CPPUNIT_ASSERT_EQUAL( true, aMap->LocalPartition( aLC1, "test1" ) );
 
-  TopoDS_Face aLC2 = Face( QList<double>() << 21 << 34 << 24 << 25 << 37   << 37 << 40  << 61 <<
+  TopoDS_Face aLC2 = Face2d( QList<double>() << 21 << 34 << 24 << 25 << 37   << 37 << 40  << 61 <<
                                               44 << 95 << 85 << 100 << 104 << 66 << 107 << 33 <<
                                              128 << 18 << 140 << 50 << 131 << 89 << 104 << 111 <<
                                               31 << 114 );
   CPPUNIT_ASSERT_EQUAL( true, aMap->LocalPartition( aLC2, "test2" ) );
 
-  TopoDS_Face aLC3 = Face( QList<double>() << 4 << 54 << 1   << 47 << 51  << 45 <<
+  TopoDS_Face aLC3 = Face2d( QList<double>() << 4 << 54 << 1   << 47 << 51  << 45 <<
                                             127 << 42 << 145 << 43 << 148 << 60 << 90 << 65 );
   CPPUNIT_ASSERT_EQUAL( true, aMap->LocalPartition( aLC3, "test3" ) );
 
@@ -706,8 +706,8 @@ void test_HYDROData_LandCoverMap::test_transparent_prs()
 
   Handle(HYDROData_LandCoverMap) aMap =
     Handle(HYDROData_LandCoverMap)::DownCast( aDoc->CreateObject( KIND_LAND_COVER_MAP ) );
-  aMap->LocalPartition( Face( QList<double>() << 1 << 1 << 10 << 10 << 10 << 20 ), QString::fromUtf8("Zones de champs cultivé à végétation haute"));
-  aMap->LocalPartition( Face( QList<double>() << 5 << 5 << 10 << 5 << 10 << 8 << 5 << 12 << 5 << 8 ), QString::fromUtf8("Zones de champs cultivé à végétation haute"));
+  aMap->LocalPartition( Face2d( QList<double>() << 1 << 1 << 10 << 10 << 10 << 20 ), QString::fromUtf8("Zones de champs cultivé à végétation haute"));
+  aMap->LocalPartition( Face2d( QList<double>() << 5 << 5 << 10 << 5 << 10 << 8 << 5 << 12 << 5 << 8 ), QString::fromUtf8("Zones de champs cultivé à végétation haute"));
   aMap->SetName( "test_LCM" );
 
   TestViewer::show( aZone->GetTopShape(), AIS_Shaded, true, "LandCoverMap_TransparentPrs" );
@@ -1085,16 +1085,16 @@ void test_HYDROData_LandCoverMap::test_export_telemac()
   Handle(HYDROData_LandCoverMap) aMap =
     Handle(HYDROData_LandCoverMap)::DownCast( aDoc->CreateObject( KIND_LAND_COVER_MAP ) );
 
-  TopoDS_Face aLC1 = Face( QList<double>() << 12 << 19 << 82 << 9 << 126 << 53 << 107 << 80 << 29 << 75 );
+  TopoDS_Face aLC1 = Face2d( QList<double>() << 12 << 19 << 82 << 9 << 126 << 53 << 107 << 80 << 29 << 75 );
   CPPUNIT_ASSERT_EQUAL( true, aMap->LocalPartition( aLC1, QString::fromUtf8("Forêt et végétation arbustive en mutation")) );
 
-  TopoDS_Face aLC2 = Face( QList<double>() << 21 << 34 << 24 << 25 << 37   << 37 << 40  << 61 <<
+  TopoDS_Face aLC2 = Face2d( QList<double>() << 21 << 34 << 24 << 25 << 37   << 37 << 40  << 61 <<
                                               44 << 95 << 85 << 100 << 104 << 66 << 107 << 33 <<
                                              128 << 18 << 140 << 50 << 131 << 89 << 104 << 111 <<
                                               31 << 114 );
   CPPUNIT_ASSERT_EQUAL( true, aMap->LocalPartition( aLC2, QString::fromUtf8("Forêts de conifères")) );
 
-  TopoDS_Face aLC3 = Face( QList<double>() << 4 << 54 << 1   << 47 << 51  << 45 <<
+  TopoDS_Face aLC3 = Face2d( QList<double>() << 4 << 54 << 1   << 47 << 51  << 45 <<
                                             127 << 42 << 145 << 43 << 148 << 60 << 90 << 65 );
   CPPUNIT_ASSERT_EQUAL( true, aMap->LocalPartition( aLC3, QString::fromUtf8("Forêts de feuillus")) );
 
@@ -1115,10 +1115,10 @@ void test_HYDROData_LandCoverMap::test_copy()
     Handle(HYDROData_LandCoverMap)::DownCast( aDoc->CreateObject( KIND_LAND_COVER_MAP ) );
   aMap->SetName( "map_1" );
 
-  TopoDS_Face aLC1 = Face( QList<double>() << 10 << 10 << 30 << 10 << 20 << 20 );
+  TopoDS_Face aLC1 = Face2d( QList<double>() << 10 << 10 << 30 << 10 << 20 << 20 );
   CPPUNIT_ASSERT_EQUAL( true, aMap->LocalPartition( aLC1, QString::fromUtf8("Forêts de conifères")) );
 
-  TopoDS_Face aLC2 = Face( QList<double>() << 110 << 10 << 130 << 10 << 120 << 20 );
+  TopoDS_Face aLC2 = Face2d( QList<double>() << 110 << 10 << 130 << 10 << 120 << 20 );
   CPPUNIT_ASSERT_EQUAL( true, aMap->LocalPartition( aLC2, QString::fromUtf8("Forêts de feuillus")) );
 
   Handle(HYDROData_LandCoverMap) aMap2 =
diff --git a/src/HYDRO_tests/test_HYDROData_PolylineXY.cxx b/src/HYDRO_tests/test_HYDROData_PolylineXY.cxx
index 1ec755ff..57d6435f 100644
--- a/src/HYDRO_tests/test_HYDROData_PolylineXY.cxx
+++ b/src/HYDRO_tests/test_HYDROData_PolylineXY.cxx
@@ -102,7 +102,7 @@ void test_HYDROData_PolylineXY::test_split_refs_624()
   aPolyline->SetName( "test" );
 
   QList<double> aCoords = QList<double>() << 10 << 10 << 20 << 10 << 20 << 20 << 10 << 20;
-  TopoDS_Wire aWire = Wire( aCoords, true );
+  TopoDS_Wire aWire = Wire2d( aCoords, true );
   aPolyline->SetShape( aWire );
 
   gp_Pnt2d aPnt( 20, 20 );
@@ -135,7 +135,7 @@ void test_HYDROData_PolylineXY::test_extraction_immersible_zone()
   aPolyline->SetName( "test" );
 
   QList<double> aCoords = QList<double>() << 10 << 10 << 20 << 10 << 20 << 20 << 10 << 20;
-  TopoDS_Wire aWire = Wire( aCoords, true );
+  TopoDS_Wire aWire = Wire2d( aCoords, true );
   aPolyline->SetShape( aWire );
 
   Handle(HYDROData_ImmersibleZone) aZone = 
@@ -175,7 +175,7 @@ void test_HYDROData_PolylineXY::test_extraction_channel_refs_611()
   aPolyline3d->SetPolylineXY( aPolyline2d );
 
   QList<double> aCoords = QList<double>() << 10 << 10 << 20 << 10 << 20 << 20 << 10 << 20;
-  TopoDS_Wire aWire = Wire( aCoords, false );
+  TopoDS_Wire aWire = Wire2d( aCoords, false );
   aPolyline2d->SetShape( aWire );
   aPolyline3d->SetTopShape( aWire );
   aPolyline3d->SetShape3D( aWire );
@@ -184,8 +184,8 @@ void test_HYDROData_PolylineXY::test_extraction_channel_refs_611()
     Handle(HYDROData_Profile)::DownCast( aDoc->CreateObject( KIND_PROFILE ) );
   aProfile->SetName( "profile_1" );
 
-  QList<double> aCoordsPr = QList<double>() << 0.0 << 0.1 << 0.5 << 0.0 << 1.0 << 0.1;
-  TopoDS_Wire aWirePr = Wire( aCoordsPr, false );
+  QList<double> aCoordsPr = QList<double>() << 0.0 << 0.1 << 0.0 << 0.0 << 1.0 << 0.0;
+  TopoDS_Wire aWirePr = Wire3d( aCoordsPr, false );
   aProfile->SetTopShape( aWirePr );
   aProfile->SetShape3D( aWirePr );
 
@@ -273,7 +273,7 @@ void test_HYDROData_PolylineXY::test_split_refs_627()
   aPolyline->SetName( "test" );
 
   QList<double> aCoords = QList<double>() << 10 << 10 << 20 << 10 << 20 << 20 << 10 << 20;
-  TopoDS_Wire aWire = Wire( aCoords, false );
+  TopoDS_Wire aWire = Wire2d( aCoords, false );
   aPolyline->SetShape( aWire );
   aPolyline->SetWireColor( Qt::red );
 
@@ -338,7 +338,7 @@ void test_HYDROData_PolylineXY::test_custom_polylines()
   CPPUNIT_ASSERT_EQUAL( false, aPolyline1->IsCustom() );
 
   CPPUNIT_ASSERT_EQUAL( false, aPolyline2->IsCustom() );
-  aPolyline2->SetShape( Wire( QList<double>() << 0 << 0 << 10 << 10 << 20 << 0 ) );
+  aPolyline2->SetShape( Wire2d( QList<double>() << 0 << 0 << 10 << 10 << 20 << 0 ) );
   CPPUNIT_ASSERT_EQUAL( true, aPolyline2->IsCustom() );
   HYDROData_PolylineXY::PointsList aPointsList = aPolyline2->GetPoints( 0 );
 
diff --git a/src/HYDRO_tests/test_HYDROGUI_Shape.cxx b/src/HYDRO_tests/test_HYDROGUI_Shape.cxx
index e99db415..2d696144 100644
--- a/src/HYDRO_tests/test_HYDROGUI_Shape.cxx
+++ b/src/HYDRO_tests/test_HYDROGUI_Shape.cxx
@@ -26,7 +26,7 @@
 
 void test_HYDROGUI_Shape::test_face_in_preview()
 {
-  TopoDS_Face aFace = Face( QList<double>() << 21 << 34 << 24 << 25 << 37   << 37 << 40  << 61 <<
+  TopoDS_Face aFace = Face2d( QList<double>() << 21 << 34 << 24 << 25 << 37   << 37 << 40  << 61 <<
                                               44 << 95 << 85 << 100 << 104 << 66 << 107 << 33 <<
                                              128 << 18 << 140 << 50 << 131 << 89 << 104 << 111 <<
                                               31 << 114 );
-- 
2.39.2