X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2FHYDRO_tests%2FTestViewer.cxx;h=71cd941b27ab2e332f21742e5f9e3dcc75818aab;hb=26197be88e35b978201cdd05c4b34d4acbfad111;hp=904dbc93d0029bd309b6787d226403a825f5914e;hpb=c4738cc6d2fb23c60a1922847991007b3ac4e6d7;p=modules%2Fhydro.git

diff --git a/src/HYDRO_tests/TestViewer.cxx b/src/HYDRO_tests/TestViewer.cxx
index 904dbc93..71cd941b 100644
--- 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,7 @@
 #include <QHash>
 #include <TopExp_Explorer.hxx>
 #include <TopoDS.hxx>
+#include <Prs3d_IsoAspect.hxx>
 
 #include <GEOMUtils.hxx>
 #include <TopTools_ListOfShape.hxx>
@@ -142,29 +142,38 @@ void TestViewer::show( const Handle(AIS_InteractiveObject)& theObject,
   }
 
   if( isFitAll )
-  {
-    viewWindow()->onTopView();
-    viewWindow()->onFitAll();
-  }
+    fitAll();
+}
+
+void TestViewer::fitAll()
+{
+  viewWindow()->onTopView();
+  viewWindow()->onFitAll();
 }
 
-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 );
 
   if( isFitAll )
-  {
-    viewWindow()->onTopView();
-    viewWindow()->onFitAll();
-  }
+    fitAll();
 }
-
-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() )
@@ -185,7 +194,7 @@ void TestViewer::show( const TopoDS_Shape& theShape, int theMode, bool isFitAll,
   GEOMUtils::SortShapes(aListOfFaces);
   TopTools_ListIteratorOfListOfShape aLF(aListOfFaces);
   for( ; aLF.More(); aLF.Next(), i++)
-    show( aLF.Value(), theMode, false, GetColor(i) );
+    show( aLF.Value(), theMode, false, GetColor(i), theUIANb, theVIANb );
 
   //show all independent wires
   TopTools_ListOfShape aListOfWires;
@@ -208,10 +217,7 @@ void TestViewer::show( const TopoDS_Shape& theShape, int theMode, bool isFitAll,
     show( aLE.Value(), theMode, false, GetColor(i) );
 
   if( isFitAll )
-  {
-    viewWindow()->onTopView();
-    viewWindow()->onFitAll();
-  }
+    fitAll();
 }
 
 /*void TestViewer::ShowShape(const TopoDS_Shape& theShape, int theMode, int& i)
@@ -293,25 +299,21 @@ bool TestViewer::AssertImages( QString& theMessage, const QImage* theImage, cons
   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;
 
@@ -332,18 +334,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();