Merge branch 'BR_LAND_COVER_MAP' into BR_quadtree

[modules/hydro.git] / src / HYDRO_tests / TestViewer.h

diff --git a/src/HYDRO_tests/TestViewer.h b/src/HYDRO_tests/TestViewer.h
index 66e48a98511d08e97df6adcc5be4b2357f606bde..9030f33b80e0ee44d3f2c6921ba4d0056ebd2559 100644 (file)
--- a/src/HYDRO_tests/TestViewer.h
+++ b/src/HYDRO_tests/TestViewer.h
@@ -24,6 +24,7 @@ class OCCViewer_ViewWindow;
 class TopoDS_Shape;
 class QString;
 class QColor;
+class Handle_AIS_InteractiveContext;
 class Handle_AIS_InteractiveObject;
 class Handle_Aspect_ColorScale;
 
@@ -33,7 +34,9 @@ public:
   static OCCViewer_ViewManager* viewManager();
   static OCCViewer_Viewer* viewer();
   static OCCViewer_ViewWindow* viewWindow();
+  static Handle_AIS_InteractiveContext context();
 
+  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 );
@@ -41,7 +44,8 @@ public:
   static bool AssertImages( QString& theMessage );
   static QColor GetColor(int i);
 
-  static Handle_Aspect_ColorScale showColorScale( bool );
+  static Handle_Aspect_ColorScale colorScale();
+  static void showColorScale( bool );
 
   static void select( int theViewX, int theViewY );
 
@@ -62,6 +66,7 @@ private:
     QString aMessage;                                      \
     if( !TestViewer::AssertImages( aMessage ) )            \
     {                                                      \
+      TestViewer::showColorScale( false );                 \
       std::string aMessageStl = aMessage.toStdString();    \
       CPPUNIT_FAIL( aMessageStl.c_str() );                 \
     }                                                      \