X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FHYDRO_tests%2Ftest_Overview.cxx;h=a58fca22aa107f706d2bc6a84cfe9e4193e605d0;hb=1a546e83afd325370d51bbdb245edd3057aeb297;hp=3850853de1bc2589651be036e7b2e34e0c313afe;hpb=ac056ee3c8e228f5b79eca9bad0fec624c595b1b;p=modules%2Fhydro.git

diff --git a/src/HYDRO_tests/test_Overview.cxx b/src/HYDRO_tests/test_Overview.cxx
index 3850853d..a58fca22 100644
--- a/src/HYDRO_tests/test_Overview.cxx
+++ b/src/HYDRO_tests/test_Overview.cxx
@@ -37,7 +37,7 @@ HYDROGUI_Overview* test_Overview::myOverview = 0;
   {                                                                      \
     QString aMessage;                                                    \
     QImage aDump = dumpViews();                                          \
-    if( !TestViewer::AssertImages( aMessage, &aDump, theCase ) )         \
+    if( !TestViewer::AssertImages( aMessage, &aDump, theCase, false ) )  \
     {                                                                    \
       TestViewer::showColorScale( false );                               \
       std::string aMessageStl = aMessage.toStdString();                  \
@@ -57,7 +57,7 @@ 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
+  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();
@@ -96,6 +96,7 @@ void test_Overview::create()
   myOverview->show();
   myOverview->setMainView( TestViewer::viewWindow() );
   TestViewer::viewWindow()->setGeometry( 400, 100, 800, 800 );
+  TestViewer::viewWindow()->onTopView();
   myOverview->setGeometry( 100, 100, 200, 200 );
 
   isPassed = true;
@@ -111,6 +112,7 @@ void test_Overview::showShape()
   BRep_Builder B;
   TopoDS_Shape shape;
   std::string fname = (REF_DATA_PATH + "/test_zone.brep").toStdString();
+  //std::cout << "Loading shape: " << fname << std::endl;
   BRepTools::Read( shape, fname.c_str(), B );
   TestViewer::show( shape, AIS_Shaded, true, 0x03399FF );
   
@@ -138,6 +140,7 @@ void fitAllWithRestore( OCCViewer_ViewPort3d* vp )
 void test_Overview::test_default()
 {
   create();
+  //QTest::qWait( 50000 );
   CPPUNIT_ASSERT_OVERVIEW( "overview_empty" );
 }
 
@@ -155,14 +158,15 @@ void test_Overview::test_actions_in_main()
 {
   create();
   showShape();
-
-  OCCViewer_ViewWindow* aMain = TestViewer::viewWindow()->getView( OCCViewer_ViewFrame::MAIN_VIEW );
-  OCCViewer_ViewPort3d* vp = aMain->getViewPort();
+  TestViewer::viewWindow()->onTopView();
 
   // 1. selection in main view
   QTest::mouseMove( TestViewer::viewWindow() );
   CPPUNIT_ASSERT_OVERVIEW( "overview_selection" );
 
+  OCCViewer_ViewWindow* aMain = TestViewer::viewWindow()->getView( OCCViewer_ViewFrame::MAIN_VIEW );
+  OCCViewer_ViewPort3d* vp = aMain->getViewPort();
+
   // 2. mouse wheel zoom
   QWheelEvent we( QPoint( 243, 416 ), 120*20, Qt::NoButton, Qt::NoModifier );
   qApp->sendEvent( vp, &we );
@@ -207,10 +211,29 @@ void test_Overview::test_set_mainview_2_times()
   myOverview->setMainView( TestViewer::viewWindow() );
   qApp->processEvents();
 
-  CPPUNIT_ASSERT_OVERVIEW( "overview_selection" );
+  CPPUNIT_ASSERT_OVERVIEW( "overview_selection_a" );
 }
 
 void test_Overview::test_actions_in_overview()
 {
-  //TODO
+  create();
+  showShape();
+  TestViewer::viewWindow()->onTopView();
+  QTest::mouseMove( TestViewer::viewWindow() );
+
+  OCCViewer_ViewWindow* aMain = TestViewer::viewWindow()->getView( OCCViewer_ViewFrame::MAIN_VIEW );
+  OCCViewer_ViewPort3d* vp = aMain->getViewPort();
+
+  QWheelEvent we( QPoint( 243, 416 ), 120*20, Qt::NoButton, Qt::NoModifier );
+  qApp->sendEvent( vp, &we );
+  qApp->processEvents();
+  CPPUNIT_ASSERT_OVERVIEW( "overview_zoomed_1" );
+
+  QTest::mouseMove( myOverview->getViewPort(false), QPoint( 150, 50 ) );
+  QTest::mouseClick( myOverview->getViewPort(false), Qt::LeftButton, Qt::KeyboardModifiers(), QPoint( 150, 50 ) );
+  qApp->processEvents();
+
+  CPPUNIT_ASSERT_OVERVIEW( "overview_drag" );
+
+  //QTest::qWait( 50000 );
 }