X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FHYDRO_tests%2FTestViewer.h;h=d5bd15d6aed14ff9f39c237f3f1792843dc4dcba;hb=9c947f35615e69e9e54a8c4b074dd1f2be13689c;hp=e825208bd147763461d40ebfa20e2a2db636a7c4;hpb=158b3949f0d12e3a4b36c6f37b270e0f7f037262;p=modules%2Fhydro.git

diff --git a/src/HYDRO_tests/TestViewer.h b/src/HYDRO_tests/TestViewer.h
index e825208b..d5bd15d6 100644
--- a/src/HYDRO_tests/TestViewer.h
+++ b/src/HYDRO_tests/TestViewer.h
@@ -7,6 +7,8 @@ class OCCViewer_ViewWindow;
 class TopoDS_Shape;
 class QString;
 class QColor;
+class Handle_AIS_InteractiveObject;
+class Handle_Aspect_ColorScale;
 
 class TestViewer
 {
@@ -15,11 +17,30 @@ public:
   static OCCViewer_Viewer* viewer();
   static OCCViewer_ViewWindow* viewWindow();
 
-  static void show( const TopoDS_Shape& theShape, const QColor& theColor, int theMode );
-  static void show( const TopoDS_Shape& theShape, int theMode, bool isFitAll = true );
-  static bool AssertEqual( const QString& theUseCaseName );
+  static void show( const Handle_AIS_InteractiveObject& theObject,
+                    int theMode, int theSelelctionMode, bool isFitAll, const char* theKey );
+  static void show( const TopoDS_Shape& theShape, int theMode, bool isFitAll, const QColor& theColor );
+  static void show( const TopoDS_Shape& theShape, int theMode, bool isFitAll, const char* theKey );
+  static bool AssertImages( QString& theMessage );
+  static QColor GetColor(int i);
+
+  static Handle_Aspect_ColorScale showColorScale( bool );
+
+  static void select( int theViewX, int theViewY );
 
 private:
   static OCCViewer_ViewManager* myViewManager;
   static OCCViewer_ViewWindow* myViewWindow;
+  static QString myKey;
 };
+
+#define CPPUNIT_ASSERT_IMAGES                              \
+  {                                                        \
+    QString aMessage;                                      \
+    if( !TestViewer::AssertImages( aMessage ) )            \
+    {                                                      \
+      std::string aMessageStl = aMessage.toStdString();    \
+      CPPUNIT_FAIL( aMessageStl.c_str() );                 \
+    }                                                      \
+  }                                                        \
+