From: asl <asl@opencascade.com>
Date: Wed, 27 Sep 2017 13:03:49 +0000 (+0300)
Subject: refs #1327: debug of automatic tests
X-Git-Tag: v2.1~66^2~23
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=b3d612ecf0789b8f4cf4e82bf750e22eee15b088;p=modules%2Fhydro.git

refs #1327: debug of automatic tests
---

diff --git a/src/HYDROGUI/HYDROGUI_BathymetryPrs.cxx b/src/HYDROGUI/HYDROGUI_BathymetryPrs.cxx
index a08073c4..3eef5d64 100644
--- 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 6c9bd4e9..727113fd 100644
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 49a1d9ac..935cb390 100644
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 5d1a5067..da49b301 100644
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 90492b5f..b47ec36c 100644
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 8379f459..410c192b 100644
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 a7c5d120..3899936e 100644
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 39b7b9c9..7d2b8b7c 100644
--- 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 );