Salome HOME
Merge branch 'BR_HYDRO_IMPS_2016' into pre/IMPS_2016
[modules/hydro.git] / src / HYDRO_tests / test_HYDROData_DTM.cxx
index d1189c74dbe9c894cdabf18ac23df92d84c3be3b..3a84e0bc8f86ad9f8e83cc288ad24c15f38dcea1 100644 (file)
 
 #include <test_HYDROData_DTM.h>
 #include <HYDROData_Document.h>
-#include <HYDROData_DTM.h>
 #include <HYDROData_Profile.h>
+#include <HYDROData_DTM.h>
+#include <HYDROData_Iterator.h>
 #include <Geom2d_Curve.hxx>
 #include <Geom2d_BSplineCurve.hxx>
 #include <gp_XY.hxx>
 #include <gp_Pnt2d.hxx>
 #include <TColgp_Array1OfPnt2d.hxx>
+#include <TestViewer.h>
+#include <AIS_InteractiveContext.hxx>
+#include <AIS_PointCloud.hxx>
+#include <HYDROGUI_ShapeBathymetry.h>
+#include <Aspect_ColorScale.hxx>
+#include <QGraphicsItem>
+#include <QGraphicsScene>
+#include <QGraphicsView>
+#include <QPixmap>
+#include <QApplication>
 
 const double EPS = 1E-3;
 
+extern QString REF_DATA_PATH;
+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();
+  points.Append( gp_XY( 0.0, 5.0 ) );
+  points.Append( gp_XY( 1.0, 1.0 ) );
+  points.Append( gp_XY( 1.5, 0.0 ) );
+  points.Append( gp_XY( 4.0, 4.0 ) );
+}
+
 void test_HYDROData_DTM::test_creation()
 {
   Handle(HYDROData_Document) aDoc = HYDROData_Document::Document(1);
@@ -40,7 +166,7 @@ void test_HYDROData_DTM::test_creation()
   aDoc->Close();
 }
 
-void test_HYDROData_DTM::test_profile_conversion_to_2d()
+void test_HYDROData_DTM::test_hydraulic_axis()
 {
   Handle(HYDROData_Document) aDoc = HYDROData_Document::Document(1);
 
@@ -50,11 +176,58 @@ void test_HYDROData_DTM::test_profile_conversion_to_2d()
   Handle(HYDROData_Profile) aProfile2 = 
     Handle(HYDROData_Profile)::DownCast( aDoc->CreateObject( KIND_PROFILE ) );
 
-  NCollection_Sequence<HYDROData_IPolyline::Point> points;
-  points.Append( gp_XY( 0.0, 5.0 ) );
-  points.Append( gp_XY( 1.0, 1.0 ) );
-  points.Append( gp_XY( 1.5, 0.0 ) );
-  points.Append( gp_XY( 4.0, 4.0 ) );
+  Handle(HYDROData_Profile) aProfile3 = 
+    Handle(HYDROData_Profile)::DownCast( aDoc->CreateObject( KIND_PROFILE ) );
+
+  aProfile1->SetParametricPoints( points );
+  aProfile1->GetProfileUZ()->SetSectionType( 0, HYDROData_IPolyline::SECTION_POLYLINE );
+  aProfile1->SetLeftPoint( gp_XY( 10, 10 ) );
+  aProfile1->SetRightPoint( gp_XY( 20, 0 ) );
+
+  aProfile2->SetParametricPoints( points );
+  aProfile2->GetProfileUZ()->SetSectionType( 0, HYDROData_IPolyline::SECTION_POLYLINE );
+  aProfile2->SetLeftPoint( gp_XY( 50, 0 ) );
+  aProfile2->SetRightPoint( gp_XY( 60, 10 ) );
+
+  aProfile3->SetParametricPoints( points );
+  aProfile3->GetProfileUZ()->SetSectionType( 0, HYDROData_IPolyline::SECTION_POLYLINE );
+  aProfile3->SetLeftPoint( gp_XY( 200, 50 ) );
+  aProfile3->SetRightPoint( gp_XY( 210, 40 ) );
+
+  std::vector<double> distances;
+  std::vector<Handle(HYDROData_Profile)> profiles;
+  profiles.push_back( aProfile1 );
+  profiles.push_back( aProfile2 );
+  profiles.push_back( aProfile3 );
+
+  Handle_Geom2d_BSplineCurve HA = HYDROData_DTM::CreateHydraulicAxis( profiles, distances );
+  CPPUNIT_ASSERT_EQUAL( false, (bool)HA.IsNull() );
+  CPPUNIT_ASSERT_EQUAL( 3, (int)distances.size() );
+
+  CPPUNIT_ASSERT_DOUBLES_EQUAL(   0.0,   distances[0], EPS );
+  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();
+}
+
+void test_HYDROData_DTM::test_profile_conversion_to_2d()
+{
+  Handle(HYDROData_Document) aDoc = HYDROData_Document::Document(1);
+
+  Handle(HYDROData_Profile) aProfile1 = 
+    Handle(HYDROData_Profile)::DownCast( aDoc->CreateObject( KIND_PROFILE ) );
+
+  Handle(HYDROData_Profile) aProfile2 = 
+    Handle(HYDROData_Profile)::DownCast( aDoc->CreateObject( KIND_PROFILE ) );
 
   aProfile1->SetParametricPoints( points );
   aProfile1->GetProfileUZ()->SetSectionType( 0, HYDROData_IPolyline::SECTION_POLYLINE );
@@ -66,11 +239,18 @@ void test_HYDROData_DTM::test_profile_conversion_to_2d()
   aProfile2->SetLeftPoint( gp_XY( 10, 10 ) );
   aProfile2->SetRightPoint( gp_XY( 20, 20 ) );
 
-  std::vector<Handle_Geom2d_Curve> curves1 = HYDROData_DTM::ProfileToParametric( aProfile1 );
-  std::vector<Handle_Geom2d_Curve> curves2 = HYDROData_DTM::ProfileToParametric( aProfile2 );
+  double aUMin1 = std::numeric_limits<double>::max(),
+         aUMax1 = -aUMin1,
+         aUMin2 = aUMin1,
+         aUMax2 = aUMax1;
+  gp_Vec2d aProfileDir;
+  std::vector<Handle_Geom2d_Curve> curves1 = HYDROData_DTM::ProfileToParametric( aProfile1, aUMin1, aUMax1, aProfileDir );
+  std::vector<Handle_Geom2d_Curve> curves2 = HYDROData_DTM::ProfileToParametric( aProfile2, aUMin2, aUMax2, aProfileDir );
 
   gp_Pnt2d aFirst, aLast;
   CPPUNIT_ASSERT_EQUAL( 3, (int)curves1.size() );
+  CPPUNIT_ASSERT_DOUBLES_EQUAL( -5.303, aUMin1, EPS );
+  CPPUNIT_ASSERT_DOUBLES_EQUAL(  8.839, aUMax1, EPS );
   curves1[0]->D0( curves1[0]->FirstParameter(), aFirst );
   curves1[0]->D0( curves1[0]->LastParameter(), aLast );
   CPPUNIT_ASSERT_DOUBLES_EQUAL( -5.303, aFirst.X(), EPS );
@@ -91,6 +271,8 @@ void test_HYDROData_DTM::test_profile_conversion_to_2d()
   CPPUNIT_ASSERT_DOUBLES_EQUAL(  4.0,   aLast.Y(),  EPS );
 
   CPPUNIT_ASSERT_EQUAL( 1, (int)curves2.size() );
+  CPPUNIT_ASSERT_DOUBLES_EQUAL( -5.303, aUMin2, EPS );
+  CPPUNIT_ASSERT_DOUBLES_EQUAL(  8.839, aUMax2, EPS );
   Handle(Geom2d_BSplineCurve) aBSpline = Handle(Geom2d_BSplineCurve)::DownCast( curves2[0] );
   CPPUNIT_ASSERT_EQUAL( false, (bool)aBSpline.IsNull() );
   const TColgp_Array1OfPnt2d& poles = aBSpline->Poles();
@@ -107,3 +289,333 @@ void test_HYDROData_DTM::test_profile_conversion_to_2d()
 
   aDoc->Close();
 }
+
+void test_HYDROData_DTM::test_profile_properties()
+{
+  Handle(HYDROData_Document) aDoc = HYDROData_Document::Document(1);
+
+  Handle(HYDROData_Profile) aProfile = 
+    Handle(HYDROData_Profile)::DownCast( aDoc->CreateObject( KIND_PROFILE ) );
+
+  aProfile->SetParametricPoints( points );
+  aProfile->GetProfileUZ()->SetSectionType( 0, HYDROData_IPolyline::SECTION_POLYLINE );
+  aProfile->SetLeftPoint( gp_XY( 10, 10 ) );
+  aProfile->SetRightPoint( gp_XY( 20, 25 ) );
+
+  gp_Pnt lp;
+  gp_Vec2d dd;
+  double zmin, zmax;
+  HYDROData_DTM::GetProperties( aProfile, lp, dd, false, zmin, zmax );
+  CPPUNIT_ASSERT_DOUBLES_EQUAL( 13.75, lp.X(), EPS );
+  CPPUNIT_ASSERT_DOUBLES_EQUAL( 15.625, lp.Y(), EPS );
+  CPPUNIT_ASSERT_DOUBLES_EQUAL( 0, lp.Z(), EPS );
+  CPPUNIT_ASSERT_DOUBLES_EQUAL( 10, dd.X(), EPS );
+  CPPUNIT_ASSERT_DOUBLES_EQUAL( 15, dd.Y(), EPS );
+  CPPUNIT_ASSERT_DOUBLES_EQUAL( 0.0, zmin, EPS );
+  CPPUNIT_ASSERT_DOUBLES_EQUAL( 5.0, zmax, EPS );
+
+  HYDROData_DTM::GetProperties( aProfile, lp, dd, true, zmin, zmax );
+  CPPUNIT_ASSERT_DOUBLES_EQUAL( 13.75, lp.X(), EPS );
+  CPPUNIT_ASSERT_DOUBLES_EQUAL( 15.625, lp.Y(), EPS );
+  CPPUNIT_ASSERT_DOUBLES_EQUAL( 0, lp.Z(), EPS );
+  CPPUNIT_ASSERT_DOUBLES_EQUAL( -15, dd.X(), EPS );
+  CPPUNIT_ASSERT_DOUBLES_EQUAL( 10, dd.Y(), EPS );
+  CPPUNIT_ASSERT_DOUBLES_EQUAL( 0.0, zmin, EPS );
+  CPPUNIT_ASSERT_DOUBLES_EQUAL( 5.0, zmax, EPS );
+
+  aDoc->Close();
+}
+
+void test_HYDROData_DTM::test_profile_discretization_polyline()
+{
+  Handle(HYDROData_Document) aDoc = HYDROData_Document::Document(1);
+
+  Handle(HYDROData_Profile) aProfile = 
+    Handle(HYDROData_Profile)::DownCast( aDoc->CreateObject( KIND_PROFILE ) );
+
+  aProfile->SetParametricPoints( points );
+  aProfile->GetProfileUZ()->SetSectionType( 0, HYDROData_IPolyline::SECTION_POLYLINE );
+  aProfile->SetLeftPoint( gp_XY( 10, 10 ) );
+  aProfile->SetRightPoint( gp_XY( 20, 20 ) );
+
+  HYDROData_DTM::CurveUZ aMid( 0.0, gp_Vec2d(), 0 ), aWid( 0.0, gp_Vec2d(), 0 );
+  int dummy = 0;
+  HYDROData_DTM::ProfileDiscretization( aProfile, 0.0, 0.0, 5.0, 0.5, aMid, aWid, dummy );
+  CPPUNIT_ASSERT_EQUAL( 11, (int)aMid.size() );
+  CPPUNIT_ASSERT_DOUBLES_EQUAL(  0.0,   aMid[0].U, EPS );
+  CPPUNIT_ASSERT_DOUBLES_EQUAL(  0.0,   aMid[0].Z, EPS );
+  CPPUNIT_ASSERT_DOUBLES_EQUAL(  0.11,  aMid[1].U, EPS );
+  CPPUNIT_ASSERT_DOUBLES_EQUAL(  0.5,   aMid[1].Z, EPS );
+  CPPUNIT_ASSERT_DOUBLES_EQUAL(  1.215, aMid[5].U, EPS );
+  CPPUNIT_ASSERT_DOUBLES_EQUAL(  2.5,   aMid[5].Z, EPS );
+  CPPUNIT_ASSERT_DOUBLES_EQUAL(  1.768, aMid[10].U, EPS );
+  CPPUNIT_ASSERT_DOUBLES_EQUAL(  5.0,   aMid[10].Z, EPS );
+
+  CPPUNIT_ASSERT_EQUAL( 11, (int)aWid.size() );
+  CPPUNIT_ASSERT_DOUBLES_EQUAL(  0.0,   aWid[0].U, EPS );
+  CPPUNIT_ASSERT_DOUBLES_EQUAL(  0.0,   aWid[0].Z, EPS );
+  CPPUNIT_ASSERT_DOUBLES_EQUAL(  1.989, aWid[1].U, EPS );
+  CPPUNIT_ASSERT_DOUBLES_EQUAL(  0.5,   aWid[1].Z, EPS );
+  CPPUNIT_ASSERT_DOUBLES_EQUAL(  8.618, aWid[5].U, EPS );
+  CPPUNIT_ASSERT_DOUBLES_EQUAL(  2.5,   aWid[5].Z, EPS );
+  CPPUNIT_ASSERT_DOUBLES_EQUAL( 14.142, aWid[10].U, EPS );
+  CPPUNIT_ASSERT_DOUBLES_EQUAL(  5.0,   aWid[10].Z, EPS );
+
+  aDoc->Close();
+}
+
+void test_HYDROData_DTM::test_profile_discretization_spline()
+{
+Handle(HYDROData_Document) aDoc = HYDROData_Document::Document(1);
+
+  Handle(HYDROData_Profile) aProfile = 
+    Handle(HYDROData_Profile)::DownCast( aDoc->CreateObject( KIND_PROFILE ) );
+
+  aProfile->SetParametricPoints( points );
+  aProfile->GetProfileUZ()->SetSectionType( 0, HYDROData_IPolyline::SECTION_SPLINE );
+  aProfile->SetLeftPoint( gp_XY( 10, 10 ) );
+  aProfile->SetRightPoint( gp_XY( 20, 20 ) );
+
+  HYDROData_DTM::CurveUZ aMid( 0.0, gp_Vec2d(), 0 ), aWid( 0.0, gp_Vec2d(), 0 );
+  int dummy = 0 ;
+  HYDROData_DTM::ProfileDiscretization( aProfile, 0.0, 0.0, 5.0, 0.5, aMid, aWid, dummy );
+  CPPUNIT_ASSERT_EQUAL( 11, (int)aMid.size() );
+  CPPUNIT_ASSERT_DOUBLES_EQUAL(  0.242, aMid[0].U, EPS );
+  CPPUNIT_ASSERT_DOUBLES_EQUAL(  0.0,   aMid[0].Z, EPS );
+  CPPUNIT_ASSERT_DOUBLES_EQUAL(  0.755, aMid[1].U, EPS );
+  CPPUNIT_ASSERT_DOUBLES_EQUAL(  0.5,   aMid[1].Z, EPS );
+  CPPUNIT_ASSERT_DOUBLES_EQUAL(  1.473, aMid[5].U, EPS );
+  CPPUNIT_ASSERT_DOUBLES_EQUAL(  2.5,   aMid[5].Z, EPS );
+  CPPUNIT_ASSERT_DOUBLES_EQUAL(  1.768, aMid[10].U, EPS );
+  CPPUNIT_ASSERT_DOUBLES_EQUAL(  5.0,   aMid[10].Z, EPS );
+
+  CPPUNIT_ASSERT_EQUAL( 11, (int)aWid.size() );
+  CPPUNIT_ASSERT_DOUBLES_EQUAL(  0.484, aWid[0].U, EPS );
+  CPPUNIT_ASSERT_DOUBLES_EQUAL(  0.0,   aWid[0].Z, EPS );
+  CPPUNIT_ASSERT_DOUBLES_EQUAL(  3.809, aWid[1].U, EPS );
+  CPPUNIT_ASSERT_DOUBLES_EQUAL(  0.5,   aWid[1].Z, EPS );
+  CPPUNIT_ASSERT_DOUBLES_EQUAL(  9.472, aWid[5].U, EPS );
+  CPPUNIT_ASSERT_DOUBLES_EQUAL(  2.5,   aWid[5].Z, EPS );
+  CPPUNIT_ASSERT_DOUBLES_EQUAL( 14.142, aWid[10].U, EPS );
+  CPPUNIT_ASSERT_DOUBLES_EQUAL(  5.0,   aWid[10].Z, EPS );
+
+  aDoc->Close();
+}
+
+void operator << ( std::ostream& s, const HYDROData_DTM::PointUZ& p )
+{
+  s << "(" << p.U << "; " << p.Z << ") ";
+}
+
+void operator << ( std::ostream& s, const HYDROData_DTM::AltitudePoint& p )
+{
+  s << "(" << p.X << "; " << p.Y << "; " << p.Z << ") ";
+}
+
+bool operator == ( const HYDROData_DTM::PointUZ& p1, const HYDROData_DTM::PointUZ& p2 )
+{
+  return fabs(p1.U-p2.U)<EPS && fabs(p1.Z-p2.Z)<EPS;
+}
+
+bool operator == ( const HYDROData_DTM::AltitudePoint& p1, const HYDROData_DTM::AltitudePoint& p2 )
+{
+  return fabs(p1.X-p2.X)<EPS && fabs(p1.Y-p2.Y)<EPS && fabs(p1.Z-p2.Z)<EPS;
+}
+
+void operator << ( std::ostream& s, const HYDROData_DTM::CurveUZ& c )
+{
+  size_t n = c.size();
+  for( size_t i=0; i<n; i++ )
+    s << c[i];
+}
+
+void test_HYDROData_DTM::test_curves_interpolation()
+{
+  HYDROData_DTM::CurveUZ A(1.0, gp_Vec2d(), 0), B(2.0, gp_Vec2d(), 0);
+  A.push_back( HYDROData_DTM::PointUZ( 0, 0 ) );
+  A.push_back( HYDROData_DTM::PointUZ( 1, 1 ) );
+  A.push_back( HYDROData_DTM::PointUZ( 2, 2 ) );
+  B.push_back( HYDROData_DTM::PointUZ( 10, 0 ) );
+  B.push_back( HYDROData_DTM::PointUZ( 15, 1 ) );
+  B.push_back( HYDROData_DTM::PointUZ( 20, 2 ) );
+
+  std::vector<HYDROData_DTM::CurveUZ> i1;
+  HYDROData_DTM::Interpolate( A, B, 1, i1, false );
+
+  CPPUNIT_ASSERT_EQUAL( 2, (int)i1.size() );
+  CPPUNIT_ASSERT_EQUAL( A, i1[0] );
+  CPPUNIT_ASSERT_EQUAL( 3, (int)i1[1].size() );
+  CPPUNIT_ASSERT_EQUAL( HYDROData_DTM::PointUZ( 5, 0 ), i1[1][0] );
+  CPPUNIT_ASSERT_EQUAL( HYDROData_DTM::PointUZ( 8, 1 ), i1[1][1] );
+  CPPUNIT_ASSERT_EQUAL( HYDROData_DTM::PointUZ( 11, 2 ), i1[1][2] );
+
+  std::vector<HYDROData_DTM::CurveUZ> i2;
+  HYDROData_DTM::Interpolate( A, B, 1, i2, true );
+
+  CPPUNIT_ASSERT_EQUAL( 3, (int)i2.size() );
+  CPPUNIT_ASSERT_EQUAL( A, i2[0] );
+  CPPUNIT_ASSERT_EQUAL( 3, (int)i2[1].size() );
+  CPPUNIT_ASSERT_EQUAL( HYDROData_DTM::PointUZ( 5, 0 ), i2[1][0] );
+  CPPUNIT_ASSERT_EQUAL( HYDROData_DTM::PointUZ( 8, 1 ), i2[1][1] );
+  CPPUNIT_ASSERT_EQUAL( HYDROData_DTM::PointUZ( 11, 2 ), i2[1][2] );
+  CPPUNIT_ASSERT_EQUAL( B, i2[2] );
+
+  std::vector<HYDROData_DTM::CurveUZ> i3;
+  HYDROData_DTM::Interpolate( A, B, 3, i3, false );
+
+  CPPUNIT_ASSERT_EQUAL( 4, (int)i3.size() );
+  CPPUNIT_ASSERT_EQUAL( A, i3[0] );
+  CPPUNIT_ASSERT_EQUAL( 3, (int)i3[1].size() );
+  CPPUNIT_ASSERT_EQUAL( HYDROData_DTM::PointUZ( 2.5, 0 ), i3[1][0] );
+  CPPUNIT_ASSERT_EQUAL( HYDROData_DTM::PointUZ( 4.5, 1 ), i3[1][1] );
+  CPPUNIT_ASSERT_EQUAL( HYDROData_DTM::PointUZ( 6.5, 2 ), i3[1][2] );
+}
+
+void test_HYDROData_DTM::test_curve_to_3d()
+{
+  Handle(HYDROData_Document) aDoc = HYDROData_Document::Document(1);
+
+  Handle(HYDROData_Profile) aProfile1 = 
+    Handle(HYDROData_Profile)::DownCast( aDoc->CreateObject( KIND_PROFILE ) );
+
+  Handle(HYDROData_Profile) aProfile2 = 
+    Handle(HYDROData_Profile)::DownCast( aDoc->CreateObject( KIND_PROFILE ) );
+
+  aProfile1->SetParametricPoints( points );
+  aProfile1->GetProfileUZ()->SetSectionType( 0, HYDROData_IPolyline::SECTION_POLYLINE );
+  aProfile1->SetLeftPoint( gp_XY( 20, 0 ) );
+  aProfile1->SetRightPoint( gp_XY( 10, 10 ) );
+
+  aProfile2->SetParametricPoints( points );
+  aProfile2->GetProfileUZ()->SetSectionType( 0, HYDROData_IPolyline::SECTION_POLYLINE );
+  aProfile2->SetLeftPoint( gp_XY( 100, 0 ) );
+  aProfile2->SetRightPoint( gp_XY( 110, 0 ) );
+
+  std::vector<double> distances;
+  std::vector<Handle(HYDROData_Profile)> profiles;
+  profiles.push_back( aProfile1 );
+  profiles.push_back( aProfile2 );
+
+  Handle_Geom2d_BSplineCurve HA = HYDROData_DTM::CreateHydraulicAxis( profiles, distances );
+  HYDROData_DTM::AltitudePoints points;
+  HYDROData_DTM::CurveUZ mid( 5.0, gp_Vec2d(-10,10), 0 );
+  mid.push_back( HYDROData_DTM::PointUZ( 0, 5 ) );
+  mid.push_back( HYDROData_DTM::PointUZ( 1, 6 ) );
+  HYDROData_DTM::CurveUZ wid( 5.0, gp_Vec2d(-10,10), 0 );
+  wid.push_back( HYDROData_DTM::PointUZ( 2, 5 ) );
+  wid.push_back( HYDROData_DTM::PointUZ( 6, 6 ) );
+  HYDROData_DTM::CurveTo3D( HA, mid, wid, points );
+
+  CPPUNIT_ASSERT_EQUAL( 4, (int)points.size() );
+  CPPUNIT_ASSERT_EQUAL( HYDROData_DTM::AltitudePoint( 16.380, -2.186, 6.0 ), points[0] );
+  CPPUNIT_ASSERT_EQUAL( HYDROData_DTM::AltitudePoint( 15.673, -1.479, 5.0 ), points[1] );
+  CPPUNIT_ASSERT_EQUAL( HYDROData_DTM::AltitudePoint( 14.259, -0.065, 5.0 ), points[2] );
+  CPPUNIT_ASSERT_EQUAL( HYDROData_DTM::AltitudePoint( 12.137,  2.056, 6.0 ), points[3] );
+
+  aDoc->Close();
+}
+
+void test_HYDROData_DTM::test_presentation()
+{
+  Handle(HYDROData_Document) aDoc = HYDROData_Document::Document(1);
+
+  Handle(HYDROData_DTM) DTM = Handle(HYDROData_DTM)::DownCast( aDoc->CreateObject( KIND_DTM ) );
+
+  Handle(HYDROData_Profile) aProfile1 = 
+    Handle(HYDROData_Profile)::DownCast( aDoc->CreateObject( KIND_PROFILE ) );
+
+  Handle(HYDROData_Profile) aProfile2 = 
+    Handle(HYDROData_Profile)::DownCast( aDoc->CreateObject( KIND_PROFILE ) );
+
+  aProfile1->SetParametricPoints( points );
+  aProfile1->GetProfileUZ()->SetSectionType( 0, HYDROData_IPolyline::SECTION_SPLINE );
+  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( 110, 10 ) );
+  aProfile2->SetRightPoint( gp_XY( 100, 0 ) );
+
+  HYDROData_SequenceOfObjects seq;
+  seq.Append( aProfile1 );
+  seq.Append( aProfile2 );
+  DTM->SetProfiles( seq );
+  DTM->SetDDZ( 0.1 );
+  CPPUNIT_ASSERT_DOUBLES_EQUAL( 0.1, DTM->GetDDZ(), EPS );
+  DTM->SetSpatialStep( 1.0 );
+  CPPUNIT_ASSERT_DOUBLES_EQUAL( 1.0, DTM->GetSpatialStep(), EPS );
+  DTM->Update();
+  
+  CPPUNIT_ASSERT_EQUAL( 9177, (int)DTM->GetAltitudePoints().size() ); 
+
+  Handle_AIS_InteractiveContext aContext = TestViewer::context();
+  HYDROGUI_ShapeBathymetry* aBathPrs = new HYDROGUI_ShapeBathymetry( 0, aContext, DTM );
+  aBathPrs->update( true, false );
+
+  TestViewer::showColorScale( true );
+  Handle_Aspect_ColorScale aCS = TestViewer::colorScale();
+  aCS->SetMin( 0.0 );
+  aCS->SetMax( 5.0 );
+  aCS->SetNumberOfIntervals( 10 );
+  aBathPrs->UpdateWithColorScale( aCS );
+  
+  QImage aDTMPrs = draw_DTM( aBathPrs, 0.5, 600, 600 );
+  CPPUNIT_ASSERT_IMAGES2( &aDTMPrs, "DTM_1" );
+  delete aBathPrs;
+
+  aDoc->Close();
+}
+
+void test_HYDROData_DTM::test_garonne()
+{
+  Handle(HYDROData_Document) aDoc = HYDROData_Document::Document(1);
+  
+  TCollection_AsciiString fname = REF_DATA_PATH.toLatin1().data();
+  fname += "/Profiles.xyz";
+  NCollection_Sequence<int> bad_ids;
+
+  int aSize = HYDROData_Profile::ImportFromFile( aDoc, fname, bad_ids, true );
+  
+  CPPUNIT_ASSERT_EQUAL( 0, bad_ids.Size() );
+  CPPUNIT_ASSERT_EQUAL( 46, aSize );
+
+  HYDROData_SequenceOfObjects profiles;
+  HYDROData_Iterator it( aDoc, KIND_PROFILE );
+  for( int i=0; it.More(); it.Next(), i++ )
+  {
+    if( i>=25 && i<=35 )
+      profiles.Append( Handle(HYDROData_Profile)::DownCast( it.Current() ) );
+  }
+
+  CPPUNIT_ASSERT_EQUAL( 11, (int)profiles.Size() );
+
+
+
+  Handle(HYDROData_DTM) DTM = Handle(HYDROData_DTM)::DownCast( aDoc->CreateObject( KIND_DTM ) );
+  DTM->SetProfiles( profiles );
+  DTM->SetDDZ( 0.1 );
+  DTM->SetSpatialStep( 1.0 );
+  CPPUNIT_ASSERT_DOUBLES_EQUAL( 0.1, DTM->GetDDZ(), EPS );
+  CPPUNIT_ASSERT_DOUBLES_EQUAL( 1.0, DTM->GetSpatialStep(), EPS );
+  DTM->Update();
+  
+  CPPUNIT_ASSERT_EQUAL( 282338, (int)DTM->GetAltitudePoints().size() ); 
+
+  Handle_AIS_InteractiveContext aContext = TestViewer::context();
+  HYDROGUI_ShapeBathymetry* aBathPrs = new HYDROGUI_ShapeBathymetry( 0, aContext, DTM );
+  aBathPrs->update( true, false );
+
+  TestViewer::showColorScale( true );
+  Handle_Aspect_ColorScale aCS = TestViewer::colorScale();
+  aCS->SetMin( 0.0 );
+  aCS->SetMax( 25.0 );
+  aCS->SetNumberOfIntervals( 30 );
+  aBathPrs->UpdateWithColorScale( aCS );
+  
+  QImage aDTMPrs = draw_DTM( aBathPrs, 0.5, 600, 600 );
+  CPPUNIT_ASSERT_IMAGES2( &aDTMPrs, "DTM_2" );
+  delete aBathPrs;
+
+  aDoc->Close();
+}