refs #1327: debug of automatic tests

diff --git a/src/HYDROGUI/HYDROGUI_BathymetryPrs.cxx b/src/HYDROGUI/HYDROGUI_BathymetryPrs.cxx
index a08073c47d309d0d83b95135bbe21cb71d998806..3eef5d64c6f5e99a0e19b3c2d4b2583c91cb646e 100644 (file)
--- a/src/HYDROGUI/HYDROGUI_BathymetryPrs.cxx
+++ b/src/HYDROGUI/HYDROGUI_BathymetryPrs.cxx
@@ -31,7 +31,7 @@ const int BATH_HIGHLIGHT_MODE = 10;
 HYDROGUI_BathymetryPrs::HYDROGUI_BathymetryPrs()
 {
   SetHilightMode( BATH_HIGHLIGHT_MODE );
-  SetAutoHilight( Standard_True );
+  SetAutoHilight( Standard_False );
 }
 
 HYDROGUI_BathymetryPrs::~HYDROGUI_BathymetryPrs()

diff --git a/src/HYDRO_tests/reference_data/bathy_prs.png b/src/HYDRO_tests/reference_data/bathy_prs.png
index 6c9bd4e9073ccfcfa06c4dd27108bd06cb84ae40..727113fd0061ffca25d0c48c4fbbac81c85246d5 100644 (file)
Binary files a/src/HYDRO_tests/reference_data/bathy_prs.png and b/src/HYDRO_tests/reference_data/bathy_prs.png differ

diff --git a/src/HYDRO_tests/reference_data/bathy_rescaled_selection.png b/src/HYDRO_tests/reference_data/bathy_rescaled_selection.png
index 49a1d9acfff88898972f4dd64a1433b816c10472..935cb390cd9db9df3d81a47d7ad16904319dcdc7 100644 (file)
Binary files a/src/HYDRO_tests/reference_data/bathy_rescaled_selection.png and b/src/HYDRO_tests/reference_data/bathy_rescaled_selection.png differ

diff --git a/src/HYDRO_tests/reference_data/bathy_rescaled_user.png b/src/HYDRO_tests/reference_data/bathy_rescaled_user.png
index 5d1a50671ecbcc5afc0cca376499fb95d05b3d10..da49b3014ecc443f31fe6c6abef2b76dd919542e 100644 (file)
Binary files a/src/HYDRO_tests/reference_data/bathy_rescaled_user.png and b/src/HYDRO_tests/reference_data/bathy_rescaled_user.png differ

diff --git a/src/HYDRO_tests/reference_data/bathy_rescaled_visible.png b/src/HYDRO_tests/reference_data/bathy_rescaled_visible.png
index 90492b5ffb1cf397607964ce89ae697f9daa4081..b47ec36c668121376d71c5fc2a71820ebb0f360d 100644 (file)
Binary files a/src/HYDRO_tests/reference_data/bathy_rescaled_visible.png and b/src/HYDRO_tests/reference_data/bathy_rescaled_visible.png differ

diff --git a/src/HYDRO_tests/reference_data/bathy_selection.png b/src/HYDRO_tests/reference_data/bathy_selection.png
index 8379f45969f4ed1f6599633768376827b9e34339..410c192b1481ad845914fb39db20df72dc7b45ea 100644 (file)
Binary files a/src/HYDRO_tests/reference_data/bathy_selection.png and b/src/HYDRO_tests/reference_data/bathy_selection.png differ

diff --git a/src/HYDRO_tests/reference_data/bathy_text_labels.png b/src/HYDRO_tests/reference_data/bathy_text_labels.png
index a7c5d12007a8c597cd5353eb43484d238b571558..3899936e9d7cdfbb69c73412a284b6cd807efd91 100644 (file)
Binary files a/src/HYDRO_tests/reference_data/bathy_text_labels.png and b/src/HYDRO_tests/reference_data/bathy_text_labels.png differ

diff --git a/src/HYDRO_tests/test_HYDROGUI_BathymetryPrs.cxx b/src/HYDRO_tests/test_HYDROGUI_BathymetryPrs.cxx
index 39b7b9c9bbff892787b687f9805cc34de215e825..7d2b8b7c0b466c2d12bf06684877807c167a4332 100644 (file)
--- a/src/HYDRO_tests/test_HYDROGUI_BathymetryPrs.cxx
+++ b/src/HYDRO_tests/test_HYDROGUI_BathymetryPrs.cxx
@@ -93,6 +93,7 @@ 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);
 
   importTestBath( aDoc );
@@ -119,6 +120,7 @@ void test_HYDROGUI_BathymetryPrs::test_selection()
 
 void test_HYDROGUI_BathymetryPrs::test_rescale_by_selection()
 {
+  TestViewer::eraseAll( true );
   Handle(HYDROData_Document) aDoc = HYDROData_Document::Document(1);
 
   importTestBath( aDoc );
@@ -138,6 +140,8 @@ void test_HYDROGUI_BathymetryPrs::test_rescale_by_selection()
   myBathPrs->RescaleBySelection();
   updateColors(); // In HYDRO GUI it should be done by displayer
 
+  //QTest::qWait( 50000 );
+
   double min, max;
   myBathPrs->GetRange( min, max );
   CPPUNIT_ASSERT_DOUBLES_EQUAL( 177.78, min, EPS );
@@ -175,6 +179,7 @@ void test_HYDROGUI_BathymetryPrs::test_rescale_by_selection()
 
 void test_HYDROGUI_BathymetryPrs::test_rescale_by_visible()
 {
+  TestViewer::eraseAll( true );
   Handle(HYDROData_Document) aDoc = HYDROData_Document::Document(1);
 
   importTestBath( aDoc );
@@ -215,10 +220,13 @@ void test_HYDROGUI_BathymetryPrs::test_rescale_by_visible()
   CPPUNIT_ASSERT_IMAGES;
 
   //QTest::qWait( 50000 );
+  aDoc->Close();
+  TestViewer::eraseAll( true );
 }
 
 void test_HYDROGUI_BathymetryPrs::test_text_presentation()
 {
+  TestViewer::eraseAll( true );
   Handle(HYDROData_Document) aDoc = HYDROData_Document::Document(1);
 
   importTestBath( aDoc );
@@ -253,6 +261,7 @@ void test_HYDROGUI_BathymetryPrs::test_text_presentation()
 
 void test_HYDROGUI_BathymetryPrs::test_rescale_default()
 {
+  TestViewer::eraseAll( true );
   Handle(HYDROData_Document) aDoc = HYDROData_Document::Document(1);
 
   importTestBath( aDoc );