minor code review

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

diff --git a/src/HYDRO_tests/TestViewer.h b/src/HYDRO_tests/TestViewer.h
index 7bfe1a84864cb282c099328e3c2c0d09b0a8cdbf..af8400f01c16f9b6b8985762fa20d5269e9a58a0 100644 (file)
--- a/src/HYDRO_tests/TestViewer.h
+++ b/src/HYDRO_tests/TestViewer.h
@@ -22,7 +22,7 @@
 
 class OCCViewer_ViewManager;
 class OCCViewer_Viewer;
-class OCCViewer_ViewWindow;
+class OCCViewer_ViewFrame;
 class TopoDS_Shape;
 class QString;
 class QColor;
@@ -35,10 +35,10 @@ class TestViewer
 public:
   static OCCViewer_ViewManager* viewManager();
   static OCCViewer_Viewer* viewer();
-  static OCCViewer_ViewWindow* viewWindow();
+  static OCCViewer_ViewFrame* viewWindow();
   static Handle(AIS_InteractiveContext) context();
 
-  static void eraseAll( bool isUpdate );
+  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,
@@ -60,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;
 };
 
@@ -88,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,        \