X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FHYDRO_tests%2FTestViewer.h;h=244871d447b69312d2ab06be7612033cb951d8da;hb=6e48776f429cc4cd82555317f51f625bf0e61cbb;hp=7173bb2fc327682cc4c8399c40a91e1a5403097d;hpb=39b1848f103d89cfb544a1651b3fbf221fc2c401;p=modules%2Fhydro.git

diff --git a/src/HYDRO_tests/TestViewer.h b/src/HYDRO_tests/TestViewer.h
index 7173bb2f..244871d4 100644
--- a/src/HYDRO_tests/TestViewer.h
+++ b/src/HYDRO_tests/TestViewer.h
@@ -18,35 +18,39 @@
 
 #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 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();
 
   static void select( int theViewX, int theViewY );
 
@@ -56,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;
 };