refs #1341: debug of automatic tests

diff --git a/src/HYDRO_tests/reference_data/linux/merge_faces_boxes_23.png b/src/HYDRO_tests/reference_data/linux/merge_faces_boxes_23.png
index 2bca4889d0829758d1049b5286d15b452bf9f009..6cbef462c582e30e3d36c10c8e2460e40af2eef5 100644 (file)
Binary files a/src/HYDRO_tests/reference_data/linux/merge_faces_boxes_23.png and b/src/HYDRO_tests/reference_data/linux/merge_faces_boxes_23.png differ

diff --git a/src/HYDRO_tests/reference_data/linux/merge_faces_boxes_24.png b/src/HYDRO_tests/reference_data/linux/merge_faces_boxes_24.png
index 9187ce5f9fe82329e10f6724989b3af79db5b41c..ee6c532c5b56dcf995dcce3e33645539727a9e87 100644 (file)
Binary files a/src/HYDRO_tests/reference_data/linux/merge_faces_boxes_24.png and b/src/HYDRO_tests/reference_data/linux/merge_faces_boxes_24.png differ

diff --git a/src/HYDRO_tests/reference_data/linux/merge_faces_circles_22.png b/src/HYDRO_tests/reference_data/linux/merge_faces_circles_22.png
index 4abe17aa0346d13eba3d0f8d9aa9733f3b321466..218889923ea874068a7fc7e9331980ec673a6451 100644 (file)
Binary files a/src/HYDRO_tests/reference_data/linux/merge_faces_circles_22.png and b/src/HYDRO_tests/reference_data/linux/merge_faces_circles_22.png differ

diff --git a/src/HYDRO_tests/reference_data/linux/merge_faces_circles_23.png b/src/HYDRO_tests/reference_data/linux/merge_faces_circles_23.png
index 58fffafb4f203fae6e6f58bb0fa5f41e2f7fe788..361057cd773beb90665000e0f7c594c33d9ba5fd 100644 (file)
Binary files a/src/HYDRO_tests/reference_data/linux/merge_faces_circles_23.png and b/src/HYDRO_tests/reference_data/linux/merge_faces_circles_23.png differ

diff --git a/src/HYDRO_tests/reference_data/linux/merge_faces_circles_24.png b/src/HYDRO_tests/reference_data/linux/merge_faces_circles_24.png
index 58fffafb4f203fae6e6f58bb0fa5f41e2f7fe788..361057cd773beb90665000e0f7c594c33d9ba5fd 100644 (file)
Binary files a/src/HYDRO_tests/reference_data/linux/merge_faces_circles_24.png and b/src/HYDRO_tests/reference_data/linux/merge_faces_circles_24.png differ

diff --git a/src/HYDRO_tests/reference_data/linux/overview_drag.png b/src/HYDRO_tests/reference_data/linux/overview_drag.png
index c8c241676f7dc1c585fcd444911bd7d472e7adaf..8c92e5793d54437b7f3943222dcbb0330b5624b0 100644 (file)
Binary files a/src/HYDRO_tests/reference_data/linux/overview_drag.png and b/src/HYDRO_tests/reference_data/linux/overview_drag.png differ

diff --git a/src/HYDRO_tests/reference_data/linux/overview_empty.png b/src/HYDRO_tests/reference_data/linux/overview_empty.png
index d650ce30ecd6ba846987d6d50bc4f636d3559140..5acc2b6b7bfa38788aabe7f86de2661c490e54f6 100644 (file)
Binary files a/src/HYDRO_tests/reference_data/linux/overview_empty.png and b/src/HYDRO_tests/reference_data/linux/overview_empty.png differ

diff --git a/src/HYDRO_tests/reference_data/linux/overview_panned_1.png b/src/HYDRO_tests/reference_data/linux/overview_panned_1.png
index 4027bede99c7885ce151e6c84b56ac6d59e2a55a..260de86c1cec6e48c9c37a17e3b89b568d6cec05 100644 (file)
Binary files a/src/HYDRO_tests/reference_data/linux/overview_panned_1.png and b/src/HYDRO_tests/reference_data/linux/overview_panned_1.png differ

diff --git a/src/HYDRO_tests/reference_data/linux/overview_prs.png b/src/HYDRO_tests/reference_data/linux/overview_prs.png
index c989e7d04dadf7b842caab530f28999d58c24821..b6d49e03849cb417aeb0673881b3a24087c2b7e0 100644 (file)
Binary files a/src/HYDRO_tests/reference_data/linux/overview_prs.png and b/src/HYDRO_tests/reference_data/linux/overview_prs.png differ

diff --git a/src/HYDRO_tests/reference_data/linux/overview_rotated_1.png b/src/HYDRO_tests/reference_data/linux/overview_rotated_1.png
index b28710f0174d8271d78510cadb911c37b66bc9e2..17f5401d9ef012ca84fe2a79726b9bbb7a5e8430 100644 (file)
Binary files a/src/HYDRO_tests/reference_data/linux/overview_rotated_1.png and b/src/HYDRO_tests/reference_data/linux/overview_rotated_1.png differ

diff --git a/src/HYDRO_tests/reference_data/linux/overview_selection.png b/src/HYDRO_tests/reference_data/linux/overview_selection.png
index 14cffa3181428e9530eca0048045262cb1d8c59b..4dcec63a3036004e9d7be01f7400c0e1ff4065e6 100644 (file)
Binary files a/src/HYDRO_tests/reference_data/linux/overview_selection.png and b/src/HYDRO_tests/reference_data/linux/overview_selection.png differ

diff --git a/src/HYDRO_tests/reference_data/linux/overview_selection_a.png b/src/HYDRO_tests/reference_data/linux/overview_selection_a.png
index dbecfe4e462d68bf0714bcaf945330f293df6c0c..f02fc39ea5f3dd1ee4bfc5dc2ae723bd113d4f02 100644 (file)
Binary files a/src/HYDRO_tests/reference_data/linux/overview_selection_a.png and b/src/HYDRO_tests/reference_data/linux/overview_selection_a.png differ

diff --git a/src/HYDRO_tests/reference_data/linux/overview_zoomed_1.png b/src/HYDRO_tests/reference_data/linux/overview_zoomed_1.png
index da9ec2b520acb0bbfcf425a0384cc01f54313c53..0cd59c2a9632a7fd9b3d79e21223b43e1541919a 100644 (file)
Binary files a/src/HYDRO_tests/reference_data/linux/overview_zoomed_1.png and b/src/HYDRO_tests/reference_data/linux/overview_zoomed_1.png differ

diff --git a/src/HYDRO_tests/reference_data/linux/overview_zoomed_2.png b/src/HYDRO_tests/reference_data/linux/overview_zoomed_2.png
index 712d335ef034fa0e0e1a667f08af4a9c4b8e7748..086299fc9be4f0b1aef67524ed22088132ddc7c8 100644 (file)
Binary files a/src/HYDRO_tests/reference_data/linux/overview_zoomed_2.png and b/src/HYDRO_tests/reference_data/linux/overview_zoomed_2.png differ

diff --git a/src/HYDRO_tests/test_HYDROData_Main.cxx b/src/HYDRO_tests/test_HYDROData_Main.cxx
index a3c68444595ab31a813053a0edbb4a2aaab52e13..3c41a03228bfcfb5d1bd4ce3cb36f86e562df924 100644 (file)
--- a/src/HYDRO_tests/test_HYDROData_Main.cxx
+++ b/src/HYDRO_tests/test_HYDROData_Main.cxx
@@ -39,6 +39,7 @@ QString REF_DATA_PATH = qgetenv( "HYDRO_ROOT_DIR" ) + "/bin/salome/test/HYDRO";
 QString REF_DATA_PATH = qgetenv( "HYDRO_ROOT_DIR" ) + "/bin/salome/test/HYDRO/HYDRO";
 #endif
 
+int MAIN_W = 800, MAIN_H = 600;
 
 int main( int argc, char* argv[] )
 {
@@ -48,14 +49,13 @@ int main( int argc, char* argv[] )
 
   OCCViewer_ViewFrame* aWindow = TestViewer::viewWindow();
 
-  int W = 800, H = 600;
-  aWindow->setGeometry( 200, 200, W, H );
+  aWindow->setGeometry( 400, 100, MAIN_W, MAIN_H );
   aWindow->show();
   QTest::qWaitForWindowExposed( aWindow );
 
   int dy = 34;
   //std::cout << dx << "," << dy << std::endl;
-  aWindow->resize( W, H+dy );
+  aWindow->resize( MAIN_W, MAIN_H+dy );
   anApp.processEvents();
 
   std::string testPath = (argc > 1) ? std::string(argv[1]) : "";

diff --git a/src/HYDRO_tests/test_Overview.cxx b/src/HYDRO_tests/test_Overview.cxx
index 4fef7e2185848d10bce4e1edd591bfbcccc582bb..a83af23d8a4045591e875a1d865393d489a9e1bb 100644 (file)
--- a/src/HYDRO_tests/test_Overview.cxx
+++ b/src/HYDRO_tests/test_Overview.cxx
@@ -91,6 +91,8 @@ QImage test_Overview::dumpViews()
   return res;
 }
 
+extern int MAIN_W, MAIN_H;
+
 void test_Overview::create()
 {
   TestViewer::eraseAll( true, true );
@@ -109,7 +111,7 @@ void test_Overview::create()
     isCreated = true;
   }
   myOverview->setMainView( TestViewer::viewWindow() );
-  TestViewer::viewWindow()->setGeometry( 400, 100, 800, 800 );
+  //TestViewer::viewWindow()->setGeometry( 400, 100, MAIN_W, MAIN_H );
   TestViewer::viewWindow()->onTopView();
   myOverview->setGeometry( 100, 100, 200, 200 );
 }
@@ -181,14 +183,14 @@ void test_Overview::test_actions_in_main()
   CPPUNIT_ASSERT_OVERVIEW( "overview_selection" );
 
   // 2. mouse wheel zoom
-  QWheelEvent we( QPoint( 243, 416 ), 120*20, Qt::NoButton, Qt::NoModifier );
+  QWheelEvent we( QPoint( 243, 316 ), 120*20, Qt::NoButton, Qt::NoModifier );
   qApp->sendEvent( vp, &we );
   qApp->processEvents();
   CPPUNIT_ASSERT_OVERVIEW( "overview_zoomed_1" );
 
   // 3. zoom via mouse
   const int d = 100;
-  vp->zoom( 243, 416, 243+d, 416+d ); 
+  vp->zoom( 243, 316, 243+d, 316+d ); 
   CPPUNIT_ASSERT_OVERVIEW( "overview_zoomed_2" );
 
   // 4. panning via mouse
@@ -248,7 +250,7 @@ void test_Overview::test_actions_in_overview()
   TestViewer::context()->Select( Standard_True );
   qApp->processEvents();
 
-  QWheelEvent we( QPoint( 243, 416 ), 120*20, Qt::NoButton, Qt::NoModifier );
+  QWheelEvent we( QPoint( 243, 316 ), 120*20, Qt::NoButton, Qt::NoModifier );
   qApp->sendEvent( vp, &we );
   qApp->processEvents();
   CPPUNIT_ASSERT_OVERVIEW( "overview_zoomed_1" );