debug of tests

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

diff --git a/src/HYDRO_tests/TestViewer.cxx b/src/HYDRO_tests/TestViewer.cxx
index f3c3215206266131e7968b0b3731cfbbc05344cb..080f9b9ddd8ad042c2c3f28c2defc55f125a90e8 100644 (file)
--- a/src/HYDRO_tests/TestViewer.cxx
+++ b/src/HYDRO_tests/TestViewer.cxx
@@ -30,7 +30,7 @@
 #ifdef WIN32
   #pragma warning ( disable: 4251 )
 #endif
-#include <OCCViewer_ViewWindow.h>
+#include <OCCViewer_ViewFrame.h>
 #ifdef WIN32
   #pragma warning ( disable: 4251 )
 #endif
@@ -56,7 +56,7 @@
 #include <cppunit/TestAssert.h>
 
 OCCViewer_ViewManager* TestViewer::myViewManager = 0;
-OCCViewer_ViewWindow* TestViewer::myViewWindow = 0;
+OCCViewer_ViewFrame* TestViewer::myViewWindow = 0;
 QString TestViewer::myKey = "";
 
 OCCViewer_ViewManager* TestViewer::viewManager()
@@ -72,7 +72,7 @@ OCCViewer_ViewManager* TestViewer::viewManager()
   aViewer->setZoomingStyle( 1 );
 
   myViewManager->setViewModel( aViewer );
-  myViewWindow = dynamic_cast<OCCViewer_ViewWindow*>( myViewManager->createViewWindow() );
+  myViewWindow = dynamic_cast<OCCViewer_ViewFrame*>( myViewManager->createViewWindow() );
 
   return myViewManager;
 }
@@ -82,7 +82,7 @@ OCCViewer_Viewer* TestViewer::viewer()
   return dynamic_cast<OCCViewer_Viewer*>( viewManager()->getViewModel() );
 }
 
-OCCViewer_ViewWindow* TestViewer::viewWindow()
+OCCViewer_ViewFrame* TestViewer::viewWindow()
 {
   viewManager(); //to create the view if it was not created earlier
   return myViewWindow;
@@ -144,10 +144,13 @@ void TestViewer::show( const Handle(AIS_InteractiveObject)& theObject,
     context()->Display( theObject, theMode, theSelectionMode );
 
   if( isFitAll )
-  {
-    viewWindow()->onTopView();
-    viewWindow()->onFitAll();
-  }
+    fitAll();
+}
+
+void TestViewer::fitAll()
+{
+  viewWindow()->onTopView();
+  viewWindow()->onFitAll();
 }
 
 void TestViewer::show( const TopoDS_Shape& theShape, int theMode, bool isFitAll, const QColor& theColor,
@@ -169,10 +172,7 @@ void TestViewer::show( const TopoDS_Shape& theShape, int theMode, bool isFitAll,
   context()->Display( aShape, theMode, 0, Standard_False );
 
   if( isFitAll )
-  {
-    viewWindow()->onTopView();
-    viewWindow()->onFitAll();
-  }
+    fitAll();
 }
 void TestViewer::show( const TopoDS_Shape& theShape, int theMode, bool isFitAll, const char* theKey,
                        int theUIANb, int theVIANb)
@@ -219,10 +219,7 @@ void TestViewer::show( const TopoDS_Shape& theShape, int theMode, bool isFitAll,
     show( aLE.Value(), theMode, false, GetColor(i) );
 
   if( isFitAll )
-  {
-    viewWindow()->onTopView();
-    viewWindow()->onFitAll();
-  }
+    fitAll();
 }
 
 /*void TestViewer::ShowShape(const TopoDS_Shape& theShape, int theMode, int& i)
@@ -268,16 +265,15 @@ bool AreImagesEqual( const QImage& theImage1, const QImage& theImage2, double th
   return true;
 }
 
-bool TestViewer::AssertImages( QString& theMessage, const QImage* theImage, const char* theCase )
+bool TestViewer::AssertImages( QString& theMessage, const QImage* theImage, const char* theCase, bool swapRGB )
 {
   QImage anActualImage;
   if( theImage )
     anActualImage = *theImage;
   else
-    anActualImage = viewWindow()->dumpView();
+    anActualImage = viewWindow()->getView(OCCViewer_ViewFrame::MAIN_VIEW)->dumpView();
 
-  const bool SWAP_RGB_ORDER = true;
-  if( SWAP_RGB_ORDER )
+  if( swapRGB )
   {
     // A temporary patch for bug in SALOME/OCC dump; the result image contains swapped RGB colors
     anActualImage = anActualImage.rgbSwapped();