From: Paul RASCLE <paul.rascle@edf.fr>
Date: Mon, 8 Jul 2019 15:30:29 +0000 (+0200)
Subject: latests developments debug and porting Python3
X-Git-Tag: SH_V2_2_0~99^2~11^2
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=8255eee47f0b0c5d396725421b65094f439b430a;p=modules%2Fhydro.git

latests developments debug and porting Python3
---

diff --git a/src/HYDROData/HYDROData_Bathymetry.cxx b/src/HYDROData/HYDROData_Bathymetry.cxx
index d3de1f76..609d0c23 100755
--- a/src/HYDROData/HYDROData_Bathymetry.cxx
+++ b/src/HYDROData/HYDROData_Bathymetry.cxx
@@ -155,7 +155,7 @@ HYDROData_Bathymetry::AltitudePoints HYDROData_Bathymetry::GetAltitudePoints(boo
   if ( !aLabel.FindAttribute( TDataStd_RealArray::GetID(), aCoordsArray ) )
     return aPoints;
 
-  Handle(HYDROData_Document) aDoc = HYDROData_Document::Document( myLab );
+  Handle(HYDROData_Document) aDoc = HYDROData_Document::Document();
   int q = ( aCoordsArray->Upper() - aCoordsArray->Lower() + 1 ) / 3;
   aPoints.reserve( q );
   for ( int i = aCoordsArray->Lower(), n = aCoordsArray->Upper(); i <= n; )
@@ -186,7 +186,7 @@ HYDROData_QuadtreeNode* HYDROData_Bathymetry::GetQuadtreeNodes() const
         return 0;
 
       int aQuadTreeNumber = 0;
-      Handle(HYDROData_Document) aDocument = HYDROData_Document::Document( myLab );
+      Handle(HYDROData_Document) aDocument = HYDROData_Document::Document();
       if ( ! aDocument.IsNull() )
         {
           aQuadTreeNumber = aDocument->GetCountQuadtree();
@@ -273,7 +273,7 @@ vtkPolyData* HYDROData_Bathymetry::GetVtkDelaunay2D() const
         return 0;
 
       int aDelaunayNumber = 0;
-      Handle(HYDROData_Document) aDocument = HYDROData_Document::Document( myLab );
+      Handle(HYDROData_Document) aDocument = HYDROData_Document::Document();
       if ( ! aDocument.IsNull() )
         {
           aDelaunayNumber = aDocument->GetCountDelaunay();
@@ -709,7 +709,7 @@ bool HYDROData_Bathymetry::ImportFromFiles( const QStringList& theFileNames )
   }
 
   // Convert from global to local CS
-  Handle(HYDROData_Document) aDoc = HYDROData_Document::Document( myLab );
+  Handle(HYDROData_Document) aDoc = HYDROData_Document::Document();
   HYDROData_Bathymetry::AltitudePoints::iterator anIter = AllPoints.begin(), aLast = AllPoints.end();
   for ( ; anIter!=aLast; ++anIter )
   {
@@ -889,7 +889,7 @@ bool HYDROData_Bathymetry::importFromASCFile( QFile&          theFile,
 
 Handle(HYDROData_PolylineXY) HYDROData_Bathymetry::CreateBoundaryPolyline() const
 {
-  Handle(HYDROData_Document) aDocument = HYDROData_Document::Document( myLab );
+  Handle(HYDROData_Document) aDocument = HYDROData_Document::Document();
   Handle(HYDROData_PolylineXY) aResult = 
     Handle(HYDROData_PolylineXY)::DownCast( aDocument->CreateObject( KIND_POLYLINEXY ) );
 
diff --git a/src/HYDROData/HYDROData_CalculationCase.cxx b/src/HYDROData/HYDROData_CalculationCase.cxx
index 3014494d..e6a640f6 100755
--- a/src/HYDROData/HYDROData_CalculationCase.cxx
+++ b/src/HYDROData/HYDROData_CalculationCase.cxx
@@ -462,7 +462,7 @@ void HYDROData_CalculationCase::Update()
   RemoveRegions();
   RemoveSplitGroups();
 
-  Handle(HYDROData_Document) aDocument = HYDROData_Document::Document( myLab );
+  Handle(HYDROData_Document) aDocument = HYDROData_Document::Document();
   if ( aDocument.IsNull() )
     return;
 
@@ -824,7 +824,7 @@ Handle(HYDROData_Region) HYDROData_CalculationCase::AddNewRegion( const Handle(H
   Changed( Geom_No );
   Changed( Geom_No );
   Changed( Geom_No );
-  Handle(HYDROData_Document) aDocument = HYDROData_Document::Document( myLab );
+  Handle(HYDROData_Document) aDocument = HYDROData_Document::Document();
   Handle(HYDROData_Region) aNewRegion = addNewRegion( aDocument, CALCULATION_REGIONS_PREF );
   if ( aNewRegion.IsNull() )
     return aNewRegion;
@@ -836,7 +836,7 @@ Handle(HYDROData_Region) HYDROData_CalculationCase::AddNewRegion( const Handle(H
 
 bool HYDROData_CalculationCase::AddRegion( const Handle(HYDROData_Region)& theRegion )
 {
-  Handle(HYDROData_Document) aDocument = HYDROData_Document::Document( myLab );
+  Handle(HYDROData_Document) aDocument = HYDROData_Document::Document();
 
   if ( theRegion.IsNull() )
     return false;
@@ -873,7 +873,7 @@ HYDROData_SequenceOfObjects HYDROData_CalculationCase::GetRegions() const
 
 void HYDROData_CalculationCase::UpdateRegionsOrder()
 {
-  Handle(HYDROData_Document) aDocument = HYDROData_Document::Document( myLab );
+  Handle(HYDROData_Document) aDocument = HYDROData_Document::Document();
   if ( aDocument.IsNull() )
     return;
 
diff --git a/src/HYDROData/HYDROData_Entity.cxx b/src/HYDROData/HYDROData_Entity.cxx
index 387cd70a..370c7167 100644
--- a/src/HYDROData/HYDROData_Entity.cxx
+++ b/src/HYDROData/HYDROData_Entity.cxx
@@ -232,7 +232,7 @@ void HYDROData_Entity::Show()
   if ( !IsHas2dPrs() )
     return;
 
-  Handle(HYDROData_Document) aDocument = HYDROData_Document::Document( myLab );
+  Handle(HYDROData_Document) aDocument = HYDROData_Document::Document();
   if ( aDocument.IsNull() )
     return;
 
@@ -263,7 +263,7 @@ int HYDROData_Entity::GetGeomChangeFlag() const
 
 void HYDROData_Entity::Changed( Geometry theChangedGeometry )
 {
-  Handle(HYDROData_Document) aDocument = HYDROData_Document::Document( myLab );
+  Handle(HYDROData_Document) aDocument = HYDROData_Document::Document();
   if( aDocument.IsNull() )
     return;
 
@@ -335,7 +335,7 @@ HYDROData_Entity::~HYDROData_Entity()
 void HYDROData_Entity::CopyTo( const Handle(HYDROData_Entity)& theDestination,
                                bool isGenerateNewName ) const
 {
-  Handle(HYDROData_Document) aDocument = HYDROData_Document::Document( myLab );
+  Handle(HYDROData_Document) aDocument = HYDROData_Document::Document();
   if ( aDocument.IsNull() ) {
     return;
   }
@@ -744,7 +744,7 @@ QStringList HYDROData_Entity::dumpObjectCreation( MapOfTreatedObjects& theTreate
 {
   QStringList aResList;
 
-  Handle(HYDROData_Document) aDocument = HYDROData_Document::Document( myLab );
+  Handle(HYDROData_Document) aDocument = HYDROData_Document::Document();
   if ( aDocument.IsNull() )
     return aResList;
 
@@ -876,7 +876,7 @@ void HYDROData_Entity::setPythonObjectColor( QStringList&         theScript,
 void HYDROData_Entity::findPythonReferenceObject( QStringList& theScript,
                                                   QString      defName) const
 {
-  Handle(HYDROData_Document) aDocument = HYDROData_Document::Document( myLab );
+  Handle(HYDROData_Document) aDocument = HYDROData_Document::Document();
   if ( aDocument.IsNull() )
     return;
 
@@ -893,7 +893,7 @@ void HYDROData_Entity::findPythonReferenceObject( QStringList& theScript,
 void HYDROData_Entity::SetNameInDumpPython(QStringList&  theScript,
                                            QString       theName) const
 {
-  Handle(HYDROData_Document) aDocument = HYDROData_Document::Document( myLab );
+  Handle(HYDROData_Document) aDocument = HYDROData_Document::Document();
   if ( aDocument.IsNull() )
     return;
 
diff --git a/src/HYDROData/HYDROData_Object.cxx b/src/HYDROData/HYDROData_Object.cxx
index 02578fb6..9d311e76 100644
--- a/src/HYDROData/HYDROData_Object.cxx
+++ b/src/HYDROData/HYDROData_Object.cxx
@@ -309,7 +309,7 @@ Handle(HYDROData_IAltitudeObject) HYDROData_Object::getChildAltitudeObject() con
 
 void HYDROData_Object::checkAndSetAltitudeObject()
 {
-  Handle(HYDROData_Document) aDocument = HYDROData_Document::Document( myLab );
+  Handle(HYDROData_Document) aDocument = HYDROData_Document::Document();
 
   ObjectKind anAltitudeObjectType = getAltitudeObjectType();
   //DEBTRACE("HYDROData_Object::checkAndSetAltitudeObject anAltitudeObjectType="<< anAltitudeObjectType);
diff --git a/src/HYDROData/HYDROData_Polyline3D.cxx b/src/HYDROData/HYDROData_Polyline3D.cxx
index ce4bb667..ea6841d8 100644
--- a/src/HYDROData/HYDROData_Polyline3D.cxx
+++ b/src/HYDROData/HYDROData_Polyline3D.cxx
@@ -215,7 +215,7 @@ HYDROData_Polyline3D::Polyline3DPoints HYDROData_Polyline3D::GetProfilePoints3D(
 
   if (IsConvertToGlobal)
   {
-    Handle(HYDROData_Document) aDoc = HYDROData_Document::Document( myLab );
+    Handle(HYDROData_Document) aDoc = HYDROData_Document::Document();
     for (int i=1;i<=aResPoints.Size();i++)
     {
       gp_XYZ& point = aResPoints.ChangeValue(i);
@@ -349,7 +349,7 @@ Handle(HYDROData_ProfileUZ) HYDROData_Polyline3D::GetChildProfileUZ( const bool
   if ( !theIsCreate || !aProfileUZ.IsNull() )
     return aProfileUZ;
 
-  Handle(HYDROData_Document) aDocument = HYDROData_Document::Document( myLab );
+  Handle(HYDROData_Document) aDocument = HYDROData_Document::Document();
   if ( aDocument.IsNull() )
     return aProfileUZ;
 
diff --git a/src/HYDROData/HYDROData_PolylineXY.cxx b/src/HYDROData/HYDROData_PolylineXY.cxx
index fb8a61ad..1e27572f 100644
--- a/src/HYDROData/HYDROData_PolylineXY.cxx
+++ b/src/HYDROData/HYDROData_PolylineXY.cxx
@@ -1491,7 +1491,7 @@ HYDROData_PolylineXY::PointsList HYDROData_PolylineXY::GetPoints( const int theS
 
   TColStd_ListIteratorOfListOfReal anIterX( aListX->List() );
   TColStd_ListIteratorOfListOfReal anIterY( aListY->List() );
-  Handle(HYDROData_Document) aDoc = HYDROData_Document::Document( myLab );
+  Handle(HYDROData_Document) aDoc = HYDROData_Document::Document();
   for ( ; anIterX.More() && anIterY.More(); anIterX.Next(), anIterY.Next() )
   {
     Point aPoint( anIterX.Value(), anIterY.Value() );
diff --git a/src/HYDROData/HYDROData_Profile.cxx b/src/HYDROData/HYDROData_Profile.cxx
index 059f299a..cf738b2c 100644
--- a/src/HYDROData/HYDROData_Profile.cxx
+++ b/src/HYDROData/HYDROData_Profile.cxx
@@ -227,7 +227,7 @@ void HYDROData_Profile::SetLeftPoint( const gp_XY& theGPoint, bool IsConvertFrom
   if ( aLabel.IsNull() )
     return;
 
-  Handle(HYDROData_Document) aDoc = HYDROData_Document::Document( Label() );
+  Handle(HYDROData_Document) aDoc = HYDROData_Document::Document();
   gp_XY aLPoint = theGPoint;
   if( IsConvertFromGlobal )
     aDoc->Transform( aLPoint, true );
@@ -262,7 +262,7 @@ bool HYDROData_Profile::GetLeftPoint( gp_XY& thePoint, bool IsConvertToGlobal,
     return CanUseDefault;
   }
 
-  Handle(HYDROData_Document) aDoc = HYDROData_Document::Document( myLab );
+  Handle(HYDROData_Document) aDoc = HYDROData_Document::Document();
   Handle(TDataStd_RealArray) anArray;
   if ( !aLabel.FindAttribute( TDataStd_RealArray::GetID(), anArray ) )
   {
@@ -282,7 +282,7 @@ void HYDROData_Profile::SetRightPoint( const gp_XY& theGPoint, bool IsConvertFro
 {
   TDF_Label aLabel = myLab.FindChild( DataTag_LastPoint );
 
-  Handle(HYDROData_Document) aDoc = HYDROData_Document::Document( Label() );
+  Handle(HYDROData_Document) aDoc = HYDROData_Document::Document();
   gp_XY aLPoint = theGPoint;
   if( IsConvertFromGlobal )
     aDoc->Transform( aLPoint, true );
@@ -316,7 +316,7 @@ bool HYDROData_Profile::GetRightPoint( gp_XY& thePoint, bool IsConvertToGlobal,
     return CanUseDefault;
   }
 
-  Handle(HYDROData_Document) aDoc = HYDROData_Document::Document( myLab );
+  Handle(HYDROData_Document) aDoc = HYDROData_Document::Document();
   Handle(TDataStd_RealArray) anArray;
   if ( !aLabel.FindAttribute( TDataStd_RealArray::GetID(), anArray ) )
   {
@@ -407,7 +407,7 @@ void HYDROData_Profile::SetProfilePoints( const ProfilePoints& thePoints, bool I
 
   gp_XY aFirstPoint, aLastPoint;
 
-  Handle(HYDROData_Document) aDoc = HYDROData_Document::Document( Label() );
+  Handle(HYDROData_Document) aDoc = HYDROData_Document::Document();
   Handle(HYDROData_ProfileUZ) aProfileUZ = GetProfileUZ();
   for ( int i = 1, n = thePoints.Length(); i <= n ; ++i )
   {
diff --git a/src/HYDROData/HYDROData_Region.cxx b/src/HYDROData/HYDROData_Region.cxx
index 37887cfb..c3876616 100644
--- a/src/HYDROData/HYDROData_Region.cxx
+++ b/src/HYDROData/HYDROData_Region.cxx
@@ -101,7 +101,7 @@ HYDROData_SequenceOfObjects HYDROData_Region::GetAllReferenceObjects() const
 
 bool HYDROData_Region::AddZone( const Handle(HYDROData_Zone)& theZone )
 {
-  Handle(HYDROData_Document) aDocument = HYDROData_Document::Document( myLab );
+  Handle(HYDROData_Document) aDocument = HYDROData_Document::Document();
 
   if ( theZone.IsNull() )
     return false;
diff --git a/src/HYDROData/HYDROData_Stream.cxx b/src/HYDROData/HYDROData_Stream.cxx
index e75dc368..431e22ae 100644
--- a/src/HYDROData/HYDROData_Stream.cxx
+++ b/src/HYDROData/HYDROData_Stream.cxx
@@ -1053,7 +1053,7 @@ void HYDROData_Stream::removeParameter( const int& theIndex )
 bool HYDROData_Stream::GenerateBottomPolyline()
 {
   // Get the document
-  Handle(HYDROData_Document) aDocument = HYDROData_Document::Document( myLab );
+  Handle(HYDROData_Document) aDocument = HYDROData_Document::Document();
   if ( aDocument.IsNull() ) {
     return false;
   }
@@ -1141,7 +1141,7 @@ bool HYDROData_Stream::SetBottomPolyline( const Handle(HYDROData_Polyline3D)& th
 bool HYDROData_Stream::Interpolate( HYDROData_IProfilesInterpolator* theInterpolator )
 {
   // Get the document
-  Handle(HYDROData_Document) aDocument = HYDROData_Document::Document( myLab );
+  Handle(HYDROData_Document) aDocument = HYDROData_Document::Document();
   if ( aDocument.IsNull() ) {
     return false;
   }
@@ -1193,7 +1193,7 @@ void HYDROData_Stream::CopyTo( const Handle(HYDROData_Entity)& theDestination,
                                bool isGenerateNewName ) const
 {
   // Get the document
-  Handle(HYDROData_Document) aDocument = HYDROData_Document::Document( myLab );
+  Handle(HYDROData_Document) aDocument = HYDROData_Document::Document();
   if ( aDocument.IsNull() ) {
     return;
   }
diff --git a/src/HYDROData/HYDROData_StricklerTable.cxx b/src/HYDROData/HYDROData_StricklerTable.cxx
index c5e7409b..8dda1673 100644
--- a/src/HYDROData/HYDROData_StricklerTable.cxx
+++ b/src/HYDROData/HYDROData_StricklerTable.cxx
@@ -256,7 +256,7 @@ QString HYDROData_StricklerTable::GetAttrName() const
 
 bool HYDROData_StricklerTable::SetAttrName( const QString& theAttrName ) const
 {
-  HYDROData_Iterator anIt( HYDROData_Document::Document( myLab ), KIND_STRICKLER_TABLE );
+  HYDROData_Iterator anIt( HYDROData_Document::Document(), KIND_STRICKLER_TABLE );
   for( ; anIt.More(); anIt.Next() )
   {
     Handle( HYDROData_StricklerTable ) aTable = 
@@ -335,7 +335,7 @@ void HYDROData_StricklerTable::SetColor( const QString& theType, const QColor& t
   aMap->SetInteger( aType, aColorInt );
 
   // synchronize the color for the same type in other maps
-  HYDROData_Iterator anIt( HYDROData_Document::Document( myLab ), KIND_STRICKLER_TABLE );
+  HYDROData_Iterator anIt( HYDROData_Document::Document(), KIND_STRICKLER_TABLE );
   for( ; anIt.More(); anIt.Next() )
   {
     Handle( HYDROData_StricklerTable ) aTable = 
diff --git a/src/HYDROData/test_HYDROData_PolylineXY.cxx b/src/HYDROData/test_HYDROData_PolylineXY.cxx
index 99b61069..98d35c36 100644
--- a/src/HYDROData/test_HYDROData_PolylineXY.cxx
+++ b/src/HYDROData/test_HYDROData_PolylineXY.cxx
@@ -26,7 +26,7 @@
 
 void test_HYDROData_PolylineXY::testPolyline()
 {
-  Handle(HYDROData_Document) aDoc = HYDROData_Document::Document( 1 );
+  Handle(HYDROData_Document) aDoc = HYDROData_Document::Document();
 
   Handle(HYDROData_PolylineXY) aPolyline = 
     Handle(HYDROData_PolylineXY)::DownCast(aDoc->CreateObject(KIND_POLYLINEXY));
@@ -56,7 +56,7 @@ void test_HYDROData_PolylineXY::testPolyline()
 
 void test_HYDROData_PolylineXY::testCopy()
 {
-  Handle(HYDROData_Document) aDoc = HYDROData_Document::Document(1);
+  Handle(HYDROData_Document) aDoc = HYDROData_Document::Document();
   Handle(HYDROData_PolylineXY) aPolyline1 = 
     Handle(HYDROData_PolylineXY)::DownCast(aDoc->CreateObject(KIND_POLYLINEXY));
 
diff --git a/src/HYDROGUI/HYDROGUI_LandCoverMapPrs.cxx b/src/HYDROGUI/HYDROGUI_LandCoverMapPrs.cxx
index 7888166a..e6773b81 100644
--- a/src/HYDROGUI/HYDROGUI_LandCoverMapPrs.cxx
+++ b/src/HYDROGUI/HYDROGUI_LandCoverMapPrs.cxx
@@ -122,7 +122,7 @@ Quantity_Color HYDROGUI_LandCoverMapPrs::GetColor( const QString& theStricklerTy
       return Quantity_Color();
   }
 
-  QColor aColor = HYDROData_Document::Document( myLCMap->Label())->GetAssociatedColor(theStricklerType, myTable);
+  QColor aColor = HYDROData_Document::Document()->GetAssociatedColor(theStricklerType, myTable);
 
   if (aColor.isValid())
     return HYDROData_Tool::toOccColor(aColor);
diff --git a/src/HYDROGUI/HYDROGUI_Shape.cxx b/src/HYDROGUI/HYDROGUI_Shape.cxx
index 69158160..f180a82a 100644
--- a/src/HYDROGUI/HYDROGUI_Shape.cxx
+++ b/src/HYDROGUI/HYDROGUI_Shape.cxx
@@ -132,7 +132,7 @@ void HYDROGUI_Shape::update( bool isUpdateViewer,
   // Try to retrieve information from object
   if ( !myObject.IsNull() )
   {
-    Handle(HYDROData_Document) aDocument = HYDROData_Document::Document( myObject->Label() );
+    Handle(HYDROData_Document) aDocument = HYDROData_Document::Document();
   
     if ( myObject->IsKind( STANDARD_TYPE(HYDROData_ImmersibleZone) ) )
     {
diff --git a/src/HYDROGUI/HYDROGUI_ShapeImage.cxx b/src/HYDROGUI/HYDROGUI_ShapeImage.cxx
index 765e75d6..0c6b9a2b 100644
--- a/src/HYDROGUI/HYDROGUI_ShapeImage.cxx
+++ b/src/HYDROGUI/HYDROGUI_ShapeImage.cxx
@@ -112,7 +112,7 @@ QPolygonF HYDROGUI_ShapeImage::imageContour( const Handle(HYDROData_Image)& theI
                                          << QPointF( anImage.width(), anImage.height() ) << QPointF( 0, anImage.height() );
         aPolygon = aTrsf.map( aPolygon );
 
-        Handle(HYDROData_Document) aDoc = HYDROData_Document::Document( theImageObj->Label() );
+        Handle(HYDROData_Document) aDoc = HYDROData_Document::Document();
         for ( QPolygonF::iterator it = aPolygon.begin(); it != aPolygon.end(); ++it )
         {
             gp_Pnt aPnt( (*it).x(), (*it).y(), 0 );
diff --git a/src/HYDROGUI/HYDROGUI_VTKPrsShape.cxx b/src/HYDROGUI/HYDROGUI_VTKPrsShape.cxx
index ce016a55..66dd4dbf 100644
--- a/src/HYDROGUI/HYDROGUI_VTKPrsShape.cxx
+++ b/src/HYDROGUI/HYDROGUI_VTKPrsShape.cxx
@@ -108,7 +108,7 @@ void HYDROGUI_VTKPrsShape::buildShape()
   // Try to retrieve information from object
   if ( !anObject.IsNull() )
   {
-    Handle(HYDROData_Document) aDocument = HYDROData_Document::Document( anObject->Label() );
+    Handle(HYDROData_Document) aDocument = HYDROData_Document::Document();
   
     if ( anObject->IsKind( STANDARD_TYPE(HYDROData_ImmersibleZone) ) )
     {
diff --git a/src/HYDRO_tests/CMakeLists.txt b/src/HYDRO_tests/CMakeLists.txt
index 9b0cd57c..10b6c87f 100644
--- a/src/HYDRO_tests/CMakeLists.txt
+++ b/src/HYDRO_tests/CMakeLists.txt
@@ -78,7 +78,7 @@ IF( ${WIN32} )
   add_definitions( -DWNT -D__WIN32__ -D__x86__ -D_WIN64 -D_WIN32_WINNT=0x0400 -D__NT__ -D__OSVERSION__=4 )
 ENDIF()
 
-SET( CPPUNIT_INCLUDES $ENV{CPPUNIT_ROOT_DIR}/include )
+SET( CPPUNIT_INCLUDES $ENV{CPPUNIT_ROOT}/include )
 SET( CAS_INCLUDES $ENV{CASROOT}/inc )
 SET( QT_INCLUDES $ENV{QTDIR}/include $ENV{QT_ROOT_DIR}/include $ENV{QT_ROOT_DIR}/include/QtCore $ENV{QT_ROOT_DIR}/include/QtGui $ENV{QT_ROOT_DIR}/include/QtTest )
 SET( KERNEL_INCLUDES $ENV{KERNEL_ROOT_DIR}/include/salome )
@@ -101,7 +101,7 @@ ELSE()
 ENDIF()
 
 
-link_directories( $ENV{CPPUNIT_ROOT_DIR}/lib )
+link_directories( $ENV{CPPUNIT_ROOT}/lib )
 IF( ${WIN32} )
   IF( CMAKE_BUILD_TYPE MATCHES Debug )
     SET( CPPUNIT_LIBRARIES cppunitd )
diff --git a/src/HYDRO_tests/test_HYDROData_DTM.cxx b/src/HYDRO_tests/test_HYDROData_DTM.cxx
index 0cb700a8..9cc0ea75 100644
--- a/src/HYDRO_tests/test_HYDROData_DTM.cxx
+++ b/src/HYDRO_tests/test_HYDROData_DTM.cxx
@@ -672,7 +672,7 @@ void test_HYDROData_DTM::test_classifier_1()
 
 void test_HYDROData_DTM::test_profile_discretization_warnings()
 {
-  Handle(HYDROData_Document) aDoc = HYDROData_Document::Document(1);
+  Handle(HYDROData_Document) aDoc = HYDROData_Document::Document();
 
   {
     Handle(HYDROData_Profile) aProfile = 
diff --git a/src/HYDRO_tests/test_HYDROData_PolylineXY.cxx b/src/HYDRO_tests/test_HYDROData_PolylineXY.cxx
index cc07bbf7..5120fb09 100644
--- a/src/HYDRO_tests/test_HYDROData_PolylineXY.cxx
+++ b/src/HYDRO_tests/test_HYDROData_PolylineXY.cxx
@@ -626,7 +626,7 @@ void test_HYDROData_PolylineXY::test_import_from_sx()
 
 void test_HYDROData_PolylineXY::test_import_from_sx_options()
 {
-  Handle(HYDROData_Document) aDoc = HYDROData_Document::Document( 1 );
+  Handle(HYDROData_Document) aDoc = HYDROData_Document::Document();
   TCollection_AsciiString fname = REF_DATA_PATH.toLatin1().data();
   fname += "/trait_cote_lambert1N.sx";
 
@@ -662,7 +662,7 @@ void test_HYDROData_PolylineXY::test_import_from_sx_options()
 
 void test_HYDROData_PolylineXY::test_polyline_dbf_info_simple()
 {
-  Handle(HYDROData_Document) aDoc = HYDROData_Document::Document( 1 );
+  Handle(HYDROData_Document) aDoc = HYDROData_Document::Document();
   Handle(HYDROData_PolylineXY) aPolyline = Handle(HYDROData_PolylineXY)::DownCast(aDoc->CreateObject(KIND_POLYLINEXY));
   QStringList dbf_dummy, dbf_out;
   dbf_dummy << "n1" << "n2" << "n3" << "n4";