X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FHYDROGUI%2FHYDROGUI_Shape.cxx;h=eb05a9b4dd816d214b3f9fb818d9e4a49b1d7e32;hb=81c9f5cdf82909d0aebd2c491c50fa7516cc80b7;hp=6bc515f38564a422d5802dd5da56a8efd0bb4cdd;hpb=0f3d2b6bce74f3bfe172795c678e3d6ee20cf45c;p=modules%2Fhydro.git

diff --git a/src/HYDROGUI/HYDROGUI_Shape.cxx b/src/HYDROGUI/HYDROGUI_Shape.cxx
index 6bc515f3..eb05a9b4 100644
--- a/src/HYDROGUI/HYDROGUI_Shape.cxx
+++ b/src/HYDROGUI/HYDROGUI_Shape.cxx
@@ -26,6 +26,9 @@
 #include "HYDROGUI_Tool.h"
 
 #include <AIS_Drawer.hxx>
+#include <AIS_TexturedShape.hxx>
+
+#include <V3d_Viewer.hxx>
 
 #include <BRepBuilderAPI_MakeEdge.hxx>
 #include <BRepBuilderAPI_MakeWire.hxx>
@@ -36,26 +39,45 @@
 #include <Graphic3d_AspectFillArea3d.hxx>
 #include <Graphic3d_MaterialAspect.hxx>
 
-#include <HYDROData_Domain.h>
+#include <HYDROData_Channel.h>
+#include <HYDROData_Document.h>
+#include <HYDROData_DummyObject3D.h>
 #include <HYDROData_Image.h>
-#include <HYDROData_Polyline.h>
-
+#include <HYDROData_ImmersibleZone.h>
+#include <HYDROData_Obstacle.h>
+#include <HYDROData_PolylineXY.h>
+#include <HYDROData_Polyline3D.h>
+#include <HYDROData_Profile.h>
+#include <HYDROData_Region.h>
+#include <HYDROData_ShapesGroup.h>
+#include <HYDROData_Stream.h>
+#include <HYDROData_Zone.h>
+
+#include <TopoDS.hxx>
 #include <TopoDS_Wire.hxx>
 #include <TopoDS_Face.hxx>
 
+#include <TopExp_Explorer.hxx>
+
+#include <BRep_Builder.hxx>
+
 #include <Precision.hxx>
 
 #include <Prs3d_ShadingAspect.hxx>
 #include <Prs3d_LineAspect.hxx>
 #include <Prs3d_IsoAspect.hxx>
 
+#include <SUIT_MessageBox.h>
+
 #include <QColor>
 #include <QFile>
 
 HYDROGUI_Shape::HYDROGUI_Shape( const Handle(AIS_InteractiveContext)& theContext,
-                                const Handle(HYDROData_Object)&       theObject )
+                                const Handle(HYDROData_Entity)&       theObject,
+                                const int                             theZLayer )
 : myContext( theContext ),
   myObject( theObject ),
+  myZLayer( theZLayer ),
   myIsHighlight( false ),
   myFillingColor( Qt::transparent ),
   myBorderColor( Qt::black ),
@@ -68,7 +90,7 @@ HYDROGUI_Shape::HYDROGUI_Shape( const Handle(AIS_InteractiveContext)& theContext
 
 HYDROGUI_Shape::~HYDROGUI_Shape()
 {
-  erase();
+  erase( false );
 
   if ( !myShape.IsNull() )
     myShape.Nullify();
@@ -81,7 +103,7 @@ void HYDROGUI_Shape::display( const bool theIsUpdateViewer )
   if ( myContext.IsNull() || myShape.IsNull() || !isVisible() )
     return;
 
-  myContext->Display( myShape, theIsUpdateViewer );
+  displayShape( theIsUpdateViewer );
 }
 
 void HYDROGUI_Shape::erase( const bool theIsUpdateViewer )
@@ -99,30 +121,123 @@ void HYDROGUI_Shape::update( const bool theIsUpdateViewer )
   if ( myContext.IsNull() )
     return;
 
+  bool isDeactivateSelection = false;
   // Try to retrieve information from object
   if ( !myObject.IsNull() )
   {
-    if ( myObject->IsKind( STANDARD_TYPE(HYDROData_Domain) ) )
+    Handle(HYDROData_Document) aDocument = HYDROData_Document::Document( myObject->Label() );
+  
+    if ( myObject->IsKind( STANDARD_TYPE(HYDROData_ImmersibleZone) ) )
     {
-      Handle(HYDROData_Domain) aDomainObj =
-        Handle(HYDROData_Domain)::DownCast( myObject );
+      Handle(HYDROData_ImmersibleZone) aZoneObj =
+        Handle(HYDROData_ImmersibleZone)::DownCast( myObject );
+
+      TopoDS_Shape aZoneShape = aZoneObj->GetTopShape();
+      if ( !aZoneShape.IsNull() ) {
+        if ( aZoneShape.ShapeType() == TopAbs_FACE ) {
+          TopoDS_Face aZoneFace = TopoDS::Face( aZoneShape );
+          setFace( aZoneFace, false, false );
+        } else {
+          myTopoShape = aZoneShape;
+          myDisplayMode = myTextureFileName.isEmpty() ? AIS_Shaded : AIS_Shaded+2;
+
+          buildShape();
+          updateShape( false, false );
+        }
+      }
 
-      QColor aFillingColor = aDomainObj->GetFillingColor();
-      QColor aBorderColor = aDomainObj->GetBorderColor();
-      TopoDS_Face aDomainFace = aDomainObj->Face();
+      QColor aFillingColor = aZoneObj->GetFillingColor();
+      QColor aBorderColor = aZoneObj->GetBorderColor();
 
       setFillingColor( aFillingColor, false, false );
       setBorderColor( aBorderColor, false, false );
-      setFace( aDomainFace, false, false );
     }
-    else if ( myObject->IsKind( STANDARD_TYPE(HYDROData_Polyline) ) )
+    else if ( myObject->IsKind( STANDARD_TYPE(HYDROData_PolylineXY) ) )
+    {
+      Handle(HYDROData_PolylineXY) aPolyline =
+        Handle(HYDROData_PolylineXY)::DownCast( myObject );
+
+      TopoDS_Shape aPolylineShape = aPolyline->GetShape();
+
+      if ( !aPolylineShape.IsNull() ) {
+        if ( aPolylineShape.ShapeType() == TopAbs_WIRE ) {
+          TopoDS_Wire aPolylineWire = TopoDS::Wire( aPolylineShape );
+          setWire( aPolylineWire, false, false );  
+        } else {
+          myTopoShape = aPolylineShape;
+          // Set shading mode to avoid that hilight presentation is equal to "normal" object presentation.
+          // Note that hilight presentation is always to be on top ( i.e. in the top Z layer ).
+          myDisplayMode = AIS_Shaded;
+
+          buildShape();
+          updateShape( false, false );
+        }
+      }
+
+      QColor aWireColor = aPolyline->GetWireColor();
+      setBorderColor( aWireColor, false, false );
+    }
+    else if ( myObject->IsKind( STANDARD_TYPE(HYDROData_Polyline3D) ) )
+    {
+      Handle(HYDROData_Polyline3D) aPolyline =
+        Handle(HYDROData_Polyline3D)::DownCast( myObject );
+
+      TopoDS_Shape aPolylineShape = aPolyline->GetShape3D();
+
+      if ( !aPolylineShape.IsNull() ) {
+        if ( aPolylineShape.ShapeType() == TopAbs_WIRE ) {
+          TopoDS_Wire aPolylineWire = TopoDS::Wire( aPolylineShape );
+          setWire( aPolylineWire, false, false );  
+        } else {
+          myTopoShape = aPolylineShape;
+          // Set shading mode to avoid that hilight presentation is equal to "normal" object presentation.
+          // Note that hilight presentation is always to be on top ( i.e. in the top Z layer ).
+          myDisplayMode = AIS_Shaded;
+
+          buildShape();
+          updateShape( false, false );
+        }
+      }
+
+      QColor aWireColor = aPolyline->GetBorderColor();
+      setBorderColor( aWireColor, false, false );
+    }
+    else if ( myObject->IsKind( STANDARD_TYPE(HYDROData_Zone) ) )
     {
-      Handle(HYDROData_Polyline) aPolyline =
-        Handle(HYDROData_Polyline)::DownCast( myObject );
+      Handle(HYDROData_Zone) aZone =
+        Handle(HYDROData_Zone)::DownCast( myObject );
 
-      TopoDS_Wire aPolylineWire = aPolyline->Wire();
+      TopoDS_Face aZoneFace = TopoDS::Face( aZone->GetShape() );
 
-      setWire( aPolylineWire, false, false );
+      setFace( aZoneFace, false, false );
+      if (aZone->IsMergingNeed() && aZone->GetMergeType() == HYDROData_Zone::Merge_UNKNOWN )
+      {
+        // Red color for a zone with bathymetry conflict
+        setFillingColor( Qt::red );
+      }
+      else
+      {
+        // Generate the filling color for zone
+        QStringList aGeomObjectsNames;
+
+        HYDROData_SequenceOfObjects aRefObjects = aZone->GetGeometryObjects();
+        HYDROData_SequenceOfObjects::Iterator anIter( aRefObjects );
+        for ( ; anIter.More(); anIter.Next() )
+        {
+          Handle(HYDROData_Object) aRefbject = 
+            Handle(HYDROData_Object)::DownCast( anIter.Value() );
+          if ( aRefbject.IsNull() )
+            continue;
+
+          QString aRefObjectName = aRefbject->GetName();
+          if ( aRefObjectName.isEmpty() )
+            continue;
+
+          aGeomObjectsNames.append( aRefObjectName );
+        }
+
+        setFillingColor( HYDROGUI_Tool::GenerateFillingColor( aDocument, aGeomObjectsNames ) );
+      }
     }
     else if ( myObject->IsKind( STANDARD_TYPE(HYDROData_Image) ) )
     {
@@ -140,17 +255,44 @@ void HYDROGUI_Shape::update( const bool theIsUpdateViewer )
       int aWidth = anImage.width();
       int aHeight = anImage.height();
 
+      QString anImageError = "";
+
       QTransform anInversion = QTransform::fromScale( -1, -1 );
-      anImage = anImage.transformed( anYInversion * aTrsf, Qt::SmoothTransformation );
+      anImage = anImage.transformed( anInversion * aTrsf, Qt::SmoothTransformation );
 
-      // temporary optimization, to reduce the saved image size (and the texture quality)
-      QImage anImageToSave = reduceTexture( anImage, 500 );
-      anImageToSave.save( aTextureFileName );
+      if ( anImage.isNull() )
+        anImageError = QObject::tr( "IMAGE_TRANSFORMATION_CAN_NOT_BE_APPLYED" );
+      else
+      {
+        // Workaround: Scale the texture image to the nearest width multiple 4 due to the CASCADE bug 23813
+        int aTrsfWidth = anImage.width();
+        int aDelta = aTrsfWidth % 4;
+        if ( aDelta > 0 )
+        {
+          aTrsfWidth += ( 4 - aDelta );
+        }
+        anImage = anImage.scaledToWidth( aTrsfWidth );
+
+        // temporary optimization, to reduce the saved image size (and the texture quality)
+        QImage anImageToSave = anImage; //RKV:reduceTexture( anImage, 500 );
+
+        bool isSaved = anImageToSave.save( aTextureFileName );
+        if ( !isSaved )
+          anImageError = QObject::tr( "FILE_CAN_NOT_BE_CREATED" ).arg( aTextureFileName );
+        else
+          QFile::setPermissions( aTextureFileName, (QFile::Permissions)0x4FFFF );
+      }
 
-      QPointF aPoint1( 0, 0 );
-      QPointF aPoint2( aWidth, 0 );
-      QPointF aPoint3( aWidth, aHeight );
-      QPointF aPoint4( 0, aHeight );
+      if ( !anImageError.isEmpty() )
+      {
+        SUIT_MessageBox::warning( 0, QObject::tr( "SHAPE_IMAGE_ERROR" ),
+                                  QObject::tr( "IMAGE_CAN_NOT_BE_CREATED" ) + anImageError );
+      }
+
+      QPointF aPoint1( 0, 0 );            // 1: top left
+      QPointF aPoint2( aWidth, 0 );       // 2: top right
+      QPointF aPoint3( aWidth, aHeight ); // 3: bottom right
+      QPointF aPoint4( 0, aHeight );      // 4: bottom left
 
       aPoint1 = aTrsf.map( aPoint1 );
       aPoint2 = aTrsf.map( aPoint2 );
@@ -165,42 +307,127 @@ void HYDROGUI_Shape::update( const bool theIsUpdateViewer )
       gp_Pnt aPnt3( aRect.bottomRight().x(), aRect.bottomRight().y(), 0 );
       gp_Pnt aPnt4( aRect.bottomLeft().x(), aRect.bottomLeft().y(), 0 );
 
+      Handle_HYDROData_Document aDoc = HYDROData_Document::Document( anImageObj->Label() );
+      aDoc->Transform( aPnt1, true );
+      aDoc->Transform( aPnt2, true );
+      aDoc->Transform( aPnt3, true );
+      aDoc->Transform( aPnt4, true );
+
       TopoDS_Edge anEdge1 = BRepBuilderAPI_MakeEdge( aPnt1, aPnt2 ).Edge();
       TopoDS_Edge anEdge2 = BRepBuilderAPI_MakeEdge( aPnt2, aPnt3 ).Edge();
       TopoDS_Edge anEdge3 = BRepBuilderAPI_MakeEdge( aPnt3, aPnt4 ).Edge();
       TopoDS_Edge anEdge4 = BRepBuilderAPI_MakeEdge( aPnt4, aPnt1 ).Edge();
 
       TopoDS_Wire aWire = BRepBuilderAPI_MakeWire( anEdge1, anEdge2, anEdge3, anEdge4 ).Wire();
+      aWire.Closed( true );
 
       setTextureFileName( aTextureFileName, false, false );
       setFace( aWire, false, false );
+      isDeactivateSelection = true;
     }
-  }
+    else if ( myObject->IsKind( STANDARD_TYPE(HYDROData_Profile) ) )
+    {
+      Handle(HYDROData_Profile) aProfile =
+        Handle(HYDROData_Profile)::DownCast( myObject );
+
+      TopoDS_Wire aProfileWire;
 
+      if ( aProfile->IsValid() ) {
+        TopoDS_Shape aProfileShape = aProfile->GetShape3D();
+
+        if ( !aProfileShape.IsNull() && 
+             aProfileShape.ShapeType() == TopAbs_WIRE ) {
+          aProfileWire = TopoDS::Wire( aProfileShape );
+        }
+      }
+
+      setWire( aProfileWire, false, false );  
+
+      QColor aWireColor = aProfile->GetBorderColor();
+      setBorderColor( aWireColor, false, false );
+    }
+    else if ( myObject->IsKind( STANDARD_TYPE(HYDROData_Stream) ) ||
+              myObject->IsKind( STANDARD_TYPE(HYDROData_Channel) ) ||
+              myObject->IsKind( STANDARD_TYPE(HYDROData_Obstacle) ) )
+    {
+      Handle(HYDROData_Object) aGeomObject =
+        Handle(HYDROData_Object)::DownCast( myObject );
+
+      TopoDS_Shape anObjShape = aGeomObject->GetTopShape();
+
+      setShape( anObjShape, false, false );
+
+      QColor aFillingColor = aGeomObject->GetFillingColor();
+      QColor aBorderColor = aGeomObject->GetBorderColor();
+
+      setFillingColor( aFillingColor, false, false );
+      setBorderColor( aBorderColor, false, false );
+    }
+    else if ( myObject->IsKind( STANDARD_TYPE(HYDROData_DummyObject3D) ) )
+    {
+      Handle(HYDROData_DummyObject3D) anObject3D =
+        Handle(HYDROData_DummyObject3D)::DownCast( myObject );
+      TopoDS_Shape aShape3D = anObject3D->GetShape();
+
+      setShape( aShape3D, false, false );
+
+      QColor aFillingColor = anObject3D->GetFillingColor();
+      QColor aBorderColor = anObject3D->GetBorderColor();
+
+      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 );
+  displayShape( theIsUpdateViewer );
+
+  if (isDeactivateSelection)
+    myContext->Deactivate(myShape);
 }
 
 void HYDROGUI_Shape::setVisible( const bool theState,
                                  const bool theIsUpdateViewer )
 {
-  if ( myIsVisible == theState )
-    return;
-
   myIsVisible = theState;
 
   if ( myShape.IsNull() )
     return;
 
-  if ( myIsVisible )
-    myContext->Display( myShape, theIsUpdateViewer );
+  if ( ( myIsVisible && myContext->IsDisplayed( myShape ) ) ||
+       ( !myIsVisible && !myContext->IsDisplayed( myShape ) ) )
+    return;
+
+  if ( myIsVisible ) {
+    displayShape( theIsUpdateViewer );
+  }
   else
     myContext->Erase( myShape, theIsUpdateViewer );
 }
 
-void HYDROGUI_Shape::highlight( bool theIsHighlight )
+void HYDROGUI_Shape::highlight( bool theIsHighlight, bool isUpdateViewer )
 {
   if ( myIsHighlight == theIsHighlight )
     return;
@@ -211,7 +438,7 @@ void HYDROGUI_Shape::highlight( bool theIsHighlight )
     return;
 
   colorShapeBorder( getActiveColor() );
-  myContext->Display( myShape );
+  displayShape( isUpdateViewer );
 }
 
 bool HYDROGUI_Shape::isHighlighted() const
@@ -224,7 +451,38 @@ void HYDROGUI_Shape::setWire( const TopoDS_Wire& theWire,
                               const bool         theIsUpdateViewer )
 {
   myTopoShape = theWire;
-  myDisplayMode = AIS_WireFrame;
+  // To avoid that hilight presentation is equal to "normal" object presentation.
+  // Note that hilight presentation is always to be on top ( i.e. in the top Z layer ).
+  myDisplayMode = AIS_Shaded;
+
+  buildShape();
+  updateShape( theToDisplay, theIsUpdateViewer );
+}
+
+void HYDROGUI_Shape::setFaces( const TopoDS_Compound& theWires,
+                               const bool             theToDisplay,
+                               const bool             theIsUpdateViewer )
+{
+  TopExp_Explorer anExp( theWires, TopAbs_WIRE );
+  TopoDS_Compound aCompound;
+  BRep_Builder aBuilder;
+    aBuilder.MakeCompound( aCompound );
+
+  for ( ; anExp.More(); anExp.Next() ) {
+    TopoDS_Wire aWire = TopoDS::Wire( anExp.Current() );
+    if ( aWire.IsNull() ) {
+      continue;
+    }
+
+    BRepBuilderAPI_MakeFace aMakeFace( aWire, Standard_True );
+    aMakeFace.Build();
+    if( aMakeFace.IsDone() ) {
+      aBuilder.Add( aCompound, aMakeFace.Face() );
+    }
+  }
+
+  myTopoShape = aCompound;
+  myDisplayMode = AIS_Shaded;
 
   buildShape();
   updateShape( theToDisplay, theIsUpdateViewer );
@@ -248,7 +506,20 @@ void HYDROGUI_Shape::setFace( const TopoDS_Face& theFace,
                               const bool         theIsUpdateViewer )
 {
   myTopoShape = theFace;
-  myDisplayMode = myTextureFileName.isEmpty() ? AIS_Shaded : AIS_ExactHLR;
+  myDisplayMode = myTextureFileName.isEmpty() ? AIS_Shaded : AIS_Shaded+2;
+  //Note: AIS_Shaded+2 is the same as AIS_ExactHLR
+  //TODO: it would be more suitable to use TexturedShape mode from GEOM_AISShape
+
+  buildShape();
+  updateShape( theToDisplay, theIsUpdateViewer );
+}
+
+void HYDROGUI_Shape::setShape( const TopoDS_Shape& theShape,
+                               const bool          theToDisplay,
+                               const bool          theIsUpdateViewer )
+{
+  myTopoShape = theShape;
+  myDisplayMode = AIS_Shaded;
 
   buildShape();
   updateShape( theToDisplay, theIsUpdateViewer );
@@ -303,15 +574,39 @@ QString HYDROGUI_Shape::getTextureFileName() const
   return myTextureFileName;
 }
 
+void HYDROGUI_Shape::setZLayer( const int theZLayer )
+{
+  if ( myZLayer == theZLayer )
+    return;
+
+  myZLayer = theZLayer;
+  if ( !myShape.IsNull() && isVisible() && !myContext.IsNull() && myZLayer >= 0 )
+    myContext->SetZLayer( myShape, myZLayer );
+}
+
 void HYDROGUI_Shape::buildShape()
 {
   // Erase previously created shape
   erase();
 
-  if ( myTopoShape.IsNull() )
+  if ( myTopoShape.IsNull() ) {
+    myShape.Nullify();
     return;
+  }
+
+  QString aTextureFileName = getTextureFileName();
+  bool anIsTexture = !aTextureFileName.isEmpty();
 
-  myShape = new AIS_TexturedShape( myTopoShape );
+  if ( anIsTexture )
+  {
+    myShape = new AIS_TexturedShape( myTopoShape );
+  }
+  else
+  {
+    myShape = new AIS_Shape( myTopoShape );
+  }
+
+  myShape->SetHLRAngleAndDeviation( 0.001 );
 
   if ( !myObject.IsNull() )
     myShape->SetOwner( myObject );
@@ -319,34 +614,42 @@ void HYDROGUI_Shape::buildShape()
   myShape->SetTransparency( 0 );
   myShape->SetDisplayMode( (AIS_DisplayMode)myDisplayMode );
 
-  QString aTextureFileName = getTextureFileName();
-  if( !aTextureFileName.isEmpty() )
+  if( anIsTexture )
   {
-    myShape->SetTextureFileName( HYDROGUI_Tool::ToAsciiString( aTextureFileName ) );
-    myShape->SetTextureMapOn();
-    myShape->DisableTextureModulate();
+    Handle(AIS_TexturedShape) aTexturedShape = 
+      Handle(AIS_TexturedShape)::DownCast( myShape );
+
+    aTexturedShape->SetTextureFileName( HYDROGUI_Tool::ToAsciiString( aTextureFileName ) );
+    aTexturedShape->SetTextureMapOn();
+    // Just use the texture image as is
+    aTexturedShape->DisableTextureModulate();
+    aTexturedShape->SetTextureRepeat( false ); // don't repeat the texture image on the face
   }
 
     // Init default params for shape
   const Handle(AIS_Drawer)& anAttributes = myShape->Attributes();
   if ( !anAttributes.IsNull() )
   {
-    if ( myDisplayMode == AIS_Shaded )
-    {
-      Handle(Prs3d_IsoAspect) anIsoAspect = anAttributes->UIsoAspect();
-      if ( !anIsoAspect.IsNull() )
-        anIsoAspect->SetNumber( 0 );
+    Handle(Prs3d_IsoAspect) anIsoAspect = anAttributes->UIsoAspect();
+    if ( !anIsoAspect.IsNull() ) {
+      anIsoAspect->SetNumber( 0 );
+      anAttributes->SetUIsoAspect( anIsoAspect );
+    }
       
-      anIsoAspect = anAttributes->VIsoAspect();
-      if ( !anIsoAspect.IsNull() )
-        anIsoAspect->SetNumber( 0 );
+    anIsoAspect = anAttributes->VIsoAspect();
+    if ( !anIsoAspect.IsNull() ) {
+      anIsoAspect->SetNumber( 0 );
+      anAttributes->SetVIsoAspect( anIsoAspect );
+    }
 
+    if ( myDisplayMode == AIS_Shaded )
+    {
       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 );
@@ -394,7 +697,17 @@ void HYDROGUI_Shape::updateShape( const bool theToDisplay,
   if ( !theToDisplay || !isVisible() || myContext.IsNull() )
     return;
   
-  myContext->Display( myShape, theIsUpdateViewer );
+  displayShape( theIsUpdateViewer );
+}
+
+void HYDROGUI_Shape::displayShape( const bool theIsUpdateViewer )
+{
+  myContext->Display( myShape, Standard_False );
+
+  if ( myZLayer >= 0 )
+    myContext->SetZLayer( myShape, myZLayer );
+
+  myContext->UpdateCurrentViewer();
 }
 
 QColor HYDROGUI_Shape::getActiveColor() const
@@ -420,7 +733,12 @@ void HYDROGUI_Shape::colorShapeBorder( const QColor& theColor )
                                getQuantityColorVal( theColor.green() ),
                                getQuantityColorVal( theColor.blue() ),
                                Quantity_TOC_RGB );
-  if ( myDisplayMode == AIS_Shaded )
+
+  
+  if ( myTopoShape.ShapeType() == TopAbs_WIRE ) // Note that we display polylines in shaded mode
+  {
+    myShape->SetColor( aBorderColor );
+  } else if ( myDisplayMode == AIS_Shaded )
   {
     if ( theColor.alpha() == 0 )
     {
@@ -432,7 +750,16 @@ void HYDROGUI_Shape::colorShapeBorder( const QColor& theColor )
 
       Handle(Prs3d_LineAspect) aBoundaryAspect = anAttributes->FaceBoundaryAspect();
       if ( !aBoundaryAspect.IsNull() )
+      {
         aBoundaryAspect->SetColor( aBorderColor );
+        anAttributes->SetFaceBoundaryAspect( aBoundaryAspect );
+      }
+      Handle(Prs3d_LineAspect) aWireAspect = anAttributes->WireAspect();
+      if ( !aWireAspect.IsNull() )
+      {
+        aWireAspect->SetColor( aBorderColor );
+        anAttributes->SetWireAspect( aWireAspect );
+      }
     }
   }
   else if ( myDisplayMode == AIS_WireFrame )
@@ -441,7 +768,7 @@ void HYDROGUI_Shape::colorShapeBorder( const QColor& theColor )
   }
 }
 
-QString HYDROGUI_Shape::generateTextureFileName( const Handle(HYDROData_Object)& theImageObj )
+QString HYDROGUI_Shape::generateTextureFileName( const Handle(HYDROData_Entity)& theImageObj )
 {
   QString aResult;
   if( !theImageObj.IsNull() )