Correction for hydro_test

[modules/hydro.git] / src / HYDRO_tests / test_Overview.cxx

diff --git a/src/HYDRO_tests/test_Overview.cxx b/src/HYDRO_tests/test_Overview.cxx
index 4fef7e2185848d10bce4e1edd591bfbcccc582bb..9bf5e7f4dea782c5708da5c6d200dfa17e6994d9 100644 (file)
--- a/src/HYDRO_tests/test_Overview.cxx
+++ b/src/HYDRO_tests/test_Overview.cxx
@@ -58,7 +58,8 @@ QImage test_Overview::dumpViews()
   QImage aMain = TestViewer::viewWindow()->getView(OCCViewer_ViewFrame::MAIN_VIEW)->dumpView();
   QImage anOverview = myOverview->dump();
 
-  aMain = aMain.rgbSwapped();              //PATCH for image came from OCCT dump
+  if (SWAP_RGB)
+    aMain = aMain.rgbSwapped();              //PATCH for image came from OCCT dump
   //anOverview = anOverview.rgbSwapped();  //overview dump already normalizes the image, the line is not necessary!!!
 
   int w1 = aMain.width();
@@ -74,9 +75,6 @@ QImage test_Overview::dumpViews()
   QPainter painter( &pix );
   painter.setPen( PSOLID );
 
-  painter.drawRect( WIDTH, WIDTH, w2, h2 );
-  painter.drawRect( w2+WIDTH, WIDTH, w1, h1 );
-
   //static int q = 0;
   //q++;
   //anOverview.save( QString( "/tmp/hydro/overview_" ) + QString::number( q ) + ".png" );
@@ -85,12 +83,17 @@ QImage test_Overview::dumpViews()
   painter.drawImage( WIDTH, WIDTH, anOverview );
   painter.drawImage( w2+WIDTH, WIDTH, aMain );
 
+  painter.drawRect( WIDTH, WIDTH, w2, h2 );
+  painter.drawRect( w2+WIDTH, WIDTH, w1, h1 );
+
   QImage res = pix.toImage();
   //res.save( QString( "/tmp/hydro/result_" ) + QString::number( q ) + ".png" );
   
   return res;
 }
 
+extern int MAIN_W, MAIN_H;
+
 void test_Overview::create()
 {
   TestViewer::eraseAll( true, true );
@@ -109,7 +112,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 +184,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 +251,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" );