X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2FHYDRO_tests%2Ftest_HYDROData_DTM.cxx;h=453a315f6430750f93eea1a8a6aca68aca6b4b3d;hb=3bece499e83cc9ca95536228c7f6740030e9d5d8;hp=be6e80ef6e485ebf53c828d42e48f774eadff15e;hpb=8a4fba27faa30e582f7256754ef09ae3ea81910f;p=modules%2Fhydro.git

diff --git a/src/HYDRO_tests/test_HYDROData_DTM.cxx b/src/HYDRO_tests/test_HYDROData_DTM.cxx
index be6e80ef..453a315f 100644
--- a/src/HYDRO_tests/test_HYDROData_DTM.cxx
+++ b/src/HYDRO_tests/test_HYDROData_DTM.cxx
@@ -58,7 +58,7 @@ public:
     myD = d;
 
     int n = pp->VertexNumber();
-    
+
     for( int i=1; i<=n; i++ )
     {
       gp_Pnt pnt = pp->Vertice( i );
@@ -160,27 +160,27 @@ void test_HYDROData_DTM::setUp()
 
 void test_HYDROData_DTM::test_creation()
 {
-  Handle(HYDROData_Document) aDoc = HYDROData_Document::Document(1);
+  Handle(HYDROData_Document) aDoc = HYDROData_Document::Document();
 
-  Handle(HYDROData_DTM) DTM = 
+  Handle(HYDROData_DTM) DTM =
     Handle(HYDROData_DTM)::DownCast( aDoc->CreateObject( KIND_DTM ) );
 
   CPPUNIT_ASSERT_EQUAL( false, (bool)DTM.IsNull() );
-   
+
   aDoc->Close();
 }
 
 void test_HYDROData_DTM::test_hydraulic_axis()
 {
-  Handle(HYDROData_Document) aDoc = HYDROData_Document::Document(1);
+  Handle(HYDROData_Document) aDoc = HYDROData_Document::Document();
 
-  Handle(HYDROData_Profile) aProfile1 = 
+  Handle(HYDROData_Profile) aProfile1 =
     Handle(HYDROData_Profile)::DownCast( aDoc->CreateObject( KIND_PROFILE ) );
 
-  Handle(HYDROData_Profile) aProfile2 = 
+  Handle(HYDROData_Profile) aProfile2 =
     Handle(HYDROData_Profile)::DownCast( aDoc->CreateObject( KIND_PROFILE ) );
 
-  Handle(HYDROData_Profile) aProfile3 = 
+  Handle(HYDROData_Profile) aProfile3 =
     Handle(HYDROData_Profile)::DownCast( aDoc->CreateObject( KIND_PROFILE ) );
 
   aProfile1->SetParametricPoints( points );
@@ -225,12 +225,12 @@ void test_HYDROData_DTM::test_hydraulic_axis()
 
 void test_HYDROData_DTM::test_profile_conversion_to_2d()
 {
-  Handle(HYDROData_Document) aDoc = HYDROData_Document::Document(1);
+  Handle(HYDROData_Document) aDoc = HYDROData_Document::Document();
 
-  Handle(HYDROData_Profile) aProfile1 = 
+  Handle(HYDROData_Profile) aProfile1 =
     Handle(HYDROData_Profile)::DownCast( aDoc->CreateObject( KIND_PROFILE ) );
 
-  Handle(HYDROData_Profile) aProfile2 = 
+  Handle(HYDROData_Profile) aProfile2 =
     Handle(HYDROData_Profile)::DownCast( aDoc->CreateObject( KIND_PROFILE ) );
 
   aProfile1->SetParametricPoints( points );
@@ -296,9 +296,9 @@ void test_HYDROData_DTM::test_profile_conversion_to_2d()
 
 void test_HYDROData_DTM::test_profile_properties()
 {
-  Handle(HYDROData_Document) aDoc = HYDROData_Document::Document(1);
+  Handle(HYDROData_Document) aDoc = HYDROData_Document::Document();
 
-  Handle(HYDROData_Profile) aProfile = 
+  Handle(HYDROData_Profile) aProfile =
     Handle(HYDROData_Profile)::DownCast( aDoc->CreateObject( KIND_PROFILE ) );
 
   aProfile->SetParametricPoints( points );
@@ -332,9 +332,9 @@ void test_HYDROData_DTM::test_profile_properties()
 
 void test_HYDROData_DTM::test_profile_discretization_polyline()
 {
-  Handle(HYDROData_Document) aDoc = HYDROData_Document::Document(1);
+  Handle(HYDROData_Document) aDoc = HYDROData_Document::Document();
 
-  Handle(HYDROData_Profile) aProfile = 
+  Handle(HYDROData_Profile) aProfile =
     Handle(HYDROData_Profile)::DownCast( aDoc->CreateObject( KIND_PROFILE ) );
 
   aProfile->SetParametricPoints( points );
@@ -371,9 +371,9 @@ void test_HYDROData_DTM::test_profile_discretization_polyline()
 
 void test_HYDROData_DTM::test_profile_discretization_spline()
 {
-Handle(HYDROData_Document) aDoc = HYDROData_Document::Document(1);
+Handle(HYDROData_Document) aDoc = HYDROData_Document::Document();
 
-  Handle(HYDROData_Profile) aProfile = 
+  Handle(HYDROData_Profile) aProfile =
     Handle(HYDROData_Profile)::DownCast( aDoc->CreateObject( KIND_PROFILE ) );
 
   aProfile->SetParametricPoints( points );
@@ -479,12 +479,12 @@ void test_HYDROData_DTM::test_curves_interpolation()
 
 void test_HYDROData_DTM::test_curve_to_3d()
 {
-  Handle(HYDROData_Document) aDoc = HYDROData_Document::Document(1);
+  Handle(HYDROData_Document) aDoc = HYDROData_Document::Document();
 
-  Handle(HYDROData_Profile) aProfile1 = 
+  Handle(HYDROData_Profile) aProfile1 =
     Handle(HYDROData_Profile)::DownCast( aDoc->CreateObject( KIND_PROFILE ) );
 
-  Handle(HYDROData_Profile) aProfile2 = 
+  Handle(HYDROData_Profile) aProfile2 =
     Handle(HYDROData_Profile)::DownCast( aDoc->CreateObject( KIND_PROFILE ) );
 
   aProfile1->SetParametricPoints( points );
@@ -523,14 +523,14 @@ void test_HYDROData_DTM::test_curve_to_3d()
 
 void test_HYDROData_DTM::test_presentation()
 {
-  Handle(HYDROData_Document) aDoc = HYDROData_Document::Document(1);
+  Handle(HYDROData_Document) aDoc = HYDROData_Document::Document();
 
   Handle(HYDROData_DTM) DTM = Handle(HYDROData_DTM)::DownCast( aDoc->CreateObject( KIND_DTM ) );
 
-  Handle(HYDROData_Profile) aProfile1 = 
+  Handle(HYDROData_Profile) aProfile1 =
     Handle(HYDROData_Profile)::DownCast( aDoc->CreateObject( KIND_PROFILE ) );
 
-  Handle(HYDROData_Profile) aProfile2 = 
+  Handle(HYDROData_Profile) aProfile2 =
     Handle(HYDROData_Profile)::DownCast( aDoc->CreateObject( KIND_PROFILE ) );
 
   aProfile1->SetParametricPoints( points );
@@ -552,8 +552,8 @@ void test_HYDROData_DTM::test_presentation()
   DTM->SetSpatialStep( 1.0 );
   CPPUNIT_ASSERT_DOUBLES_EQUAL( 1.0, DTM->GetSpatialStep(), EPS );
   DTM->Update();
-  
-  CPPUNIT_ASSERT_EQUAL( 9108, (int)DTM->GetAltitudePoints().size() ); 
+
+  CPPUNIT_ASSERT_EQUAL( 9108, (int)DTM->GetAltitudePoints().size() );
 
   Handle(AIS_InteractiveContext) aContext = TestViewer::context();
   HYDROGUI_ShapeBathymetry* aBathPrs = new HYDROGUI_ShapeBathymetry( 0, aContext, DTM );
@@ -578,14 +578,14 @@ void test_HYDROData_DTM::test_presentation()
 
 void test_HYDROData_DTM::test_garonne()
 {
-  Handle(HYDROData_Document) aDoc = HYDROData_Document::Document(1);
-  
+  Handle(HYDROData_Document) aDoc = HYDROData_Document::Document();
+
   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 );
 
@@ -606,14 +606,14 @@ void test_HYDROData_DTM::test_garonne()
   CPPUNIT_ASSERT_DOUBLES_EQUAL( 0.1, DTM->GetDDZ(), EPS );
   CPPUNIT_ASSERT_DOUBLES_EQUAL( 1.0, DTM->GetSpatialStep(), EPS );
   DTM->Update();
-  
-  CPPUNIT_ASSERT_EQUAL( 281898, (int)DTM->GetAltitudePoints().size() ); 
-  
+
+  CPPUNIT_ASSERT_EQUAL( 281898, (int)DTM->GetAltitudePoints().size() );
+
   Handle(AIS_InteractiveContext) aContext = TestViewer::context();
   HYDROGUI_ShapeBathymetry* aBathPrs = new HYDROGUI_ShapeBathymetry( 0, aContext, DTM );
   aBathPrs->update( true, false );
   aBathPrs->RescaleDefault();
-  
+
   bool ColorScaleIsDisp = TestViewer::ColorScaleIsDisplayed();
 
   TestViewer::showColorScale( true );
@@ -622,7 +622,7 @@ void test_HYDROData_DTM::test_garonne()
   aCS->SetMax( 25.0 );
   aCS->SetNumberOfIntervals( 30 );
   aBathPrs->UpdateWithColorScale( aCS );
-  
+
   QImage aDTMPrs = draw_DTM( aBathPrs, 0.5, 600, 600 );
   CPPUNIT_ASSERT_IMAGES3( &aDTMPrs, "DTM_2", false );
   TestViewer::showColorScale( ColorScaleIsDisp );
@@ -634,13 +634,13 @@ void test_HYDROData_DTM::test_classifier_1()
 {
   TCollection_AsciiString fname = REF_DATA_PATH.toLatin1().data();
   fname += "/pb_1066.cbf";
-  CPPUNIT_ASSERT_EQUAL( (int)DocError_OK, (int)HYDROData_Document::Load( fname.ToCString(), 1 ) );
+  CPPUNIT_ASSERT_EQUAL( (int)DocError_OK, (int)HYDROData_Document::Load( fname.ToCString() ) );
+
+  Handle(HYDROData_Document) aDoc = HYDROData_Document::Document();
 
-  Handle(HYDROData_Document) aDoc = HYDROData_Document::Document(1);
-  
-  Handle(HYDROData_CalculationCase) aCase = 
+  Handle(HYDROData_CalculationCase) aCase =
     Handle(HYDROData_CalculationCase)::DownCast( aDoc->FindObjectByName( "Case_1" ) );
-  CPPUNIT_ASSERT_EQUAL( false, aCase.IsNull() ); 
+  CPPUNIT_ASSERT_EQUAL( false, aCase.IsNull() );
   std::vector<gp_XY> points;
   points.push_back( gp_XY( 43.4842, 3.33176  ) );
   points.push_back( gp_XY( -125.777, 2.24728 ) );
@@ -672,10 +672,10 @@ 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 = 
+    Handle(HYDROData_Profile) aProfile =
       Handle(HYDROData_Profile)::DownCast( aDoc->CreateObject( KIND_PROFILE ) );
 
     NCollection_Sequence<gp_XY> pnts;
@@ -698,7 +698,7 @@ void test_HYDROData_DTM::test_profile_discretization_warnings()
     CPPUNIT_ASSERT( warnings.contains("One of the extreme points is higher than another"));
   }
   {
-    Handle(HYDROData_Profile) aProfile = 
+    Handle(HYDROData_Profile) aProfile =
       Handle(HYDROData_Profile)::DownCast( aDoc->CreateObject( KIND_PROFILE ) );
 
     NCollection_Sequence<gp_XY> pnts;
@@ -723,7 +723,7 @@ void test_HYDROData_DTM::test_profile_discretization_warnings()
   }
   {
     //plato case
-    Handle(HYDROData_Profile) aProfile = 
+    Handle(HYDROData_Profile) aProfile =
       Handle(HYDROData_Profile)::DownCast( aDoc->CreateObject( KIND_PROFILE ) );
 
     NCollection_Sequence<gp_XY> pnts;