From 26197be88e35b978201cdd05c4b34d4acbfad111 Mon Sep 17 00:00:00 2001
From: asl <asl@opencascade.com>
Date: Wed, 20 Sep 2017 17:01:08 +0300
Subject: [PATCH] refs #1330: basic implementation of the not zoomable polyline
 arrows

---
 .../HYDROGUI_ImportLandCoverMapOp.cxx         |   4 +-
 src/HYDROGUI/HYDROGUI_OCCDisplayer.cxx        |   9 +-
 src/HYDROGUI/HYDROGUI_Polyline.cxx            | 160 ++++++------
 src/HYDROGUI/HYDROGUI_Polyline.h              |  33 ++-
 src/HYDROGUI/HYDROGUI_RecognizeContoursOp.cxx |   4 +-
 src/HYDROGUI/HYDROGUI_Shape.cxx               | 236 ++++++++++--------
 src/HYDROGUI/HYDROGUI_Shape.h                 |   9 +-
 src/HYDROGUI/HYDROGUI_ShapeBathymetry.cxx     |  18 +-
 src/HYDROGUI/HYDROGUI_ShapeBathymetry.h       |   2 +-
 src/HYDROGUI/HYDROGUI_ShapeImage.cxx          |   7 +-
 src/HYDROGUI/HYDROGUI_ShapeImage.h            |   2 +-
 src/HYDROGUI/HYDROGUI_ShapeLandCoverMap.cxx   |  11 +-
 src/HYDROGUI/HYDROGUI_ShapeLandCoverMap.h     |   2 +-
 src/HYDRO_tests/TestViewer.cxx                |  21 +-
 src/HYDRO_tests/TestViewer.h                  |   2 +
 .../reference_data/Polyline_Presentation.png  | Bin 8060 -> 8424 bytes
 src/HYDRO_tests/test_HYDROData_DTM.cxx        |   2 +-
 src/HYDRO_tests/test_HYDROData_PolylineXY.cxx |  13 +-
 src/HYDRO_tests/test_HYDROGUI_Shape.cxx       |   2 +-
 19 files changed, 285 insertions(+), 252 deletions(-)

diff --git a/src/HYDROGUI/HYDROGUI_ImportLandCoverMapOp.cxx b/src/HYDROGUI/HYDROGUI_ImportLandCoverMapOp.cxx
index ecae1836..c4a5a0d5 100644
--- a/src/HYDROGUI/HYDROGUI_ImportLandCoverMapOp.cxx
+++ b/src/HYDROGUI/HYDROGUI_ImportLandCoverMapOp.cxx
@@ -311,7 +311,7 @@ void HYDROGUI_ImportLandCoverMapOp::onSelectionChanged( const QStringList& theSe
     foreach ( QString aName, myPolygonName2PrsShape.keys() ) 
     {
       Handle(AIS_InteractiveObject) anObject = 
-        myPolygonName2PrsShape.value(aName)->getAISObject();
+        myPolygonName2PrsShape.value(aName)->getAISObjects()[0];
 
       bool isSelected = theSelectedNames.contains( aName );
       if ( ( isSelected && !aCtx->IsSelected( anObject) ) || ( !isSelected && aCtx->IsSelected( anObject) ) )
@@ -353,7 +353,7 @@ void HYDROGUI_ImportLandCoverMapOp::onViewerSelectionChanged()
   {
     QStringList aSelectedNames;
     foreach ( QString aName, myPolygonName2PrsShape.keys() ) {
-      bool isSelected = aCtx->IsSelected( myPolygonName2PrsShape.value(aName)->getAISObject() );
+      bool isSelected = aCtx->IsSelected( myPolygonName2PrsShape.value(aName)->getAISObjects()[0] );
       if ( isSelected )
         aSelectedNames << aName;
     }
diff --git a/src/HYDROGUI/HYDROGUI_OCCDisplayer.cxx b/src/HYDROGUI/HYDROGUI_OCCDisplayer.cxx
index f0386a46..d447abbe 100644
--- a/src/HYDROGUI/HYDROGUI_OCCDisplayer.cxx
+++ b/src/HYDROGUI/HYDROGUI_OCCDisplayer.cxx
@@ -398,8 +398,11 @@ void HYDROGUI_OCCDisplayer::SetZLayer( const OCCViewer_Viewer* theViewer,
   HYDROGUI_Shape* anObjShape = module()->getObjectShape( aViewerId, theObject );
 
   // Set Z layer
-  if ( anObjShape ) {
-    aCtx->SetZLayer( anObjShape->getAISObject(), theZLayerId );
+  if ( anObjShape )
+  {
+    QList<Handle(AIS_InteractiveObject)> shapes = anObjShape->getAISObjects();
+    foreach( Handle(AIS_InteractiveObject) shape, shapes )
+      aCtx->SetZLayer( shape, theZLayerId );
   }
 }
 
@@ -517,7 +520,7 @@ void HYDROGUI_OCCDisplayer::UpdateColorScale( const OCCViewer_Viewer* theViewer
     if( isScalarMode != isLandCoverColoringOn )
     {
       aLandCoverMapShape->setScalarMapModeEnabled( isLandCoverColoringOn );
-      theViewer->getAISContext()->Redisplay( aLandCoverMapShape->getAISObject() );
+      theViewer->getAISContext()->Redisplay( aLandCoverMapShape->getAISObjects()[0], Standard_False );
     }
   }
   
diff --git a/src/HYDROGUI/HYDROGUI_Polyline.cxx b/src/HYDROGUI/HYDROGUI_Polyline.cxx
index b9a7a2aa..e640f9a7 100644
--- a/src/HYDROGUI/HYDROGUI_Polyline.cxx
+++ b/src/HYDROGUI/HYDROGUI_Polyline.cxx
@@ -17,29 +17,21 @@
 //
 
 #include <HYDROGUI_Polyline.h>
-
-#include <AIS_InteractiveContext.hxx>
+#include <BRepAdaptor_Curve.hxx>
+#include <BRepBndLib.hxx>
 #include <BRep_Tool.hxx>
 #include <GCPnts_AbscissaPoint.hxx>
-#include <GeomAdaptor_Curve.hxx>
-#include <Graphic3d_AspectLine3d.hxx>
-#include <gp_Pnt.hxx>
-#include <gp_Dir.hxx>
+#include <GCPnts_QuasiUniformDeflection.hxx>
+#include <Graphic3d_ArrayOfPolylines.hxx>
 #include <Prs3d_Arrow.hxx>
-#include <TopExp.hxx>
-#include <TopoDS_Shape.hxx>
+#include <Prs3d_LineAspect.hxx>
+#include <Prs3d_Point.hxx>
+#include <Prs3d_Root.hxx>
 #include <TopExp.hxx>
 #include <TopExp_Explorer.hxx>
 #include <TopoDS.hxx>
 #include <TopoDS_Edge.hxx>
-#include <TopoDS_Shape.hxx>
 #include <TopoDS_Vertex.hxx>
-#include <BRepBndLib.hxx>
-#include <Precision.hxx>
-#include <Graphic3d_ArrayOfPolylines.hxx>
-#include <GCPnts_QuasiUniformDeflection.hxx>
-#include <BRepAdaptor_Curve.hxx>
-#include <Prs3d_LineAspect.hxx>
 
 IMPLEMENT_STANDARD_RTTIEXT(HYDROGUI_Polyline, AIS_Shape)
 
@@ -75,6 +67,7 @@ void HYDROGUI_Polyline::Compute(const Handle(PrsMgr_PresentationManager3d)& aPre
                             const Standard_Integer aMode)
 {  
   //AIS_Shape::Compute(aPresentationManager, aPrs, aMode);
+  //return;
 
   aPrs->Clear();
   Handle(Graphic3d_Group) aGroup = Prs3d_Root::CurrentGroup( aPrs );
@@ -106,79 +99,76 @@ void HYDROGUI_Polyline::Compute(const Handle(PrsMgr_PresentationManager3d)& aPre
       aGroup->AddPrimitiveArray( anArray );
     }
   }
+}
 
-   
-  TopExp_Explorer Exp ( myshape, TopAbs_EDGE );
-  for ( ; Exp.More(); Exp.Next() ) {
-    TopoDS_Vertex aV1, aV2;
+QList<Handle(AIS_InteractiveObject)> HYDROGUI_Polyline::createPresentations( const TopoDS_Shape& shape )
+{
+  QList<Handle(AIS_InteractiveObject)> shapes;
+
+  // 1. Main shape
+  shapes.append( new HYDROGUI_Polyline( shape ) );
+
+  // 2. Shapes for direction arrows on edges
+  TopExp_Explorer Exp ( shape, TopAbs_EDGE );
+  for ( ; Exp.More(); Exp.Next() )
+  {
     TopoDS_Edge anEdge = TopoDS::Edge(Exp.Current());
-    
-    if ( anEdge.IsNull() ) 
-      continue;
-    TopExp::Vertices(anEdge, aV1, aV2);
-    gp_Pnt aP = BRep_Tool::Pnt(aV1);
-    gp_Vec aDirVec;
-    double aFp, aLp;
-    Handle(Geom_Curve) C = BRep_Tool::Curve(anEdge,aFp,aLp);
-    if ( C.IsNull() ) 
-      continue;
-  
-    Bnd_Box aBB;
-    BRepBndLib::Add(anEdge, aBB);
-    Standard_Real aXmin,aYmin,aZmin,aXmax,aYmax,aZmax;
-    aBB.Get(aXmin,aYmin,aZmin,aXmax,aYmax,aZmax);
-    Standard_Real aLen = Max(Abs(aXmax - aXmin), Max (Abs(aZmax - aZmin), Abs(aYmax - aYmin)));
-  
-    GeomAdaptor_Curve aAdC;
-    aAdC.Load(C, aFp, aLp);
-    double aLenC;
-    double aLenH;
-    int aNbSegments = 20;
-    double aArrLen = aLen / 10.;
-    double anIncr = (aLp-aFp)/aNbSegments;
-    double aMaxRatio = 0;
-    double aMaxRatioStep = 1;
-    for (double t = aFp; t < aLp - anIncr; t += anIncr)
-    {
-       aLenC  = GCPnts_AbscissaPoint::Length(aAdC, t, t + anIncr);
-       aLenH = C->Value (t).Distance (C->Value (t + anIncr));
-       if ( aLenH / aLenC > aMaxRatio) {
-         aMaxRatio = aLenH / aLenC;
-         aMaxRatioStep = t;
-       }
-    }
+    if ( !anEdge.IsNull() ) 
+      shapes.append( new HYDROGUI_Arrow( anEdge ) );
+  }
 
-    bool UseD1 = false;
-    if (Abs(aMaxRatioStep) < Precision::Confusion())
-    {
-      aMaxRatioStep = (aLp - aFp)/2.0;
-      UseD1 = true;
-    }
+  return shapes;
+}
 
-    if (Abs(aLp - aMaxRatioStep) < Precision::Confusion())
-    {
-      aMaxRatioStep =  (aLp - aFp)/2.0;
-      UseD1 = true;
-    }      
-    
-    gp_Pnt aPnt1 = C->Value (aMaxRatioStep);
-    gp_Vec aDir;
-    if (!UseD1) 
-    {
-      GCPnts_AbscissaPoint aAbsPoint(aAdC, -aArrLen, aMaxRatioStep);
-      double aParam = aAbsPoint.Parameter();      
-      gp_Pnt aPnt2 = C->Value (aParam);
-      gp_XYZ D = aPnt1.XYZ();
-      D.Subtract (aPnt2.XYZ());
-      aDir = D;
-    }
 
-    if (UseD1 || aDir.IsEqual (gp_Vec(0,0,0), Precision::Confusion(), Precision::Angular()))
-      C->D1(aMaxRatioStep, aPnt1, aDir);
-  
-    if ( anEdge.Orientation() == TopAbs_REVERSED )
-      aDir = -aDir;
-  
-    Prs3d_Arrow::Draw(aPrs, aPnt1, aDir, M_PI/180.*12., aArrLen);     
-  }
+
+
+
+IMPLEMENT_STANDARD_RTTIEXT(HYDROGUI_Arrow, AIS_Shape)
+
+
+HYDROGUI_Arrow::HYDROGUI_Arrow( const TopoDS_Edge& edge )
+  : AIS_Shape( edge )
+{
+}
+
+HYDROGUI_Arrow::~HYDROGUI_Arrow()
+{
+}
+
+void HYDROGUI_Arrow::Compute( const Handle(PrsMgr_PresentationManager3d)& aPresentationManager,
+				                      const Handle(Prs3d_Presentation)& aPrs,
+				                      const Standard_Integer aMode )
+{
+  aPrs->Clear();
+
+  TopoDS_Edge anEdge = TopoDS::Edge( myshape );
+  if( anEdge.IsNull() )
+    return;
+
+  BRepAdaptor_Curve anAdaptor( anEdge );
+  double curveLen = GCPnts_AbscissaPoint::Length( anAdaptor, anAdaptor.FirstParameter(), anAdaptor.LastParameter() );
+  double arrowLen = qMin( curveLen/10, 35.0 );
+
+  double t = ( anAdaptor.FirstParameter() + anAdaptor.LastParameter() ) / 2;
+  gp_Pnt P;
+  gp_Vec V;
+  anAdaptor.D1( t, P, V );
+
+  gp_Trsf tr;
+  tr.SetTranslation( -gp_Vec( gp_Pnt(), P ) );
+  aPrs->SetTransformation( new Geom_Transformation( tr ) );
+
+  Handle(Graphic3d_TransformPers) tp = new Graphic3d_TransformPers( Graphic3d_TMF_ZoomPers, P );
+  SetTransformPersistence( tp );
+
+  Handle(Graphic3d_Group) aGroup = Prs3d_Root::CurrentGroup( aPrs );
+  Quantity_Color aColor;
+  Aspect_TypeOfLine aType;
+  Standard_Real anWidth;
+  Attributes()->LineAspect()->Aspect()->Values( aColor, aType, anWidth );
+  anWidth = 1;
+  Handle(Graphic3d_AspectLine3d) anAspect = new Graphic3d_AspectLine3d( aColor, aType, anWidth );
+  aGroup->SetPrimitivesAspect( anAspect );
+  Prs3d_Arrow::Draw( aGroup, gp_Pnt(), V, M_PI/180.*12., arrowLen );
 }
diff --git a/src/HYDROGUI/HYDROGUI_Polyline.h b/src/HYDROGUI/HYDROGUI_Polyline.h
index 7b70a15f..130dc879 100644
--- a/src/HYDROGUI/HYDROGUI_Polyline.h
+++ b/src/HYDROGUI/HYDROGUI_Polyline.h
@@ -20,30 +20,39 @@
 #define _HYDROGUI_Polyline_HeaderFile
 
 #include <AIS_Shape.hxx>
-#include <AIS_InteractiveObject.hxx>
-
-#include <Standard.hxx>
-#include <Standard_DefineHandle.hxx>
-#include <PrsMgr_PresentationManager.hxx>
-#include <Prs3d_Presentation.hxx>
-#include <TCollection_AsciiString.hxx>
-#include <AIS_DisplayMode.hxx>
+#include <QList>
 
 class TopoDS_Shape;
+class TopoDS_Edge;
 
 class HYDROGUI_Polyline : public AIS_Shape
 {
 public:
-  
-  Standard_EXPORT HYDROGUI_Polyline(const TopoDS_Shape& shape);
-  Standard_EXPORT ~HYDROGUI_Polyline();
+  HYDROGUI_Polyline( const TopoDS_Shape& shape );
+  virtual ~HYDROGUI_Polyline();
 
-  Standard_EXPORT virtual void Compute(const Handle(PrsMgr_PresentationManager3d)& aPresentationManager,
+  virtual void Compute(const Handle(PrsMgr_PresentationManager3d)& aPresentationManager,
 				       const Handle(Prs3d_Presentation)& aPresentation,
 				       const Standard_Integer aMode = 0);
   
+  static QList<Handle(AIS_InteractiveObject)> createPresentations( const TopoDS_Shape& shape );
+
 public:
   DEFINE_STANDARD_RTTIEXT(HYDROGUI_Polyline, AIS_Shape);
 };
 
+class HYDROGUI_Arrow : public AIS_Shape
+{
+public:
+  HYDROGUI_Arrow( const TopoDS_Edge& edge );
+  virtual ~HYDROGUI_Arrow();
+
+  virtual void Compute( const Handle(PrsMgr_PresentationManager3d)& aPresentationManager,
+				                const Handle(Prs3d_Presentation)& aPresentation,
+				                const Standard_Integer aMode = 0 );
+  
+public:
+  DEFINE_STANDARD_RTTIEXT(HYDROGUI_Arrow, AIS_Shape);
+};
+
 #endif
diff --git a/src/HYDROGUI/HYDROGUI_RecognizeContoursOp.cxx b/src/HYDROGUI/HYDROGUI_RecognizeContoursOp.cxx
index dfb279ff..20220731 100644
--- a/src/HYDROGUI/HYDROGUI_RecognizeContoursOp.cxx
+++ b/src/HYDROGUI/HYDROGUI_RecognizeContoursOp.cxx
@@ -443,7 +443,7 @@ void HYDROGUI_RecognizeContoursOp::onSelectionChanged( const QStringList& theSel
   if ( !aCtx.IsNull() ) {
     foreach ( QString aName, myPolylineShapes.keys() ) {
       Handle(AIS_InteractiveObject) anObject = 
-        myPolylineShapes.value(aName)->getAISObject();
+        myPolylineShapes.value(aName)->getAISObjects()[0];
 
       bool isSelected = theSelectedNames.contains( aName );
       if ( ( isSelected && !aCtx->IsSelected( anObject) ) ||
@@ -481,7 +481,7 @@ void HYDROGUI_RecognizeContoursOp::onViewerSelectionChanged()
     QStringList aSelectedNames;
 
     foreach ( QString aName, myPolylineShapes.keys() ) {
-      bool isSelected = aCtx->IsSelected( myPolylineShapes.value(aName)->getAISObject() );
+      bool isSelected = aCtx->IsSelected( myPolylineShapes.value(aName)->getAISObjects()[0] );
       if ( isSelected ) {
         aSelectedNames << aName;
       }
diff --git a/src/HYDROGUI/HYDROGUI_Shape.cxx b/src/HYDROGUI/HYDROGUI_Shape.cxx
index c34f2cc9..8f271e54 100644
--- a/src/HYDROGUI/HYDROGUI_Shape.cxx
+++ b/src/HYDROGUI/HYDROGUI_Shape.cxx
@@ -62,9 +62,6 @@ HYDROGUI_Shape::HYDROGUI_Shape( const Handle(AIS_InteractiveContext)& theContext
 HYDROGUI_Shape::~HYDROGUI_Shape()
 {
   erase( false );
-
-  if ( !myShape.IsNull() )
-    myShape.Nullify();
 }
 
 Handle(AIS_InteractiveContext) HYDROGUI_Shape::getContext() const
@@ -97,14 +94,14 @@ bool HYDROGUI_Shape::isVisible() const
   return myIsVisible;
 }
 
-Handle(AIS_InteractiveObject) HYDROGUI_Shape::getAISObject() const
+QList<Handle(AIS_InteractiveObject)> HYDROGUI_Shape::getAISObjects() const
 {
-  return myShape;
+  return myShapes;
 }
 
 void HYDROGUI_Shape::display( const bool theIsUpdateViewer )
 {
-  if ( myContext.IsNull() || myShape.IsNull() || !isVisible() )
+  if ( myContext.IsNull() || myShapes.empty() || !isVisible() )
     return;
 
   displayShape( theIsUpdateViewer );
@@ -112,7 +109,7 @@ void HYDROGUI_Shape::display( const bool theIsUpdateViewer )
 
 void HYDROGUI_Shape::erase( const bool theIsUpdateViewer )
 {
-  if ( myContext.IsNull() || myShape.IsNull() )
+  if ( myContext.IsNull() || myShapes.empty() )
     return;
 
   eraseShape( theIsUpdateViewer );
@@ -305,13 +302,14 @@ void HYDROGUI_Shape::update( bool isUpdateViewer,
     }
   }
  
-  if ( myShape.IsNull() || !isVisible() )
+  if ( myShapes.empty() || !isVisible() )
     return;
 
   displayShape( isUpdateViewer );
 
   if (isDeactivateSelection)
-    myContext->Deactivate(myShape);
+    foreach( Handle(AIS_InteractiveObject) aShape, myShapes )
+      myContext->Deactivate( aShape );
 }
 
 void HYDROGUI_Shape::setVisible( const bool theState,
@@ -319,11 +317,11 @@ void HYDROGUI_Shape::setVisible( const bool theState,
 {
   myIsVisible = theState;
 
-  if ( myShape.IsNull() )
+  if ( myShapes.empty() )
     return;
 
-  if ( ( myIsVisible && myContext->IsDisplayed( myShape ) ) ||
-       ( !myIsVisible && !myContext->IsDisplayed( myShape ) ) )
+  if ( ( myIsVisible && myContext->IsDisplayed( myShapes[0] ) ) ||
+       ( !myIsVisible && !myContext->IsDisplayed( myShapes[0] ) ) )
     return;
 
   if ( myIsVisible ) {
@@ -340,7 +338,7 @@ void HYDROGUI_Shape::highlight( bool theIsHighlight, bool isUpdateViewer )
 
   myIsHighlight = theIsHighlight;
 
-  if ( myContext.IsNull() || myShape.IsNull() )
+  if ( myContext.IsNull() || myShapes.empty() )
     return;
 
   colorShapeBorder( getActiveColor() );
@@ -476,14 +474,16 @@ void HYDROGUI_Shape::setZLayer( const int theZLayer )
     return;
 
   myZLayer = theZLayer;
-  if ( !myShape.IsNull() && isVisible() && !myContext.IsNull() && myZLayer >= 0 )
-    myContext->SetZLayer( myShape, myZLayer );
+  if( isVisible() && !myContext.IsNull() && myZLayer >= 0 )
+    foreach( Handle(AIS_InteractiveObject) aShape, myShapes )
+      myContext->SetZLayer( aShape, myZLayer );
 }
 
-Handle(AIS_InteractiveObject) HYDROGUI_Shape::createShape() const
+QList<Handle(AIS_InteractiveObject)> HYDROGUI_Shape::createShape() const
 {
+  QList<Handle(AIS_InteractiveObject)> shapes;
   if( myTopoShape.IsNull() ) {
-    return Handle(AIS_InteractiveObject)();
+    return shapes;
   }
 
   TopAbs_ShapeEnum aShapeType = myTopoShape.ShapeType();
@@ -497,11 +497,15 @@ Handle(AIS_InteractiveObject) HYDROGUI_Shape::createShape() const
     }
   }
 
-  if ( aShapeType==TopAbs_EDGE || aShapeType==TopAbs_WIRE || IsWireEdgeCompound) {
-    return new HYDROGUI_Polyline( myTopoShape );
-  } else {
-    return new HYDROGUI_AISShape( myTopoShape );
+  if ( aShapeType==TopAbs_EDGE || aShapeType==TopAbs_WIRE || IsWireEdgeCompound)
+  {
+    shapes.append( HYDROGUI_Polyline::createPresentations( myTopoShape ) );
+  }
+  else
+  {
+    shapes.append( new HYDROGUI_AISShape( myTopoShape ) );
   }
+  return shapes;
 }
 
 void HYDROGUI_Shape::buildShape()
@@ -509,45 +513,48 @@ void HYDROGUI_Shape::buildShape()
   // Erase previously created shape
   erase(false);
 
-  myShape = createShape();
-  if( myShape.IsNull() )
+  myShapes = createShape();
+  if( myShapes.empty() )
     return;
 
-  Handle(AIS_Shape) anAISShape = Handle(AIS_Shape)::DownCast( myShape );
-  if( !anAISShape.IsNull() )
-    anAISShape ->SetHLRAngleAndDeviation( 0.001 );
+  foreach( Handle(AIS_InteractiveObject) aShape, myShapes )
+  {
+    Handle(AIS_Shape) anAISShape = Handle(AIS_Shape)::DownCast( aShape );
+    if( !anAISShape.IsNull() )
+      anAISShape ->SetHLRAngleAndDeviation( 0.001 );
 
-  if ( !myObject.IsNull() )
-    myShape->SetOwner( myObject );
+    if ( !myObject.IsNull() )
+      aShape->SetOwner( myObject );
 
-  if ( !myObject.IsNull() && !myObject->IsKind( STANDARD_TYPE(HYDROData_LandCoverMap) ) )
-    myShape->SetTransparency( 0 );
-  myShape->SetDisplayMode( (AIS_DisplayMode)myDisplayMode );
+    if ( !myObject.IsNull() && !myObject->IsKind( STANDARD_TYPE(HYDROData_LandCoverMap) ) )
+      aShape->SetTransparency( 0 );
+    aShape->SetDisplayMode( (AIS_DisplayMode)myDisplayMode );
 
-  // Init default params for shape
-  const Handle(Prs3d_Drawer)& anAttributes = myShape->Attributes();
-  if ( !anAttributes.IsNull() )
-  {
-    Handle(Prs3d_IsoAspect) anIsoAspect = anAttributes->UIsoAspect();
-    if ( !anIsoAspect.IsNull() ) {
-      anIsoAspect->SetNumber( 0 );
-      anAttributes->SetUIsoAspect( anIsoAspect );
-    }
-      
-    anIsoAspect = anAttributes->VIsoAspect();
-    if ( !anIsoAspect.IsNull() )
+    // Init default params for shape
+    const Handle(Prs3d_Drawer)& anAttributes = aShape->Attributes();
+    if ( !anAttributes.IsNull() )
     {
-      anIsoAspect->SetNumber( 0 );
-      anAttributes->SetVIsoAspect( anIsoAspect );
-    }
+      Handle(Prs3d_IsoAspect) anIsoAspect = anAttributes->UIsoAspect();
+      if ( !anIsoAspect.IsNull() ) {
+        anIsoAspect->SetNumber( 0 );
+        anAttributes->SetUIsoAspect( anIsoAspect );
+      }
+      
+      anIsoAspect = anAttributes->VIsoAspect();
+      if ( !anIsoAspect.IsNull() )
+      {
+        anIsoAspect->SetNumber( 0 );
+        anAttributes->SetVIsoAspect( anIsoAspect );
+      }
 
-    if ( myDisplayMode == AIS_Shaded )
-    {
-      myShape->SetMaterial( Graphic3d_NOM_PLASTIC );
-    }
-    else if ( myDisplayMode == AIS_WireFrame )
-    {
-      anAttributes->SetWireDraw( true );
+      if ( myDisplayMode == AIS_Shaded )
+      {
+        aShape->SetMaterial( Graphic3d_NOM_PLASTIC );
+      }
+      else if ( myDisplayMode == AIS_WireFrame )
+      {
+        anAttributes->SetWireDraw( true );
+      }
     }
   }
 }
@@ -555,30 +562,30 @@ void HYDROGUI_Shape::buildShape()
 void HYDROGUI_Shape::updateShape( const bool theToDisplay,
                                   const bool theIsUpdateViewer )
 {
-  if ( myShape.IsNull() )
-    return;
-
-  const Handle(Prs3d_Drawer)& anAttributes = myShape->Attributes();
-  if ( !anAttributes.IsNull() )
+  foreach( Handle(AIS_InteractiveObject) aShape, myShapes )
   {
-    if ( myDisplayMode == AIS_Shaded && myFillingColor.isValid() )
-    {
-      Quantity_Color aFillingColor( getQuantityColorVal( myFillingColor.red() ), 
-                                    getQuantityColorVal( myFillingColor.green() ),
-                                    getQuantityColorVal( myFillingColor.blue() ),
-                                    Quantity_TOC_RGB );
-
-      myShape->SetColor( aFillingColor );
-      myShape->SetTransparency( 1 - getQuantityColorVal( myFillingColor.alpha() ) );
-    }
-    else if ( myDisplayMode == AIS_WireFrame )
+    const Handle(Prs3d_Drawer)& anAttributes = aShape->Attributes();
+    if ( !anAttributes.IsNull() )
     {
+      if ( myDisplayMode == AIS_Shaded && myFillingColor.isValid() )
+      {
+        Quantity_Color aFillingColor( getQuantityColorVal( myFillingColor.red() ), 
+                                      getQuantityColorVal( myFillingColor.green() ),
+                                      getQuantityColorVal( myFillingColor.blue() ),
+                                      Quantity_TOC_RGB );
+  
+        aShape->SetColor( aFillingColor );
+        aShape->SetTransparency( 1 - getQuantityColorVal( myFillingColor.alpha() ) );
+      }
+      else if ( myDisplayMode == AIS_WireFrame )
+      {
+      }
+  
+      // Coloring borders
     }
-
-    // Coloring borders
-    colorShapeBorder( myBorderColor );
   }
-
+  
+  colorShapeBorder( myBorderColor );
   if ( !theToDisplay || !isVisible() || myContext.IsNull() )
     return;
   
@@ -590,27 +597,34 @@ void HYDROGUI_Shape::displayShape( const bool theIsUpdateViewer )
   if ( myContext->HasOpenedContext() && mySelectionMode > 0 )
     myContext->CloseLocalContext();
 
-  if ( mySelectionMode > 0 )
-    // Display object in local context with selection
-    myContext->Display( myShape, myDisplayMode, mySelectionMode, Standard_False, Standard_False );
-  else
+  foreach( Handle(AIS_InteractiveObject) aShape, myShapes )
   {
-    if ( !myContext->HasOpenedContext() )
-      // Ordinary display of object published in the Object Browser
-      myContext->Display( myShape, Standard_False );
+    if ( mySelectionMode > 0 )
+      // Display object in local context with selection
+      myContext->Display( aShape, myDisplayMode, mySelectionMode, Standard_False, Standard_False );
     else
-      // Display object in local context without selection
-      myContext->Display( myShape, myDisplayMode, -1, Standard_False, Standard_False );
+    {
+      if ( !myContext->HasOpenedContext() )
+        // Ordinary display of object published in the Object Browser
+        myContext->Display( aShape, Standard_False );
+      else
+        // Display object in local context without selection
+        myContext->Display( aShape, myDisplayMode, -1, Standard_False, Standard_False );
+    }
   }
   
   if ( mySelectionMode > 0 )
   {
     myContext->OpenLocalContext();
-    myContext->Activate( myShape, mySelectionMode, Standard_True );
+    foreach( Handle(AIS_InteractiveObject) aShape, myShapes )
+      myContext->Activate( aShape, mySelectionMode, Standard_True );
   }
 
   if ( myZLayer >= 0 )
-    myContext->SetZLayer( myShape, myZLayer );
+  {
+    foreach( Handle(AIS_InteractiveObject) aShape, myShapes )
+      myContext->SetZLayer( aShape, myZLayer );
+  }
 
   if ( theIsUpdateViewer ) {
     myContext->UpdateCurrentViewer();
@@ -622,7 +636,11 @@ void HYDROGUI_Shape::eraseShape( const bool theIsUpdateViewer )
   if ( myContext->HasOpenedContext() && mySelectionMode > 0 )
     myContext->CloseLocalContext();
 
-  myContext->Erase( myShape, theIsUpdateViewer );
+  foreach( Handle(AIS_InteractiveObject) aShape, myShapes )
+    myContext->Erase( aShape, Standard_False );
+
+  if( theIsUpdateViewer )
+    myContext->UpdateCurrentViewer();
 }
 
 QColor HYDROGUI_Shape::getActiveColor() const
@@ -637,33 +655,33 @@ double HYDROGUI_Shape::getQuantityColorVal( const int theColorVal )
 
 void HYDROGUI_Shape::colorShapeBorder( const QColor& theColor )
 {
-  if ( myShape.IsNull() )
-    return;
-
-  const Handle(Prs3d_Drawer)& anAttributes = myShape->Attributes();
-  if ( anAttributes.IsNull() )
-    return;
+  foreach( Handle(AIS_InteractiveObject) aShape1, myShapes )
+  {
+    const Handle(Prs3d_Drawer)& anAttributes = aShape1->Attributes();
+    if ( anAttributes.IsNull() )
+      continue;
 
-  Quantity_Color aBorderColor( getQuantityColorVal( theColor.red() ), 
-                               getQuantityColorVal( theColor.green() ),
-                               getQuantityColorVal( theColor.blue() ),
-                               Quantity_TOC_RGB );
+    Quantity_Color aBorderColor( getQuantityColorVal( theColor.red() ), 
+                                 getQuantityColorVal( theColor.green() ),
+                                 getQuantityColorVal( theColor.blue() ),
+                                 Quantity_TOC_RGB );
   
-  if( !myTopoShape.IsNull() )
-  {
-    if ( myTopoShape.ShapeType() == TopAbs_WIRE ) // Note that we display polylines in shaded mode
-    {
-      myShape->SetColor( aBorderColor );
-    }
-    else if ( myDisplayMode == AIS_Shaded )
+    if( !myTopoShape.IsNull() )
     {
-      Handle(HYDROGUI_AISShape) aShape = Handle(HYDROGUI_AISShape)::DownCast( myShape );
-      if( !aShape.IsNull() )
-        aShape->SetBorderColor( aBorderColor );
-    }
-    else if ( myDisplayMode == AIS_WireFrame )
-    {
-      myShape->SetColor( aBorderColor );
+      if ( myTopoShape.ShapeType() == TopAbs_WIRE ) // Note that we display polylines in shaded mode
+      {
+        aShape1->SetColor( aBorderColor );
+      }
+      else if ( myDisplayMode == AIS_Shaded )
+      {
+        Handle(HYDROGUI_AISShape) aShape = Handle(HYDROGUI_AISShape)::DownCast( aShape1 );
+        if( !aShape.IsNull() )
+          aShape->SetBorderColor( aBorderColor );
+      }
+      else if ( myDisplayMode == AIS_WireFrame )
+      {
+        aShape1->SetColor( aBorderColor );
+      }
     }
   }
 }
diff --git a/src/HYDROGUI/HYDROGUI_Shape.h b/src/HYDROGUI/HYDROGUI_Shape.h
index 76113ba1..76b002ca 100644
--- a/src/HYDROGUI/HYDROGUI_Shape.h
+++ b/src/HYDROGUI/HYDROGUI_Shape.h
@@ -95,12 +95,11 @@ public:
   virtual void               setHighlightColor( const QColor& theColor );
   virtual QColor             getHighlightColor() const;
 
-  virtual Handle(AIS_InteractiveObject)  getAISObject() const;
-
   void                       setZLayer( const int theZLayer );
-
   void                       setSelectionMode( int theSelectionMode );
 
+  QList<Handle(AIS_InteractiveObject)> getAISObjects() const;
+
 protected:
   virtual void               buildShape();
   virtual void               updateShape( const bool theToDisplay      = true,
@@ -109,7 +108,7 @@ protected:
   virtual void               eraseShape( const bool theIsUpdateViewer );
 
   virtual QColor             getActiveColor() const;
-  virtual Handle(AIS_InteractiveObject) createShape() const;
+  virtual QList<Handle(AIS_InteractiveObject)> createShape() const;
 
   void setDisplayMode( int theDisplayMode );
 
@@ -120,7 +119,7 @@ private:
 private:
   Handle(AIS_InteractiveContext) myContext;
   Handle(HYDROData_Entity)       myObject;
-  Handle(AIS_InteractiveObject)  myShape;
+  QList<Handle(AIS_InteractiveObject)>  myShapes;
 
   int                            myZLayer;
 
diff --git a/src/HYDROGUI/HYDROGUI_ShapeBathymetry.cxx b/src/HYDROGUI/HYDROGUI_ShapeBathymetry.cxx
index a88b5069..3a72a138 100644
--- a/src/HYDROGUI/HYDROGUI_ShapeBathymetry.cxx
+++ b/src/HYDROGUI/HYDROGUI_ShapeBathymetry.cxx
@@ -58,8 +58,10 @@ void HYDROGUI_ShapeBathymetry::update( bool theIsUpdateViewer, bool isDeactivate
 }
 
 
-Handle(AIS_InteractiveObject) HYDROGUI_ShapeBathymetry::createShape() const
+QList<Handle(AIS_InteractiveObject)> HYDROGUI_ShapeBathymetry::createShape() const
 {
+  QList<Handle(AIS_InteractiveObject)> shapes;
+
   Handle(AIS_InteractiveObject) aPntCloud;
 
   Handle(HYDROData_Bathymetry) aBath = Handle(HYDROData_Bathymetry)::DownCast( getObject() );
@@ -78,9 +80,11 @@ Handle(AIS_InteractiveObject) HYDROGUI_ShapeBathymetry::createShape() const
     aThat->myColors = new Quantity_HArray1OfColor( aLower, anUpper );
     for( int i=aLower; i<=anUpper; i++ )
       aThat->myCoords->SetValue( i, gp_Pnt( aBathPoints[i].X, aBathPoints[i].Y, aBathPoints[i].Z ) );
+
+    shapes.append( aPntCloud );
   }
 
-  return aPntCloud;
+  return shapes;
 }
 
 void HYDROGUI_ShapeBathymetry::GetRange( double& theMin, double& theMax ) const
@@ -113,7 +117,7 @@ void HYDROGUI_ShapeBathymetry::UpdateWithColorScale( const Handle(AIS_ColorScale
     theColorScale->FindColor( z, aColor );
     myColors->SetValue( i, aColor );
   }
-  Handle(AIS_PointCloud) aPntCloud = Handle(AIS_PointCloud)::DownCast( getAISObject() );
+  Handle(AIS_PointCloud) aPntCloud = Handle(AIS_PointCloud)::DownCast( getAISObjects()[0] );
   aPntCloud->SetPoints( myCoords, myColors );
   getContext()->Redisplay( aPntCloud, Standard_False );
 }
@@ -121,7 +125,7 @@ void HYDROGUI_ShapeBathymetry::UpdateWithColorScale( const Handle(AIS_ColorScale
 void HYDROGUI_ShapeBathymetry::setVisible( const bool theState,
                                            const bool theIsUpdateViewer )
 {
-  bool isShown = getContext()->IsDisplayed( getAISObject() );
+  bool isShown = getContext()->IsDisplayed( getAISObjects()[0] );
   bool isChanged = ( isShown != theState );
   HYDROGUI_Shape::setVisible( theState, theIsUpdateViewer );
   setToUpdateColorScale( isChanged );
@@ -129,7 +133,7 @@ void HYDROGUI_ShapeBathymetry::setVisible( const bool theState,
 
 void HYDROGUI_ShapeBathymetry::displayShape( const bool theIsUpdateViewer )
 {
-  bool isShown = getContext()->IsDisplayed( getAISObject() );
+  bool isShown = getContext()->IsDisplayed( getAISObjects()[0] );
   bool isChanged = ( !isShown  );
   HYDROGUI_Shape::displayShape( theIsUpdateViewer );
   setToUpdateColorScale( isChanged );
@@ -137,7 +141,7 @@ void HYDROGUI_ShapeBathymetry::displayShape( const bool theIsUpdateViewer )
 
 void HYDROGUI_ShapeBathymetry::display( const bool theIsUpdateViewer )
 {
-  bool isShown = getContext()->IsDisplayed( getAISObject() );
+  bool isShown = getContext()->IsDisplayed( getAISObjects()[0] );
   bool isChanged = ( !isShown  );
   HYDROGUI_Shape::display( theIsUpdateViewer );
   setToUpdateColorScale( isChanged );
@@ -145,7 +149,7 @@ void HYDROGUI_ShapeBathymetry::display( const bool theIsUpdateViewer )
 
 void HYDROGUI_ShapeBathymetry::erase( const bool theIsUpdateViewer )
 {
-  bool isShown = getContext()->IsDisplayed( getAISObject() );
+  bool isShown = getContext()->IsDisplayed( getAISObjects()[0] );
   bool isChanged = ( isShown  );
   HYDROGUI_Shape::erase( theIsUpdateViewer );
   setToUpdateColorScale( isChanged );
diff --git a/src/HYDROGUI/HYDROGUI_ShapeBathymetry.h b/src/HYDROGUI/HYDROGUI_ShapeBathymetry.h
index c736c60f..91a0a772 100644
--- a/src/HYDROGUI/HYDROGUI_ShapeBathymetry.h
+++ b/src/HYDROGUI/HYDROGUI_ShapeBathymetry.h
@@ -48,7 +48,7 @@ public:
   virtual void               setVisible( const bool theState,
                                          const bool theIsUpdateViewer = true );
 protected:
-  virtual Handle(AIS_InteractiveObject) createShape() const;
+  virtual QList<Handle(AIS_InteractiveObject)> createShape() const;
   virtual void displayShape( const bool theIsUpdateViewer );
 
   void setToUpdateColorScale( bool isChanged );
diff --git a/src/HYDROGUI/HYDROGUI_ShapeImage.cxx b/src/HYDROGUI/HYDROGUI_ShapeImage.cxx
index 4f832399..d57f726d 100644
--- a/src/HYDROGUI/HYDROGUI_ShapeImage.cxx
+++ b/src/HYDROGUI/HYDROGUI_ShapeImage.cxx
@@ -46,17 +46,20 @@ void HYDROGUI_ShapeImage::update( bool theIsUpdateViewer, bool isDeactivateSelec
   HYDROGUI_Shape::update( theIsUpdateViewer, isDeactivateSelection );
 }
 
-Handle(AIS_InteractiveObject) HYDROGUI_ShapeImage::createShape() const
+QList<Handle(AIS_InteractiveObject)> HYDROGUI_ShapeImage::createShape() const
 {
+  QList<Handle(AIS_InteractiveObject)> shapes;
+
   Handle(HYDROGUI_ImagePrs) aPrs;
 
   Handle(HYDROData_Image) anImageObj = Handle(HYDROData_Image)::DownCast( getObject() );
   if ( !anImageObj.IsNull() )
   {
     aPrs = new HYDROGUI_ImagePrs( imagePixMap( anImageObj ), imageContour( anImageObj ) );
+    shapes.append( aPrs );
   }
 
-  return aPrs;
+  return shapes;
 }
 
 Handle(Image_PixMap) HYDROGUI_ShapeImage::imagePixMap( const Handle(HYDROData_Image)& theImageObj ) const
diff --git a/src/HYDROGUI/HYDROGUI_ShapeImage.h b/src/HYDROGUI/HYDROGUI_ShapeImage.h
index aba5b82b..17c6dec0 100644
--- a/src/HYDROGUI/HYDROGUI_ShapeImage.h
+++ b/src/HYDROGUI/HYDROGUI_ShapeImage.h
@@ -36,7 +36,7 @@ public:
   virtual void                         update( bool isUpdateViewer, bool isDeactivateSelection );
 
 protected:
-  virtual Handle(AIS_InteractiveObject) createShape() const;
+  virtual QList<Handle(AIS_InteractiveObject)> createShape() const;
   Handle(Image_PixMap)                  imagePixMap( const Handle(HYDROData_Image)& ) const;
   QPolygonF                             imageContour( const Handle(HYDROData_Image)& ) const;
 };
diff --git a/src/HYDROGUI/HYDROGUI_ShapeLandCoverMap.cxx b/src/HYDROGUI/HYDROGUI_ShapeLandCoverMap.cxx
index 3446545e..66e56301 100644
--- a/src/HYDROGUI/HYDROGUI_ShapeLandCoverMap.cxx
+++ b/src/HYDROGUI/HYDROGUI_ShapeLandCoverMap.cxx
@@ -60,7 +60,8 @@ void HYDROGUI_ShapeLandCoverMap::update( bool theIsUpdateViewer, bool isDeactiva
     setShape( aLandCoverMapShape, false, false );
   }
 
-  Handle(HYDROGUI_LandCoverMapPrs) aLandCoverMapPrs = Handle(HYDROGUI_LandCoverMapPrs)::DownCast( getAISObject() );
+  Handle(HYDROGUI_LandCoverMapPrs) aLandCoverMapPrs = 
+    Handle(HYDROGUI_LandCoverMapPrs)::DownCast( getAISObjects()[0] );
   if ( !aLandCoverMapPrs.IsNull() )
     aLandCoverMapPrs->UpdateColors();
 
@@ -91,8 +92,10 @@ void HYDROGUI_ShapeLandCoverMap::displayShape( const bool theIsUpdateViewer )
   myDisplayer->SetToUpdateColorScale();
 }
 
-Handle(AIS_InteractiveObject) HYDROGUI_ShapeLandCoverMap::createShape() const
+QList<Handle(AIS_InteractiveObject)> HYDROGUI_ShapeLandCoverMap::createShape() const
 {
+  QList<Handle(AIS_InteractiveObject)> shapes;
+
   Handle(HYDROData_LandCoverMap) aLandCoverMap = Handle(HYDROData_LandCoverMap)::DownCast( getObject() );
   if ( !aLandCoverMap.IsNull() )
   {
@@ -119,9 +122,9 @@ Handle(AIS_InteractiveObject) HYDROGUI_ShapeLandCoverMap::createShape() const
         }
       }
     }
-    return aLandCoverMapPrs;
+    shapes.append( aLandCoverMapPrs );
   }
-  return NULL;
+  return shapes;
 }
 
 void HYDROGUI_ShapeLandCoverMap::display( const bool theIsUpdateViewer )
diff --git a/src/HYDROGUI/HYDROGUI_ShapeLandCoverMap.h b/src/HYDROGUI/HYDROGUI_ShapeLandCoverMap.h
index 526c52e5..a030a370 100644
--- a/src/HYDROGUI/HYDROGUI_ShapeLandCoverMap.h
+++ b/src/HYDROGUI/HYDROGUI_ShapeLandCoverMap.h
@@ -54,7 +54,7 @@ public:
 
 protected:
   virtual void              displayShape( const bool theIsUpdateViewer );
-  virtual Handle(AIS_InteractiveObject) createShape() const;
+  virtual QList<Handle(AIS_InteractiveObject)> createShape() const;
 
 private:
   HYDROGUI_OCCDisplayer*           myDisplayer;
diff --git a/src/HYDRO_tests/TestViewer.cxx b/src/HYDRO_tests/TestViewer.cxx
index 5ef6d2d9..71cd941b 100644
--- a/src/HYDRO_tests/TestViewer.cxx
+++ b/src/HYDRO_tests/TestViewer.cxx
@@ -142,10 +142,13 @@ 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,
@@ -167,10 +170,7 @@ void TestViewer::show( const TopoDS_Shape& theShape, int theMode, bool isFitAll,
   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,
                        int theUIANb, int theVIANb)
@@ -217,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)
diff --git a/src/HYDRO_tests/TestViewer.h b/src/HYDRO_tests/TestViewer.h
index 90aac840..8a0db3c9 100644
--- a/src/HYDRO_tests/TestViewer.h
+++ b/src/HYDRO_tests/TestViewer.h
@@ -60,6 +60,8 @@ public:
                                int theLinesToOmit,
                                QString& theMsg );
 
+  static void fitAll();
+
 private:
   static OCCViewer_ViewManager* myViewManager;
   static OCCViewer_ViewWindow* myViewWindow;
diff --git a/src/HYDRO_tests/reference_data/Polyline_Presentation.png b/src/HYDRO_tests/reference_data/Polyline_Presentation.png
index 1a4f14fdff8e0e089bbb72736205a6e533a3f08b..0e9f0134bf46ea364e08f74c07b031cef2395a8d 100644
GIT binary patch
literal 8424
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

literal 8060
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

diff --git a/src/HYDRO_tests/test_HYDROData_DTM.cxx b/src/HYDRO_tests/test_HYDROData_DTM.cxx
index d4338722..9c06cc7e 100644
--- a/src/HYDRO_tests/test_HYDROData_DTM.cxx
+++ b/src/HYDRO_tests/test_HYDROData_DTM.cxx
@@ -48,7 +48,7 @@ class DTM_item : public QGraphicsItem
 public:
   DTM_item( HYDROGUI_ShapeBathymetry* theDTM, double d )
   {
-    Handle(AIS_PointCloud) pc = Handle(AIS_PointCloud)::DownCast( theDTM->getAISObject() );
+    Handle(AIS_PointCloud) pc = Handle(AIS_PointCloud)::DownCast( theDTM->getAISObjects()[0] );
     Handle(Graphic3d_ArrayOfPoints) pp = pc->GetPoints();
     myBB = QRectF();
     double xmin, xmax, ymin, ymax;
diff --git a/src/HYDRO_tests/test_HYDROData_PolylineXY.cxx b/src/HYDRO_tests/test_HYDROData_PolylineXY.cxx
index 57d6435f..b3af935f 100644
--- a/src/HYDRO_tests/test_HYDROData_PolylineXY.cxx
+++ b/src/HYDRO_tests/test_HYDROData_PolylineXY.cxx
@@ -27,7 +27,7 @@
 #include <HYDROData_Iterator.h>
 #include <HYDROData_ImmersibleZone.h>
 #include <HYDROData_Tool.h>
-#include <HYDROGUI_Polyline.h>
+#include <HYDROGUI_Shape.h>
 
 #include <AIS_DisplayMode.hxx>
 #include <AIS_PointCloud.hxx>
@@ -37,6 +37,7 @@
 #include <QColor>
 #include <QList>
 #include <QPointF>
+#include <QTest>
 
 #include <TestShape.h>
 #include <TestViewer.h>
@@ -253,15 +254,19 @@ void test_HYDROData_PolylineXY::test_presentation()
   aPointsPrs->SetColor( Quantity_NOC_BLUE1 );
   aPointsPrs->Attributes()->PointAspect()->SetTypeOfMarker( Aspect_TOM_O );
 
-  Handle(HYDROGUI_Polyline) aNewPolylinePrs = new HYDROGUI_Polyline( aPolyline2d->GetShape() );
-  aNewPolylinePrs->SetColor( Quantity_NOC_DARKGREEN );
+  aPolyline2d->SetWireColor( Qt::darkGreen );
+  HYDROGUI_Shape* aNewPolylinePrs = new HYDROGUI_Shape( TestViewer::context(), aPolyline2d );
+  aNewPolylinePrs->update( true, true );
 
   TestViewer::show( aPointsPrs, AIS_PointCloud::DM_Points, 0, true, "Polyline_Presentation" );
   TestViewer::show( aPolyline2d->GetShape(), 0, true, Qt::red );
-  TestViewer::show( aNewPolylinePrs, AIS_PointCloud::DM_Points, 0, true, "" );
+  //TestViewer::show( aNewPolylinePrs, AIS_PointCloud::DM_Points, 0, true, "" );
+  aNewPolylinePrs->display();
+  TestViewer::fitAll();
   CPPUNIT_ASSERT_IMAGES
 
   aDoc->Close();
+  //QTest::qWait( 50000 );
 }
 
 void test_HYDROData_PolylineXY::test_split_refs_627()
diff --git a/src/HYDRO_tests/test_HYDROGUI_Shape.cxx b/src/HYDRO_tests/test_HYDROGUI_Shape.cxx
index ee5ca41f..30b2d776 100644
--- a/src/HYDRO_tests/test_HYDROGUI_Shape.cxx
+++ b/src/HYDRO_tests/test_HYDROGUI_Shape.cxx
@@ -39,7 +39,7 @@ void test_HYDROGUI_Shape::test_face_in_preview()
   aPreview->setFillingColor( Qt::red, false, false );
   aPreview->setBorderColor( Qt::darkBlue, false, false );
   
-  TestViewer::show( aPreview->getAISObject(), AIS_Shaded, 0, true, "Shape_preview_im_zone" );
+  TestViewer::show( aPreview->getAISObjects()[0], AIS_Shaded, 0, true, "Shape_preview_im_zone" );
   CPPUNIT_ASSERT_IMAGES
 
   delete aPreview;
-- 
2.39.2