X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FHYDRO_tests%2FTestViewer.h;h=af8400f01c16f9b6b8985762fa20d5269e9a58a0;hb=1ad3406d04aa81800693d6811c7c36e87e0c95c1;hp=f3dea715d359b86b6de675aae5c6958809acbb46;hpb=13ea5e42d4982dc1525a568ef25edcb99bf9cb2b;p=modules%2Fhydro.git

diff --git a/src/HYDRO_tests/TestViewer.h b/src/HYDRO_tests/TestViewer.h
index f3dea715..af8400f0 100644
--- a/src/HYDRO_tests/TestViewer.h
+++ b/src/HYDRO_tests/TestViewer.h
@@ -18,34 +18,37 @@
 
 #pragma once
 
+#include <AIS_InteractiveContext.hxx>
+
 class OCCViewer_ViewManager;
 class OCCViewer_Viewer;
-class OCCViewer_ViewWindow;
+class OCCViewer_ViewFrame;
 class TopoDS_Shape;
 class QString;
 class QColor;
 class QImage;
-class Handle_AIS_InteractiveContext;
-class Handle_AIS_InteractiveObject;
-class Handle_Aspect_ColorScale;
+class AIS_InteractiveObject;
+class AIS_ColorScale;
 
 class TestViewer
 {
 public:
   static OCCViewer_ViewManager* viewManager();
   static OCCViewer_Viewer* viewer();
-  static OCCViewer_ViewWindow* viewWindow();
-  static Handle_AIS_InteractiveContext context();
+  static OCCViewer_ViewFrame* viewWindow();
+  static Handle(AIS_InteractiveContext) context();
 
-  static void eraseAll( bool isUpdate );
-  static void show( const Handle_AIS_InteractiveObject& theObject,
+  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 );
-  static void show( const TopoDS_Shape& theShape, int theMode, bool isFitAll, const char* theKey );
-  static bool AssertImages( QString& theMessage, const QImage* = 0, const char* theCase = 0 );
+  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, bool swapRGB = true );
   static QColor GetColor(int i);
 
-  static Handle_Aspect_ColorScale colorScale();
+  static Handle(AIS_ColorScale) colorScale();
   static void showColorScale( bool );
   static bool ColorScaleIsDisplayed();
 
@@ -57,9 +60,12 @@ public:
                                int theLinesToOmit,
                                QString& theMsg );
 
+  static void setKey( const QString& );
+  static void fitAll();
+
 private:
   static OCCViewer_ViewManager* myViewManager;
-  static OCCViewer_ViewWindow* myViewWindow;
+  static OCCViewer_ViewFrame* myViewWindow;
   static QString myKey;
 };
 
@@ -85,6 +91,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,        \