X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2FHYDRO_tests%2FTestViewer.h;h=20500d534d9c71a8388bbf8f5a2adbad55b87a18;hb=5ac23856072a615487ce98401d28fb3b7934150c;hp=54602171ab394c13867b76f9a5a765f8bf180c0c;hpb=d89b531334d90aa48861e4ffb51f44852829554d;p=modules%2Fhydro.git diff --git a/src/HYDRO_tests/TestViewer.h b/src/HYDRO_tests/TestViewer.h index 54602171..20500d53 100644 --- a/src/HYDRO_tests/TestViewer.h +++ b/src/HYDRO_tests/TestViewer.h @@ -19,10 +19,11 @@ #pragma once #include +#include class OCCViewer_ViewManager; class OCCViewer_Viewer; -class OCCViewer_ViewWindow; +class OCCViewer_ViewFrame; class TopoDS_Shape; class QString; class QColor; @@ -30,22 +31,29 @@ class QImage; class AIS_InteractiveObject; class AIS_ColorScale; +#define OCC_VERSION_LARGE (OCC_VERSION_MAJOR << 24 | OCC_VERSION_MINOR << 16 | OCC_VERSION_MAINTENANCE << 8) +#if OCC_VERSION_LARGE >= 0x07020000 +const bool SWAP_RGB = false; +#else +const bool SWAP_RGB = true; +#endif + class TestViewer { public: static OCCViewer_ViewManager* viewManager(); static OCCViewer_Viewer* viewer(); - static OCCViewer_ViewWindow* viewWindow(); + static OCCViewer_ViewFrame* viewWindow(); static Handle(AIS_InteractiveContext) context(); - static void eraseAll( bool isUpdate ); + static void eraseAll( bool isUpdate, bool eraseStructures = false ); static void show( const Handle(AIS_InteractiveObject)& theObject, int theMode, int theSelectionMode, bool isFitAll, const char* theKey ); static void show( const TopoDS_Shape& theShape, int theMode, bool isFitAll, const QColor& theColor, int theUIANb = 10, int theVIANb = 10); static void show( const TopoDS_Shape& theShape, int theMode, bool isFitAll, const char* theKey, int theUIANb = 10, int theVIANb = 10); - static bool AssertImages( QString& theMessage, const QImage* = 0, const char* theCase = 0 ); + static bool AssertImages( QString& theMessage, const QImage* = 0, const char* theCase = 0, bool swapRGB = SWAP_RGB ); static QColor GetColor(int i); static Handle(AIS_ColorScale) colorScale(); @@ -61,10 +69,12 @@ public: QString& theMsg ); static void setKey( const QString& ); + static void fitAll(); + static QImage diff( const QImage& im1, const QImage& im2 ); private: static OCCViewer_ViewManager* myViewManager; - static OCCViewer_ViewWindow* myViewWindow; + static OCCViewer_ViewFrame* myViewWindow; static QString myKey; }; @@ -90,6 +100,17 @@ private: } \ } \ +#define CPPUNIT_ASSERT_IMAGES3( theImage, theCase, theSwapRGB ) \ + { \ + QString aMessage; \ + if( !TestViewer::AssertImages( aMessage, theImage, theCase, theSwapRGB ) ) \ + { \ + TestViewer::showColorScale( false ); \ + std::string aMessageStl = aMessage.toStdString(); \ + CPPUNIT_FAIL( aMessageStl.c_str() ); \ + } \ + } + #define CPPUNIT_ASSERT_SCRIPTS_EQUAL( theBaseName, \ isExpectedUtf8, \ isActualUtf8, \