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

diff --git a/src/HYDRO_tests/TestViewer.h b/src/HYDRO_tests/TestViewer.h
index 61f0d6bb..8a0db3c9 100644
--- a/src/HYDRO_tests/TestViewer.h
+++ b/src/HYDRO_tests/TestViewer.h
@@ -1,14 +1,34 @@
+// Copyright (C) 2014-2015  EDF-R&D
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License, or (at your option) any later version.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//
+// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//
 
 #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
 {
@@ -16,15 +36,31 @@ 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,
-                    int theMode, int theSelelctionMode, 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 );
+  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,
+                    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 );
+
+  static bool areScriptsEqual( const QString& theBaseName,
+                               bool isExpectedUtf8,
+                               bool isActualUtf8,
+                               int theLinesToOmit,
+                               QString& theMsg );
+
+  static void fitAll();
 
 private:
   static OCCViewer_ViewManager* myViewManager;
@@ -37,8 +73,37 @@ 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() );                 \
+    }                                                      \
+  }                                                        \
+
+#define CPPUNIT_ASSERT_SCRIPTS_EQUAL( theBaseName,         \
+                                      isExpectedUtf8,      \
+                                      isActualUtf8,        \
+                                      theLinesToOmit )     \
+  {                                                        \
+    QString aMsg;                                          \
+    if( !TestViewer::areScriptsEqual(                      \
+          theBaseName, isExpectedUtf8,                     \
+          isActualUtf8, theLinesToOmit, aMsg ) )           \
+    {                                                      \
+      std::string aStlMsg = "Scripts are not equal: " +    \
+        aMsg.toStdString();                                \
+      CPPUNIT_FAIL( aStlMsg );                             \
+    }                                                      \
+  }                                                        \
+                                                           \
+