X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FHYDRO_tests%2FTestViewer.cxx;h=52917a31a07c023cd60eae54b1c830e4956ed48d;hb=71ba58001e1084f0995fff43bf5e4643b153e5e0;hp=63034765a986bc6399035a14f6b4f41bd7b8da3c;hpb=30c0cab7fa5364508f087fdf73b62235e587f888;p=modules%2Fhydro.git

diff --git a/src/HYDRO_tests/TestViewer.cxx b/src/HYDRO_tests/TestViewer.cxx
index 63034765..52917a31 100644
--- a/src/HYDRO_tests/TestViewer.cxx
+++ b/src/HYDRO_tests/TestViewer.cxx
@@ -42,6 +42,8 @@
 #include <QDir>
 #include <QPainter>
 #include <QHash>
+#include <TopExp_Explorer.hxx>
+#include <TopoDS.hxx>
 
 #ifdef WIN32
   #pragma warning ( default: 4251 )
@@ -82,9 +84,9 @@ OCCViewer_ViewWindow* TestViewer::viewWindow()
   return myViewWindow;
 }
 
-Handle(AIS_InteractiveContext) context()
+Handle(AIS_InteractiveContext) TestViewer::context()
 {
-  return TestViewer::viewer()->getAISContext();
+  return viewer()->getAISContext();
 }
 
 QColor TestViewer::GetColor(int i)
@@ -112,6 +114,12 @@ QColor TestViewer::GetColor(int i)
   }
 }
 
+void TestViewer::eraseAll( bool isUpdate )
+{
+  context()->CloseLocalContext( -1, Standard_False );
+  context()->EraseAll( isUpdate );
+}
+
 void TestViewer::show( const Handle(AIS_InteractiveObject)& theObject,
                        int theMode, int theSelectionMode, bool isFitAll, const char* theKey )
 {
@@ -119,8 +127,7 @@ void TestViewer::show( const Handle(AIS_InteractiveObject)& theObject,
   if( !aNewKey.isEmpty() )
   {
     myKey = aNewKey;
-    context()->CloseLocalContext();
-    context()->EraseAll( Standard_False );
+    eraseAll( false );
   }
   
   context()->Display( theObject, theMode, theSelectionMode );
@@ -158,8 +165,7 @@ void TestViewer::show( const TopoDS_Shape& theShape, int theMode, bool isFitAll,
   QString aNewKey = theKey;
   if( !aNewKey.isEmpty() )
   {
-    context()->CloseLocalContext();
-    context()->EraseAll( Standard_False );
+    eraseAll( false );
     myKey = aNewKey;
   }
 
@@ -167,14 +173,20 @@ void TestViewer::show( const TopoDS_Shape& theShape, int theMode, bool isFitAll,
     return;
 
   int i = 0;
-  if( theShape.ShapeType()==TopAbs_SHELL )
-  {
-    TopoDS_Iterator anIt( theShape );
-    for( ; anIt.More(); anIt.Next(), i++ )
-      show( anIt.Value(), theMode, false, GetColor(i) );
-  }
-  else
-    show( theShape, theMode, false, GetColor(0) );
+  //show all faces first
+  TopExp_Explorer aFE( theShape, TopAbs_FACE );
+  for( ; aFE.More(); aFE.Next(), i++ ) 
+    show( aFE.Current(), theMode, false, GetColor(i) );
+
+  //show all independent wires
+  TopExp_Explorer aWE( theShape, TopAbs_WIRE, TopAbs_FACE );
+  for( ; aWE.More(); aWE.Next(), i++ ) 
+    show( aWE.Current(), theMode, false, GetColor(i) );
+
+  //show all independent edges
+  TopExp_Explorer anEE( theShape, TopAbs_EDGE, TopAbs_WIRE );
+  for( ; anEE.More(); anEE.Next(), i++ ) 
+    show( anEE.Current(), theMode, false, GetColor(i) );
 
   if( isFitAll )
   {
@@ -183,6 +195,27 @@ void TestViewer::show( const TopoDS_Shape& theShape, int theMode, bool isFitAll,
   }
 }
 
+/*void TestViewer::ShowShape(const TopoDS_Shape& theShape, int theMode, int& i)
+{
+  if( theShape.ShapeType()==TopAbs_SHELL )
+  {
+    TopoDS_Iterator anIt( theShape );
+    for( ; anIt.More(); anIt.Next())
+    {
+      show( anIt.Value(), theMode, false, GetColor(i) );
+      i++;
+    }
+  }
+  else if (theShape.ShapeType()==TopAbs_FACE ||
+           theShape.ShapeType()==TopAbs_WIRE ||
+           theShape.ShapeType()==TopAbs_EDGE ||
+           theShape.ShapeType()==TopAbs_VERTEX )
+  {
+    show( theShape, theMode, false, GetColor(i) );
+    i++;
+  }
+}*/
+
 bool AreImagesEqual( const QImage& theImage1, const QImage& theImage2, double theTolerance )
 {
   if( theImage1.isNull() || theImage2.isNull() )
@@ -237,15 +270,24 @@ bool TestViewer::AssertImages( QString& theMessage )
   return false;
 }
 
-Handle_Aspect_ColorScale TestViewer::showColorScale( bool isShow )
+Handle_Aspect_ColorScale TestViewer::colorScale()
 {
   Handle(V3d_View) aView = myViewWindow->getViewPort()->getView();
   if( aView.IsNull() )
     return Handle(Aspect_ColorScale)();
+  else
+    return aView->ColorScale();
+}
 
-  Handle(Aspect_ColorScale) aColorScale = aView->ColorScale();
+void TestViewer::showColorScale( bool isShow )
+{
+  Handle(V3d_View) aView = myViewWindow->getViewPort()->getView();
+  if( aView.IsNull() )
+    return;
+
+  Handle(Aspect_ColorScale) aColorScale = colorScale();
   if( aColorScale.IsNull() )
-    return aColorScale;
+    return;
 
   Standard_Real anXPos = 0.05;
   Standard_Real anYPos = 0.1;
@@ -274,7 +316,6 @@ Handle_Aspect_ColorScale TestViewer::showColorScale( bool isShow )
     if( aView->ColorScaleIsDisplayed() )
       aView->ColorScaleErase();
   }
-  return aColorScale;
 }
 
 void TestViewer::select( int theViewX, int theViewY )