X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FHYDRO_tests%2FTestViewer.h;h=8a0db3c9d00e5edec952a11c29aae25c3323aa24;hb=26197be88e35b978201cdd05c4b34d4acbfad111;hp=859f0076372822e9d67e35cc1f4a509d834e01b0;hpb=743e3da9cea294eb30ea8b16e7f6992a39a8a50a;p=modules%2Fhydro.git

diff --git a/src/HYDRO_tests/TestViewer.h b/src/HYDRO_tests/TestViewer.h
index 859f0076..8a0db3c9 100644
--- a/src/HYDRO_tests/TestViewer.h
+++ b/src/HYDRO_tests/TestViewer.h
@@ -18,14 +18,17 @@
 
 #pragma once
 
+#include <AIS_InteractiveContext.hxx>
+
 class OCCViewer_ViewManager;
 class OCCViewer_Viewer;
 class OCCViewer_ViewWindow;
 class TopoDS_Shape;
 class QString;
 class QColor;
-class Handle_AIS_InteractiveObject;
-class Handle_Aspect_ColorScale;
+class QImage;
+class AIS_InteractiveObject;
+class AIS_ColorScale;
 
 class TestViewer
 {
@@ -33,16 +36,21 @@ public:
   static OCCViewer_ViewManager* viewManager();
   static OCCViewer_Viewer* viewer();
   static OCCViewer_ViewWindow* viewWindow();
+  static Handle(AIS_InteractiveContext) context();
 
-  static void show( const Handle_AIS_InteractiveObject& theObject,
+  static void eraseAll( bool isUpdate );
+  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 );
-  static void show( const TopoDS_Shape& theShape, int theMode, bool isFitAll, const char* theKey );
-  static void ShowShape(const TopoDS_Shape& theShape, int theMode, int& i);
-  static bool AssertImages( QString& theMessage );
+  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 QColor GetColor(int i);
 
-  static Handle_Aspect_ColorScale showColorScale( bool );
+  static Handle(AIS_ColorScale) colorScale();
+  static void showColorScale( bool );
+  static bool ColorScaleIsDisplayed();
 
   static void select( int theViewX, int theViewY );
 
@@ -52,6 +60,8 @@ public:
                                int theLinesToOmit,
                                QString& theMsg );
 
+  static void fitAll();
+
 private:
   static OCCViewer_ViewManager* myViewManager;
   static OCCViewer_ViewWindow* myViewWindow;
@@ -63,6 +73,18 @@ private:
     QString aMessage;                                      \
     if( !TestViewer::AssertImages( aMessage ) )            \
     {                                                      \
+      TestViewer::showColorScale( false );                 \
+      std::string aMessageStl = aMessage.toStdString();    \
+      CPPUNIT_FAIL( aMessageStl.c_str() );                 \
+    }                                                      \
+  }                                                        \
+
+#define CPPUNIT_ASSERT_IMAGES2( theImage, theCase )        \
+  {                                                        \
+    QString aMessage;                                      \
+    if( !TestViewer::AssertImages( aMessage, theImage, theCase ) ) \
+    {                                                      \
+      TestViewer::showColorScale( false );                 \
       std::string aMessageStl = aMessage.toStdString();    \
       CPPUNIT_FAIL( aMessageStl.c_str() );                 \
     }                                                      \