X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FHYDROGUI%2FHYDROGUI_Shape.cxx;h=7739a90ed91925faf577af9c7c5c45b407847c7e;hb=f34b90e9e4e02ba65419134d5d37a2e42aecfabf;hp=8ff001e2183bdd3fea701e2a4ef2ddb89eb86672;hpb=2930e23df45888720001ce2c9f25e9355c3c9b96;p=modules%2Fhydro.git

diff --git a/src/HYDROGUI/HYDROGUI_Shape.cxx b/src/HYDROGUI/HYDROGUI_Shape.cxx
index 8ff001e2..7739a90e 100644
--- a/src/HYDROGUI/HYDROGUI_Shape.cxx
+++ b/src/HYDROGUI/HYDROGUI_Shape.cxx
@@ -28,6 +28,8 @@
 #include <AIS_Drawer.hxx>
 #include <AIS_TexturedShape.hxx>
 
+#include <V3d_Viewer.hxx>
+
 #include <BRepBuilderAPI_MakeEdge.hxx>
 #include <BRepBuilderAPI_MakeWire.hxx>
 #include <BRepBuilderAPI_MakeFace.hxx>
@@ -47,6 +49,7 @@
 #include <HYDROData_Polyline3D.h>
 #include <HYDROData_Profile.h>
 #include <HYDROData_Region.h>
+#include <HYDROData_ShapesGroup.h>
 #include <HYDROData_Stream.h>
 #include <HYDROData_Zone.h>
 
@@ -109,7 +112,8 @@ void HYDROGUI_Shape::erase( const bool theIsUpdateViewer )
   myContext->Erase( myShape, theIsUpdateViewer );
 }
 
-void HYDROGUI_Shape::update( const bool theIsUpdateViewer )
+void HYDROGUI_Shape::update( const bool theIsUpdateViewer,
+                             const bool theIsDisplayOnTop )
 {
   setIsToUpdate( false );
 
@@ -350,12 +354,43 @@ void HYDROGUI_Shape::update( const bool theIsUpdateViewer )
       setFillingColor( aFillingColor, false, false );
       setBorderColor( aBorderColor, false, false );
     }
+    else if ( myObject->IsKind( STANDARD_TYPE(HYDROData_ShapesGroup) ) )
+    {
+      Handle(HYDROData_ShapesGroup) aShapesGroup =
+        Handle(HYDROData_ShapesGroup)::DownCast( myObject );
+
+      TopTools_SequenceOfShape aShapes;
+      aShapesGroup->GetShapes( aShapes );
+
+      TopoDS_Compound aCompound;
+      BRep_Builder aCompoundBuilder;
+      aCompoundBuilder.MakeCompound( aCompound );
+
+      for ( int i = 1, n = aShapes.Length(); i <= n; ++i )
+      {
+        const TopoDS_Shape& aShape = aShapes.Value( i );
+        aCompoundBuilder.Add( aCompound, aShape );
+      }
+
+      setShape( aCompound, false, false );  
+    }
   }
  
   if ( myShape.IsNull() || !isVisible() )
     return;
 
   myContext->Display( myShape, theIsUpdateViewer );
+  
+  if ( theIsDisplayOnTop ) {
+    // Display the shape on the top Z layer
+    Standard_Integer aNewLayerId = -1;
+    if ( myContext->CurrentViewer() && 
+         myContext->CurrentViewer()->AddZLayer( aNewLayerId ) &&
+         aNewLayerId > 0 ) {
+      myContext->SetZLayer( myShape, aNewLayerId );
+    }
+  }
+
   if (isDeactivateSelection)
     myContext->Deactivate(myShape);
 }
@@ -377,7 +412,7 @@ void HYDROGUI_Shape::setVisible( const bool theState,
     myContext->Erase( myShape, theIsUpdateViewer );
 }
 
-void HYDROGUI_Shape::highlight( bool theIsHighlight )
+void HYDROGUI_Shape::highlight( bool theIsHighlight, bool isUpdateViewer )
 {
   if ( myIsHighlight == theIsHighlight )
     return;
@@ -388,7 +423,7 @@ void HYDROGUI_Shape::highlight( bool theIsHighlight )
     return;
 
   colorShapeBorder( getActiveColor() );
-  myContext->Display( myShape );
+  myContext->Display( myShape, isUpdateViewer );
 }
 
 bool HYDROGUI_Shape::isHighlighted() const
@@ -544,6 +579,8 @@ void HYDROGUI_Shape::buildShape()
     myShape = new AIS_Shape( myTopoShape );
   }
 
+  myShape->SetHLRAngleAndDeviation( 0.001 );
+
   if ( !myObject.IsNull() )
     myShape->SetOwner( myObject );
 
@@ -583,9 +620,9 @@ void HYDROGUI_Shape::buildShape()
       Handle(Prs3d_ShadingAspect) aShadingAspect = anAttributes->ShadingAspect();
       if ( !aShadingAspect.IsNull() )
       {
-        Graphic3d_MaterialAspect aMatAspect;
-        aMatAspect.SetAmbient( 1 );
-        aMatAspect.SetDiffuse( 0 );
+        Graphic3d_MaterialAspect aMatAspect( Graphic3d_NOM_PLASTIC );
+        //aMatAspect.SetAmbient( 1 );
+        //aMatAspect.SetDiffuse( 0 );
 
         aShadingAspect->Aspect()->SetFrontMaterial( aMatAspect );
         aShadingAspect->Aspect()->SetBackMaterial( aMatAspect );
@@ -671,7 +708,10 @@ void HYDROGUI_Shape::colorShapeBorder( const QColor& theColor )
 
       Handle(Prs3d_LineAspect) aBoundaryAspect = anAttributes->FaceBoundaryAspect();
       if ( !aBoundaryAspect.IsNull() )
+      {
         aBoundaryAspect->SetColor( aBorderColor );
+        anAttributes->SetFaceBoundaryAspect( aBoundaryAspect );
+      }
     }
   }
   else if ( myDisplayMode == AIS_WireFrame )