X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FHYDRO_tests%2Ftest_HYDROGUI_BathymetryPrs.cxx;h=99c2ea2ed31680e5243801b6fd39d876a9e23c81;hb=3bece499e83cc9ca95536228c7f6740030e9d5d8;hp=9523ab4c17adaa1ebaca62f4c9d50780fffdf5e2;hpb=988bd1963f29e4e923cf3fd6c06cf9033f7670ae;p=modules%2Fhydro.git

diff --git a/src/HYDRO_tests/test_HYDROGUI_BathymetryPrs.cxx b/src/HYDRO_tests/test_HYDROGUI_BathymetryPrs.cxx
index 9523ab4c..99c2ea2e 100644
--- a/src/HYDRO_tests/test_HYDROGUI_BathymetryPrs.cxx
+++ b/src/HYDRO_tests/test_HYDROGUI_BathymetryPrs.cxx
@@ -21,6 +21,7 @@
 #include <TestViewer.h>
 #include <AIS_ColorScale.hxx>
 #include <OCCViewer_ViewWindow.h>
+#include <OCCViewer_ViewFrame.h>
 #include <OCCViewer_ViewPort3d.h>
 #include <QTest>
 
@@ -42,7 +43,7 @@ void test_HYDROGUI_BathymetryPrs::createBathPrs()
 {
   myBathPrs = new HYDROGUI_ShapeBathymetry( 0, TestViewer::context(), myBath );
   myBathPrs->Build();
-  myBathPrs->getAISObject()->SetAutoHilight( Standard_False );
+  myBathPrs->getAISObjects()[0]->SetAutoHilight( Standard_False );
 
   double min, max;
   myBathPrs->GetRange( min, max );
@@ -59,19 +60,18 @@ void test_HYDROGUI_BathymetryPrs::updateColors()
   myBathPrs->UpdateWithColorScale( TestViewer::colorScale() );
 }
 
-
 void test_HYDROGUI_BathymetryPrs::test_presentation()
 {
-  TestViewer::eraseAll( true );
-  Handle(HYDROData_Document) aDoc = HYDROData_Document::Document(1);
-  
+  TestViewer::eraseAll( true, true );
+  Handle(HYDROData_Document) aDoc = HYDROData_Document::Document();
+
   importTestBath( aDoc );
   TestViewer::showColorScale( false );
 
   createBathPrs();
   updateColors();
 
-  Handle(AIS_InteractiveObject) bprs = myBathPrs->getAISObject();
+  Handle(AIS_InteractiveObject) bprs = myBathPrs->getAISObjects()[0];
   CPPUNIT_ASSERT( !bprs.IsNull() );
 
   TestViewer::show( bprs, 0, 0, true, "bathy_prs" );
@@ -79,7 +79,7 @@ void test_HYDROGUI_BathymetryPrs::test_presentation()
   //QTest::qWait( 50000 );
 
   aDoc->Close();
-  TestViewer::eraseAll( true );
+  TestViewer::eraseAll( true, true );
 }
 
 void select( int x1, int y1, int x2, int y2 )
@@ -94,8 +94,8 @@ void select( int x1, int y1, int x2, int y2 )
 
 void test_HYDROGUI_BathymetryPrs::test_selection()
 {
-  TestViewer::eraseAll( true );
-  Handle(HYDROData_Document) aDoc = HYDROData_Document::Document(1);
+  TestViewer::eraseAll( true, true );
+  Handle(HYDROData_Document) aDoc = HYDROData_Document::Document();
 
   importTestBath( aDoc );
   TestViewer::showColorScale( false );
@@ -103,7 +103,7 @@ void test_HYDROGUI_BathymetryPrs::test_selection()
   createBathPrs();
   updateColors();
 
-  Handle(AIS_InteractiveObject) bprs = myBathPrs->getAISObject();
+  Handle(AIS_InteractiveObject) bprs = myBathPrs->getAISObjects()[0];
   CPPUNIT_ASSERT( !bprs.IsNull() );
 
   TestViewer::show( bprs, 0, 1, true, "bathy_prs" );
@@ -120,13 +120,13 @@ void test_HYDROGUI_BathymetryPrs::test_selection()
   //QTest::qWait( 50000 );
 
   aDoc->Close();
-  TestViewer::eraseAll( true );
+  TestViewer::eraseAll( true, true );
 }
 
 void test_HYDROGUI_BathymetryPrs::test_rescale_by_selection()
 {
-  TestViewer::eraseAll( true );
-  Handle(HYDROData_Document) aDoc = HYDROData_Document::Document(1);
+  TestViewer::eraseAll( true, true );
+  Handle(HYDROData_Document) aDoc = HYDROData_Document::Document();
 
   importTestBath( aDoc );
   TestViewer::showColorScale( false );
@@ -134,7 +134,7 @@ void test_HYDROGUI_BathymetryPrs::test_rescale_by_selection()
   createBathPrs();
   updateColors();
 
-  Handle(AIS_InteractiveObject) bprs = myBathPrs->getAISObject();
+  Handle(AIS_InteractiveObject) bprs = myBathPrs->getAISObjects()[0];
   CPPUNIT_ASSERT( !bprs.IsNull() );
 
   TestViewer::show( bprs, 0, 1, true, "bathy_prs" );
@@ -149,7 +149,7 @@ void test_HYDROGUI_BathymetryPrs::test_rescale_by_selection()
 
   double min, max;
   myBathPrs->GetRange( min, max );
-  CPPUNIT_ASSERT_DOUBLES_EQUAL( 177.78, min, EPS );
+  CPPUNIT_ASSERT_DOUBLES_EQUAL( 175.56, min, EPS );
   CPPUNIT_ASSERT_DOUBLES_EQUAL( 182.70, max, EPS );
 
   TestViewer::colorScale()->GetRange( min, max );
@@ -179,13 +179,13 @@ void test_HYDROGUI_BathymetryPrs::test_rescale_by_selection()
   //QTest::qWait( 50000 );
 
   aDoc->Close();
-  TestViewer::eraseAll( true );
+  TestViewer::eraseAll( true, true );
 }
 
 void test_HYDROGUI_BathymetryPrs::test_rescale_by_visible()
 {
-  TestViewer::eraseAll( true );
-  Handle(HYDROData_Document) aDoc = HYDROData_Document::Document(1);
+  TestViewer::eraseAll( true, true );
+  Handle(HYDROData_Document) aDoc = HYDROData_Document::Document();
 
   importTestBath( aDoc );
   TestViewer::showColorScale( false );
@@ -193,7 +193,7 @@ void test_HYDROGUI_BathymetryPrs::test_rescale_by_visible()
   createBathPrs();
   updateColors();
 
-  Handle(AIS_InteractiveObject) bprs = myBathPrs->getAISObject();
+  Handle(AIS_InteractiveObject) bprs = myBathPrs->getAISObjects()[0];
   CPPUNIT_ASSERT( !bprs.IsNull() );
 
   TestViewer::show( bprs, 0, 1, true, "bathy_prs" );
@@ -226,13 +226,13 @@ void test_HYDROGUI_BathymetryPrs::test_rescale_by_visible()
 
   //QTest::qWait( 50000 );
   aDoc->Close();
-  TestViewer::eraseAll( true );
+  TestViewer::eraseAll( true, true );
 }
 
 void test_HYDROGUI_BathymetryPrs::test_text_presentation()
 {
-  TestViewer::eraseAll( true );
-  Handle(HYDROData_Document) aDoc = HYDROData_Document::Document(1);
+  TestViewer::eraseAll( true, true );
+  Handle(HYDROData_Document) aDoc = HYDROData_Document::Document();
 
   importTestBath( aDoc );
   TestViewer::showColorScale( false );
@@ -240,7 +240,7 @@ void test_HYDROGUI_BathymetryPrs::test_text_presentation()
   createBathPrs();
   updateColors();
 
-  Handle(AIS_InteractiveObject) bprs = myBathPrs->getAISObject();
+  Handle(AIS_InteractiveObject) bprs = myBathPrs->getAISObjects()[0];
   CPPUNIT_ASSERT( !bprs.IsNull() );
 
   TestViewer::show( bprs, 0, 1, true, "bathy_prs" );
@@ -277,13 +277,13 @@ void test_HYDROGUI_BathymetryPrs::test_text_presentation()
   //QTest::qWait( 50000 );
 
   aDoc->Close();
-  TestViewer::eraseAll( true );
+  TestViewer::eraseAll( true, true );
 }
 
 void test_HYDROGUI_BathymetryPrs::test_rescale_default()
 {
-  TestViewer::eraseAll( true );
-  Handle(HYDROData_Document) aDoc = HYDROData_Document::Document(1);
+  TestViewer::eraseAll( true, true );
+  Handle(HYDROData_Document) aDoc = HYDROData_Document::Document();
 
   importTestBath( aDoc );
   TestViewer::showColorScale( false );
@@ -291,7 +291,7 @@ void test_HYDROGUI_BathymetryPrs::test_rescale_default()
   createBathPrs();
   updateColors();
 
-  Handle(AIS_InteractiveObject) bprs = myBathPrs->getAISObject();
+  Handle(AIS_InteractiveObject) bprs = myBathPrs->getAISObjects()[0];
   CPPUNIT_ASSERT( !bprs.IsNull() );
 
   TestViewer::show( bprs, 0, 1, true, "bathy_prs" );
@@ -334,13 +334,13 @@ void test_HYDROGUI_BathymetryPrs::test_rescale_default()
   //QTest::qWait( 50000 );
 
   aDoc->Close();
-  TestViewer::eraseAll( true );
+  TestViewer::eraseAll( true, true );
 }
 
 void test_HYDROGUI_BathymetryPrs::test_fit_on_selected()
 {
-  TestViewer::eraseAll( true );
-  Handle(HYDROData_Document) aDoc = HYDROData_Document::Document(1);
+  TestViewer::eraseAll( true, true );
+  Handle(HYDROData_Document) aDoc = HYDROData_Document::Document();
 
   importTestBath( aDoc );
   TestViewer::showColorScale( false );
@@ -348,7 +348,7 @@ void test_HYDROGUI_BathymetryPrs::test_fit_on_selected()
   createBathPrs();
   updateColors();
 
-  Handle(AIS_InteractiveObject) bprs = myBathPrs->getAISObject();
+  Handle(AIS_InteractiveObject) bprs = myBathPrs->getAISObjects()[0];
   CPPUNIT_ASSERT( !bprs.IsNull() );
 
   TestViewer::show( bprs, 0, 1, true, "bathy_prs" );
@@ -364,5 +364,5 @@ void test_HYDROGUI_BathymetryPrs::test_fit_on_selected()
   //QTest::qWait( 50000 );
 
   aDoc->Close();
-  TestViewer::eraseAll( true );
+  TestViewer::eraseAll( true, true );
 }