Merge branch 'BR_HYDRO_IMPS_2016' of ssh://gitolite3@git.salome-platform.org/modules...

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

diff --git a/src/HYDRO_tests/TestViewer.cxx b/src/HYDRO_tests/TestViewer.cxx
index 75fcaeb3d93a77d8e19a49ddd6d7bcd49dd76726..5ef6d2d9529afa0b6042d491bb0535c1eebb8232 100644 (file)
--- a/src/HYDRO_tests/TestViewer.cxx
+++ b/src/HYDRO_tests/TestViewer.cxx
@@ -34,9 +34,8 @@
 #ifdef WIN32
   #pragma warning ( disable: 4251 )
 #endif
-#include <AIS_InteractiveContext.hxx>
 #include <AIS_Shape.hxx>
-#include <Aspect_ColorScale.hxx>
+#include <AIS_ColorScale.hxx>
 #include <Prs3d_PointAspect.hxx>
 #include <TopoDS_Iterator.hxx>
 #include <QDir>
@@ -44,6 +43,11 @@
 #include <QHash>
 #include <TopExp_Explorer.hxx>
 #include <TopoDS.hxx>
+#include <Prs3d_IsoAspect.hxx>
+
+#include <GEOMUtils.hxx>
+#include <TopTools_ListOfShape.hxx>
+#include <TopTools_ListIteratorOfListOfShape.hxx>
 
 #ifdef WIN32
   #pragma warning ( default: 4251 )
@@ -144,11 +148,20 @@ void TestViewer::show( const Handle(AIS_InteractiveObject)& theObject,
   }
 }
 
-void TestViewer::show( const TopoDS_Shape& theShape, int theMode, bool isFitAll, const QColor& theColor )
+void TestViewer::show( const TopoDS_Shape& theShape, int theMode, bool isFitAll, const QColor& theColor,
+  int theUIANb, int theVIANb)
 {
   Handle(AIS_Shape) aShape = new AIS_Shape( theShape );
   if( theShape.ShapeType()==TopAbs_VERTEX )
     aShape->Attributes()->PointAspect()->SetTypeOfMarker( Aspect_TOM_X );
+  if (theShape.ShapeType()==TopAbs_FACE)
+  {
+    context()->DefaultDrawer()->UIsoAspect()->SetNumber(theUIANb);
+    context()->DefaultDrawer()->VIsoAspect()->SetNumber(theVIANb);
+    Handle_Prs3d_Drawer aDrawer = aShape->Attributes();
+    aDrawer->UIsoAspect()->SetNumber(theUIANb);
+    aDrawer->VIsoAspect()->SetNumber(theVIANb);
+  }
   aShape->SetMaterial( Graphic3d_NOM_PLASTIC );
   aShape->SetColor( HYDROData_Tool::toOccColor( theColor ) );
   context()->Display( aShape, theMode, 0, Standard_False );
@@ -159,8 +172,8 @@ void TestViewer::show( const TopoDS_Shape& theShape, int theMode, bool isFitAll,
     viewWindow()->onFitAll();
   }
 }
-
-void TestViewer::show( const TopoDS_Shape& theShape, int theMode, bool isFitAll, const char* theKey )
+void TestViewer::show( const TopoDS_Shape& theShape, int theMode, bool isFitAll, const char* theKey,
+                       int theUIANb, int theVIANb)
 {
   QString aNewKey = theKey;
   if( !aNewKey.isEmpty() )
@@ -174,19 +187,34 @@ void TestViewer::show( const TopoDS_Shape& theShape, int theMode, bool isFitAll,
 
   int i = 0;
   //show all faces first
+  TopTools_ListOfShape aListOfFaces;
   TopExp_Explorer aFE( theShape, TopAbs_FACE );
-  for( ; aFE.More(); aFE.Next(), i++ ) 
-    show( aFE.Current(), theMode, false, GetColor(i) );
+  for( ; aFE.More(); aFE.Next() )
+    aListOfFaces.Append(aFE.Current());
+  GEOMUtils::SortShapes(aListOfFaces);
+  TopTools_ListIteratorOfListOfShape aLF(aListOfFaces);
+  for( ; aLF.More(); aLF.Next(), i++)
+    show( aLF.Value(), theMode, false, GetColor(i), theUIANb, theVIANb );
 
   //show all independent wires
+  TopTools_ListOfShape aListOfWires;
   TopExp_Explorer aWE( theShape, TopAbs_WIRE, TopAbs_FACE );
-  for( ; aWE.More(); aWE.Next(), i++ ) 
-    show( aWE.Current(), theMode, false, GetColor(i) );
+  for( ; aWE.More(); aWE.Next() )
+    aListOfWires.Append(aWE.Current());
+  GEOMUtils::SortShapes(aListOfWires);
+  TopTools_ListIteratorOfListOfShape aLW(aListOfWires);
+  for( ; aLW.More(); aLW.Next(), i++)
+    show( aLW.Value(), theMode, false, GetColor(i) );
 
   //show all independent edges
+  TopTools_ListOfShape aListOfEdges;
   TopExp_Explorer anEE( theShape, TopAbs_EDGE, TopAbs_WIRE );
-  for( ; anEE.More(); anEE.Next(), i++ ) 
-    show( anEE.Current(), theMode, false, GetColor(i) );
+  for( ; anEE.More(); anEE.Next())
+    aListOfEdges.Append(anEE.Current());
+  GEOMUtils::SortShapes(aListOfEdges);
+  TopTools_ListIteratorOfListOfShape aLE(aListOfEdges);
+  for( ; aLE.More(); aLE.Next(), i++)
+    show( aLE.Value(), theMode, false, GetColor(i) );
 
   if( isFitAll )
   {
@@ -238,9 +266,16 @@ bool AreImagesEqual( const QImage& theImage1, const QImage& theImage2, double th
   return true;
 }
 
-bool TestViewer::AssertImages( QString& theMessage )
+bool TestViewer::AssertImages( QString& theMessage, const QImage* theImage, const char* theCase )
 {
-  QImage anActualImage = viewWindow()->dumpView();
+  QImage anActualImage;
+  if( theImage )
+    anActualImage = *theImage;
+  else
+    anActualImage = viewWindow()->dumpView();
+
+  if( theCase )
+    myKey = theCase;
 
   QString anExpectedRefFilePath = qgetenv( "HYDRO_ROOT_DIR" ) + "/bin/salome/test/HYDRO";
   anExpectedRefFilePath += "/" + myKey + ".png";
@@ -267,25 +302,21 @@ bool TestViewer::AssertImages( QString& theMessage )
   QString aDiffFilePath = QDir::tempPath() + "/" + myKey + "_diff.png";
   aDiff.save( aDiffFilePath );
 
+  anExpectedRefImage.save( QDir::tempPath() + "/" + myKey + "_1.png");
+
   return false;
 }
 
-Handle_Aspect_ColorScale TestViewer::colorScale()
+Handle(AIS_ColorScale) TestViewer::colorScale()
 {
-  Handle(V3d_View) aView = myViewWindow->getViewPort()->getView();
-  if( aView.IsNull() )
-    return Handle(Aspect_ColorScale)();
-  else
-    return aView->ColorScale();
+  static Handle(AIS_ColorScale) aColorScale = new AIS_ColorScale();
+
+  return aColorScale;
 }
 
 void TestViewer::showColorScale( bool isShow )
 {
-  Handle(V3d_View) aView = myViewWindow->getViewPort()->getView();
-  if( aView.IsNull() )
-    return;
-
-  Handle(Aspect_ColorScale) aColorScale = colorScale();
+  Handle(AIS_ColorScale) aColorScale = colorScale();
   if( aColorScale.IsNull() )
     return;
 
@@ -306,18 +337,25 @@ void TestViewer::showColorScale( bool isShow )
   aColorScale->SetTitle( "test" );
   aColorScale->SetRange( 0, 1 );
 
+  aColorScale->SetToUpdate();
+
   if( isShow )
   {
-    if( !aView->ColorScaleIsDisplayed() )
-      aView->ColorScaleDisplay();
+    if( !context()->IsDisplayed( aColorScale ) )
+      context()->Display( aColorScale );
   }
   else
   {
-    if( aView->ColorScaleIsDisplayed() )
-      aView->ColorScaleErase();
+    if( context()->IsDisplayed( aColorScale ) )
+      context()->Erase( aColorScale );
   }
 }
 
+bool TestViewer::ColorScaleIsDisplayed()
+{
+  return context()->IsDisplayed( colorScale() );
+}
+
 void TestViewer::select( int theViewX, int theViewY )
 {
   Handle(V3d_View) aView = myViewWindow->getViewPort()->getView();