Salome HOME
Temporary workaround for python.
[modules/hydro.git] / src / HYDROData / HYDROData_PolylineXY.cxx
index 6c17dd6dc14dc37024eeebd86601e657c545f64f..d418144a2e1865ef4b2fa25d71411bc399ed1274 100755 (executable)
@@ -3,16 +3,28 @@
 
 #include "HYDROData_BSplineOperation.h"
 #include "HYDROData_Document.h"
+#include "HYDROData_ShapesTool.h"
 #include "HYDROData_Tool.h"
 
 #include <BRep_Builder.hxx>
 #include <BRepBuilderAPI_MakeEdge.hxx>
 #include <BRepBuilderAPI_MakeWire.hxx>
+#include <BRepBuilderAPI_MakePolygon.hxx>
+#include <BRepBuilderAPI_MakeFace.hxx>
+#include <BRepOffsetAPI_NormalProjection.hxx>
+
+#include <GeomAPI_ProjectPointOnCurve.hxx>
+#include <GeomAdaptor_Curve.hxx>
+#include <Geom_Line.hxx>
+#include <Geom_BSplineCurve.hxx>
+
+#include <GCPnts_AbscissaPoint.hxx>
 
 #include <ImageComposer_MetaTypes.h>
 
 #include <gp_Pnt.hxx>
 #include <gp_XY.hxx>
+#include <gp_Pln.hxx>
 
 #include <NCollection_Map.hxx>
 
 #include <TColStd_ListIteratorOfListOfInteger.hxx>
 #include <TColStd_ListIteratorOfListOfReal.hxx>
 
+#include <TColStd_Array1OfReal.hxx>
+
 #include <TDataStd_BooleanList.hxx>
 #include <TDataStd_ExtStringList.hxx>
 #include <TDataStd_IntegerList.hxx>
 #include <TDataStd_ListIteratorOfListOfExtendedString.hxx>
 #include <TDataStd_RealList.hxx>
+#include <TDataStd_UAttribute.hxx>
 
+#include <TopoDS_Iterator.hxx>
 #include <TopTools_ListIteratorOfListOfShape.hxx>
+#include <TopTools_HSequenceOfShape.hxx>
+#include <TopExp_Explorer.hxx>
+#include <ShapeAnalysis_FreeBounds.hxx>
+#include <TopoDS.hxx>
 
+#include <QColor>
 #include <QPainterPath>
 #include <QVariant>
 
-#define PYTHON_POLYLINEXY_ID "KIND_POLYLINEXY"
+static const Standard_GUID GUID_IS_UNEDITABLE("e5799736-9030-4051-91a4-2e58321fa153");
+
+const double LOCAL_SELECTION_TOLERANCE = 0.0001;
+
+TCollection_AsciiString getUniqueSectionName( const NCollection_Sequence<TCollection_AsciiString>& theNamesSeq )
+{
+  NCollection_Map<TCollection_AsciiString> aNamesMap;
+
+  for ( int i = 1, n = theNamesSeq.Size(); i <= n; ++i )
+  {
+    const TCollection_AsciiString& aSectName = theNamesSeq.Value( i );
+    aNamesMap.Add( aSectName );
+  }
+
+  TCollection_AsciiString aResName;
+
+  int aPrefIdx = 1;
+  do
+  {
+    aResName = TCollection_AsciiString( "Section_" ) + aPrefIdx;
+    ++aPrefIdx;
+  }
+  while ( aNamesMap.Contains( aResName ) );
+
+  return aResName;
+}
+
+TCollection_AsciiString getUniqueSectionName( const Handle(TDataStd_ExtStringList)& theNamesList )
+{
+  NCollection_Sequence<TCollection_AsciiString> aNamesSeq;
+
+  TDataStd_ListIteratorOfListOfExtendedString aNamesIter( theNamesList->List() );
+  for ( ; aNamesIter.More(); aNamesIter.Next() )
+    aNamesSeq.Append( aNamesIter.Value() );
+
+  return getUniqueSectionName( aNamesSeq );
+}
 
 IMPLEMENT_STANDARD_HANDLE(HYDROData_PolylineXY, HYDROData_IPolyline)
 IMPLEMENT_STANDARD_RTTIEXT(HYDROData_PolylineXY, HYDROData_IPolyline)
@@ -49,18 +106,8 @@ HYDROData_PolylineXY::~HYDROData_PolylineXY()
 
 QStringList HYDROData_PolylineXY::DumpToPython( MapOfTreatedObjects& theTreatedObjects ) const
 {
-  QStringList aResList;
-
-  Handle(HYDROData_Document) aDocument = HYDROData_Document::Document( myLab );
-  if ( aDocument.IsNull() )
-    return aResList;
-                             
-  QString aDocName = aDocument->GetDocPyName();
-  QString aPolylineName = GetName();
-
-  aResList << QString( "%1 = %2.CreateObject( %3 );" )
-              .arg( aPolylineName ).arg( aDocName ).arg( PYTHON_POLYLINEXY_ID );
-  aResList << QString( "%1.SetName( \"%1\" );" ).arg( aPolylineName );
+  QStringList aResList = dumpObjectCreation( theTreatedObjects );
+  QString aPolylineName = GetObjPyName();
 
   // Set polilyne data
   NCollection_Sequence<TCollection_AsciiString>           aSectNames;
@@ -77,16 +124,20 @@ QStringList HYDROData_PolylineXY::DumpToPython( MapOfTreatedObjects& theTreatedO
     aResList << QString( "%1.AddSection( \"%2\", %3, %4 );" ).arg( aPolylineName )
                 .arg( aSectName.ToCString() ).arg( aSectType ).arg( aSectClosure );
 
-    HYDROData_PolylineXY::PointsList aSectPointsList = GetPoints( i );
+    HYDROData_IPolyline::PointsList aSectPointsList = GetPoints( i - 1 );
     for ( int k = 1, aNbPoints = aSectPointsList.Size(); k <= aNbPoints; ++k )
     {
-      const HYDROData_PolylineXY::Point& aSectPoint = aSectPointsList.Value( k );
+      const Point& aSectPoint = aSectPointsList.Value( k );
 
-      aResList << QString( "%1.AddPoint( %2, QPointF( %3, %4 ) );" ).arg( aPolylineName )
+      aResList << QString( "%1.AddPoint( %2, gp_XY( %3, %4 ) );" ).arg( aPolylineName )
         .arg( i - 1 ).arg( aSectPoint.X() ).arg( aSectPoint.Y() );
     }
   }
 
+  aResList << QString( "" );
+  aResList << QString( "%1.Update();" ).arg( aPolylineName );
+  aResList << QString( "" );
+
   return aResList;
 }
 
@@ -100,13 +151,250 @@ QVariant HYDROData_PolylineXY::GetDataVariant()
   return aVarData;
 }
 
-TopoDS_Shape HYDROData_PolylineXY::GetShape()
+QColor HYDROData_PolylineXY::DefaultWireColor()
+{
+  return QColor( Qt::red );
+}
+
+TopoDS_Shape HYDROData_PolylineXY::GetShape() const
 {
   return getPolylineShape();
 }
 
+bool convertEdgeToSection( const TopoDS_Edge&                                       theEdge,
+                           NCollection_Sequence<TCollection_AsciiString>&           theSectNames,
+                           NCollection_Sequence<HYDROData_PolylineXY::SectionType>& theSectTypes,
+                           NCollection_Sequence<bool>&                              theSectClosures,
+                           NCollection_Sequence<HYDROData_PolylineXY::PointsList>&  theSectPoints,
+                           const bool                                               theIsCanBeClosed )
+{
+  Standard_Real aFirst = 0.0, aLast = 0.0;
+  Handle(Geom_Curve) anEdgeGeomCurve = BRep_Tool::Curve( theEdge, aFirst, aLast );
+  if ( anEdgeGeomCurve.IsNull() )
+    return false;
+
+  TCollection_AsciiString aSectName = getUniqueSectionName( theSectNames );
+  bool anIsEdgeClosed = anEdgeGeomCurve->IsClosed();
+
+  HYDROData_PolylineXY::SectionType aSectionType = HYDROData_PolylineXY::SECTION_POLYLINE;
+  HYDROData_PolylineXY::PointsList aPointsList;
+
+  if ( anEdgeGeomCurve->IsKind( STANDARD_TYPE(Geom_Line) ) )
+  {
+    Handle(Geom_Line) aGeomLine = Handle(Geom_Line)::DownCast( anEdgeGeomCurve );
+
+    gp_Pnt aFirstPoint, aLastPoint;
+    aGeomLine->D0( aFirst, aFirstPoint );
+    aGeomLine->D0( aLast, aLastPoint );
+
+    HYDROData_PolylineXY::Point aSectFirstPoint( aFirstPoint.X(), aFirstPoint.Y() );
+    aPointsList.Append( aSectFirstPoint );
+
+    HYDROData_PolylineXY::Point aSectLastPoint( aLastPoint.X(), aLastPoint.Y() );
+    aPointsList.Append( aSectLastPoint );
+  }
+  else if ( anEdgeGeomCurve->IsKind( STANDARD_TYPE(Geom_BSplineCurve) ) )
+  {
+    aSectionType = HYDROData_PolylineXY::SECTION_SPLINE;
+
+    Handle(Geom_BSplineCurve) aGeomSpline = 
+      Handle(Geom_BSplineCurve)::DownCast( anEdgeGeomCurve );
+
+    int aNbKnots = aGeomSpline->NbKnots();
+
+    TColStd_Array1OfReal aSplineKnots( 1, aNbKnots );
+    aGeomSpline->Knots( aSplineKnots );
+
+    // Decrease the number of imported knots because of last one 
+    // knot is the closing point which are the start point
+    if ( anIsEdgeClosed ) aNbKnots--;
+
+    for ( int i = 1; i <= aNbKnots; ++i )
+    {
+      const Standard_Real& aKnot = aSplineKnots.Value( i );
+
+      gp_Pnt aPoint;
+      aGeomSpline->D0( aKnot, aPoint );
+
+      HYDROData_PolylineXY::Point aSectPoint( aPoint.X(), aPoint.Y() );
+      aPointsList.Append( aSectPoint );
+    }
+  }
+  else
+  {
+    // Other curve types are not supported
+    return false;
+  }
+
+  if ( aPointsList.IsEmpty() )
+    return false;
+
+  theSectNames.Append( aSectName );
+  theSectTypes.Append( aSectionType );
+  theSectClosures.Append( anIsEdgeClosed );
+  theSectPoints.Append( aPointsList );
+
+  return true;
+}
+
+bool HYDROData_PolylineXY::ImportShape( const TopoDS_Shape& theShape )
+{
+  if ( theShape.IsNull() )
+    return false;
+
+  RemoveSections();
+
+  bool anIsCanBeImported = false;
+
+  NCollection_Sequence<TCollection_AsciiString> aSectNames;
+  NCollection_Sequence<SectionType>             aSectTypes;
+  NCollection_Sequence<bool>                    aSectClosures;
+  NCollection_Sequence<PointsList>              aSectPoints;
+
+  if ( theShape.ShapeType() == TopAbs_EDGE )
+  {
+    TopoDS_Edge anEdge = TopoDS::Edge( theShape );
+    anIsCanBeImported = convertEdgeToSection( anEdge, aSectNames, aSectTypes, aSectClosures, aSectPoints, true );
+  }
+  else if ( theShape.ShapeType() == TopAbs_WIRE )
+  {
+    TopTools_SequenceOfShape anEdges;
+    HYDROData_ShapesTool::ExploreShapeToShapes( theShape, TopAbs_EDGE, anEdges );
+
+    anIsCanBeImported = !anEdges.IsEmpty();
+    for ( int i = 1, n = anEdges.Length(); i <= n && anIsCanBeImported; ++i )
+    {
+      TopoDS_Edge aWireEdge = TopoDS::Edge( anEdges.Value( i ) );
+      anIsCanBeImported = convertEdgeToSection( aWireEdge, aSectNames, aSectTypes, aSectClosures, aSectPoints, false );
+    }
+  }
+
+  if ( anIsCanBeImported )
+  {
+    for ( int i = 1, n = aSectNames.Length(); i <= n; ++i )
+    {
+      const TCollection_AsciiString& aSectName = aSectNames.Value( i );
+      const SectionType& aSectType = aSectTypes.Value( i );
+      bool anIsSectionClosed = aSectClosures.Value( i );
+      const PointsList& aSectPointsList = aSectPoints( i );
+
+      AddSection( aSectName, aSectType, anIsSectionClosed );
+      SetPoints( i - 1, aSectPointsList );
+    }
+  }
+  else
+  {
+    TopoDS_Shape aShape = theShape;
+
+    if ( theShape.ShapeType() == TopAbs_EDGE )
+    {
+      // We make the wire from incoming edge because of other algorithms
+      // are waiting at least the wire from polyline
+      TopoDS_Edge anEdge = TopoDS::Edge( theShape );
+      BRepBuilderAPI_MakeWire aMakeWire( anEdge );
+      aMakeWire.Build();
+      if ( aMakeWire.IsDone() )
+        aShape = aMakeWire.Wire();
+    }
+
+    gp_Pln aPlane( gp_Pnt( 0, 0, 0 ), gp_Dir( 0, 0, 1 ) );
+    BRepBuilderAPI_MakeFace aMakeFace( aPlane );
+    aMakeFace.Build();
+    BRepOffsetAPI_NormalProjection aProj( aMakeFace.Face() );
+    aProj.Add( aShape );
+    aProj.Build();
+    TopoDS_Shape aResult;
+    if( aProj.IsDone() )
+      aResult = aProj.Shape();
+
+    setPolylineShape( aResult );
+  }
+
+  setEditable( anIsCanBeImported );
+
+  return true;
+}
+
+TopoDS_Wire HYDROData_PolylineXY::BuildWire( const SectionType&                  theType,
+                                             const bool&                         theIsClosed,
+                                             const NCollection_Sequence<gp_XYZ>& thePoints )
+{
+  TopoDS_Wire aWire;
+  if( theType == SECTION_POLYLINE )
+  {
+    BRepBuilderAPI_MakePolygon aMakeWire;
+    for ( int i = 1, n = thePoints.Length(); i <= n ; ++i )
+    {
+      gp_XYZ aPoint = thePoints.Value( i );
+      gp_Pnt aPnt( aPoint.X(), aPoint.Y(), aPoint.Z() );
+      aMakeWire.Add( aPnt );
+    }
+    if( theIsClosed )
+      aMakeWire.Close();
+
+    if ( aMakeWire.IsDone() )
+      aWire = aMakeWire.Wire();
+  }
+  else //if( theType == PolylineSection::SECTION_SPLINE )
+  {
+    BRepBuilderAPI_MakeWire aMakeWire;
+
+    if ( thePoints.Size() > 1 )
+    {
+      HYDROData_BSplineOperation aBSpline( thePoints, theIsClosed, LOCAL_SELECTION_TOLERANCE );
+
+      TopoDS_Edge anEdge = BRepBuilderAPI_MakeEdge( aBSpline.Curve() ).Edge();
+      aMakeWire.Add( anEdge );
+    }
+    aMakeWire.Build();
+    if ( aMakeWire.IsDone() )
+      aWire = aMakeWire;
+  }
+
+  return aWire;
+}
+
+void HYDROData_PolylineXY::BuildPainterPath( QPainterPath&                       thePath,
+                                             const SectionType&                  theType,
+                                             const bool&                         theIsClosed,
+                                             const NCollection_Sequence<gp_XYZ>& thePoints )
+{
+  if ( thePoints.IsEmpty() )
+    return;
+
+  if ( theType == SECTION_POLYLINE )
+  {
+    const gp_XYZ& aFirstPoint = thePoints.Value( 1 );
+    thePath.moveTo( aFirstPoint.X(), aFirstPoint.Y() );
+
+    for( int i = 2, n = thePoints.Size(); i <= n; ++i )
+    {
+      const gp_XYZ& aSectPoint = thePoints.Value( i );
+
+      thePath.lineTo( aSectPoint.X(), aSectPoint.Y() );
+    }
+
+    if( theIsClosed )
+      thePath.closeSubpath();
+  }
+  else
+  {
+    HYDROData_BSplineOperation aBSpline( thePoints, theIsClosed, LOCAL_SELECTION_TOLERANCE );
+    aBSpline.ComputePath( thePath );
+  }
+}
+
 void HYDROData_PolylineXY::Update()
 {
+  if ( !IsEditable() )
+  {
+    // If polyline is not editable we no need to update it wire
+    SetToUpdate( false );
+    return;
+  }
+
+  HYDROData_IPolyline::Update();
+
   NCollection_Sequence<TCollection_AsciiString>           aSectNames;
   NCollection_Sequence<HYDROData_PolylineXY::SectionType> aSectTypes;
   NCollection_Sequence<bool>                              aSectClosures;
@@ -125,128 +413,183 @@ void HYDROData_PolylineXY::Update()
     PointsList aSectPointsList = GetPoints( aSectionId - 1 );
     if ( aSectPointsList.IsEmpty() )
       continue;
-
-    BRepBuilderAPI_MakeWire aMakeSectionWire;
-    if( aSectionType == SECTION_POLYLINE )
-    {
-      for( int i = 1, n = aSectPointsList.Size(); i <= n; ++i )
-      {
-        const Point& aFirstPoint = aSectPointsList.Value( i );
-
-        Point aLastPoint;
-        if ( i == n )
-        {
-          if( anIsSectionClosed )
-            aLastPoint = aSectPointsList.Value( 1 );
-          else
-            break;
-        }
-        else
-        {
-          aLastPoint = aSectPointsList.Value( i + 1 );
-        }
-
-        gp_Pnt aPnt1( aFirstPoint.X(), aFirstPoint.Y(), 0.0 );
-        gp_Pnt aPnt2( aLastPoint.X(), aLastPoint.Y(), 0.0 );
-
-        TopoDS_Edge anEdge = BRepBuilderAPI_MakeEdge( aPnt1, aPnt2 ).Edge();
-        aMakeSectionWire.Add( anEdge );
-      }
-    }
-    else //if( aSectionType == PolylineSection::SECTION_SPLINE )
+    
+    NCollection_Sequence<gp_XYZ> aPoints;
+    for( int i = 1, n = aSectPointsList.Size(); i <= n; ++i )
     {
-      QList<double> aPoints;
-      for( int i = 1, n = aSectPointsList.Size(); i <= n; ++i )
-      {
-        const Point& aSectPoint = aSectPointsList.Value( i );
-        aPoints << aSectPoint.X() << aSectPoint.Y();
-      }
+      const Point& aSectPoint = aSectPointsList.Value( i );
 
-      HYDROData_BSplineOperation aBSpline( aPoints, 0.0, anIsSectionClosed );
+      gp_XYZ aPoint( aSectPoint.X(), aSectPoint.Y(), 0.0 );
+      aPoints.Append( aPoint );
+    }
 
-      TopoDS_Edge anEdge = BRepBuilderAPI_MakeEdge( aBSpline.Curve() ).Edge();
-      aMakeSectionWire.Add( anEdge );
+    TopoDS_Wire aSectionWire = BuildWire( aSectionType, anIsSectionClosed, aPoints );
+    if ( !aSectionWire.IsNull() ) {
+      aSectionWiresList.Append( aSectionWire );
+      aMakeWire.Add( aSectionWire );
     }
-   
-    TopoDS_Wire aSectionWire = aMakeSectionWire.Wire();
-    aSectionWiresList.Append( aSectionWire );
-    aMakeWire.Add( aSectionWire );
   }
-
-  TopoDS_Shape aShape;
-
-  if ( aMakeWire.IsDone() )
+// all input wires in the <aSectionWiresList>
+  Handle(TopTools_HSequenceOfShape) aSeqWires = new TopTools_HSequenceOfShape;
+  Handle(TopTools_HSequenceOfShape) aSeqEdges = new TopTools_HSequenceOfShape;
+  TopTools_ListIteratorOfListOfShape it(aSectionWiresList);
+  for(;it.More();it.Next())
   {
-    aShape = aMakeWire.Shape();
+    TopExp_Explorer it2(it.Value(), TopAbs_EDGE);
+    for(;it2.More();it2.Next()) 
+      aSeqEdges->Append(it2.Current());
   }
-  else if ( !aSectionWiresList.IsEmpty() )
+
+  BRep_Builder aBB;
+  TopoDS_Compound aCmp;
+  TopoDS_Shape aResult;
+  aBB.MakeCompound(aCmp);
+  if(aSeqEdges->Length() >1)
   {
-    // build compound
-    TopoDS_Compound aCompound;
-    
-    BRep_Builder aBuilder;
-    aBuilder.MakeCompound( aCompound );
-    
-    TopTools_ListIteratorOfListOfShape anIter( aSectionWiresList );
-    for ( ; anIter.More(); anIter.Next() )
+    ShapeAnalysis_FreeBounds::ConnectEdgesToWires(aSeqEdges,1E-5,Standard_False,aSeqWires);
+
+    if( aSeqWires->Length()==1 )
+      aResult = aSeqWires->Value( 1 );
+    else
     {
-      aBuilder.Add( aCompound, anIter.Value() );
+      for (Standard_Integer i = 1; i <= aSeqWires->Length();i++)
+      {
+        const TopoDS_Shape& aS1 = aSeqWires->Value(i);
+        aBB.Add(aCmp, aS1);
+      }
+      aResult = aCmp;
     }
-    
-    aShape = aCompound;
   }
+  else if (aSeqEdges->Length() == 1)
+  {
+    BRepBuilderAPI_MakeWire mkWire (TopoDS::Edge(aSeqEdges->Value(1)));
+    if (mkWire.IsDone())
+      aResult = mkWire.Wire();
+  }
+
+  setPolylineShape( aResult );
+}
+
+bool HYDROData_PolylineXY::IsEditable() const
+{
+  return !myLab.IsAttribute( GUID_IS_UNEDITABLE );
+}
 
-  setPolylineShape( aShape );
+void HYDROData_PolylineXY::setEditable( const bool theIsEditable )
+{
+  if ( !theIsEditable )
+    TDataStd_UAttribute::Set( myLab, GUID_IS_UNEDITABLE );
+  else
+    myLab.ForgetAttribute( GUID_IS_UNEDITABLE );
 }
 
 /**
  * Returns true if polyline is closed
  */
-bool HYDROData_PolylineXY::IsClosed() const
+bool HYDROData_PolylineXY::IsClosed( const bool theIsSimpleCheck ) const
 {
-  NCollection_Sequence<TCollection_AsciiString>           aSectNames;
-  NCollection_Sequence<HYDROData_PolylineXY::SectionType> aSectTypes;
-  NCollection_Sequence<bool>                              aSectClosures;
-  GetSections( aSectNames, aSectTypes, aSectClosures );
-  if( aSectNames.IsEmpty() )
-    return false;
+  bool anIsClosed = false;
 
-  bool anIsClosed = true;
-  for( int i = 1, n = aSectClosures.Size(); i <= n && anIsClosed; ++i )
-    anIsClosed = anIsClosed && aSectClosures.Value( i );
+  TopoDS_Shape aShape = GetShape();
+  if ( aShape.IsNull() )
+    return anIsClosed;
 
-  return anIsClosed;
-}
+  TopTools_SequenceOfShape aWires;
+  HYDROData_ShapesTool::ExploreShapeToShapes( aShape, TopAbs_WIRE, aWires );
 
-int HYDROData_PolylineXY::NbSections() const
-{
-  Handle(TDataStd_ExtStringList) aNamesList;
-  Handle(TDataStd_IntegerList)   aTypesList;
-  Handle(TDataStd_BooleanList)   aClosuresList;
-  getSectionsLists( aNamesList, aTypesList, aClosuresList, false );
+  int aNbWires = aWires.Length();
+  if ( theIsSimpleCheck )
+  {
+    anIsClosed = aNbWires > 0;
+    for ( int i = 1; i <= aNbWires && anIsClosed; ++i )
+    {
+      const TopoDS_Shape& aWire = aWires.Value( i );
+      anIsClosed = BRep_Tool::IsClosed( aWire );
+    }
+  }
+  else
+  {
+    anIsClosed = aNbWires == 1 && BRep_Tool::IsClosed( aWires.First() );
+  }
 
-  return !aClosuresList.IsNull() ? aClosuresList->Extent() : 0;
+  return anIsClosed;
 }
 
-TCollection_ExtendedString getUniqueSectionName( const Handle(TDataStd_ExtStringList)& theNamesList )
+double HYDROData_PolylineXY::GetDistance( const int theSectionIndex,
+                                          const int thePointIndex ) const
 {
-  NCollection_Map<TCollection_ExtendedString> aNamesMap;
+  double aResDistance = -1;
+  if ( theSectionIndex < 0 || theSectionIndex >= NbSections() )
+    return aResDistance;
 
-  TDataStd_ListIteratorOfListOfExtendedString aNamesIter( theNamesList->List() );
-  for ( ; aNamesIter.More(); aNamesIter.Next() )
-    aNamesMap.Add( aNamesIter.Value() );
+  if ( thePointIndex == 0 )
+    return 0.0;
 
-  TCollection_ExtendedString aResName;
+  SectionType aSectionType = GetSectionType( theSectionIndex );
+  bool anIsSectionClosed = IsClosedSection( theSectionIndex );
+  PointsList aSectPointsList = GetPoints( theSectionIndex );
+  if ( thePointIndex < 0 || thePointIndex >= aSectPointsList.Size()  )
+    return aResDistance;
 
-  int aPrefIdx = 1;
-  do
+  if ( aSectionType == SECTION_POLYLINE )
   {
-    aResName = "Section_" + aPrefIdx;
-    ++aPrefIdx;
+    aResDistance = 0.0;
+  
+    Point aPrevPoint = aSectPointsList.Value( 1 );
+    for ( int i = 2, aNbPoints = aSectPointsList.Size(); i <= aNbPoints; ++i )
+    {
+      const Point& aSectPoint = aSectPointsList.Value( i );
+      aResDistance += gp_Pnt2d( aPrevPoint ).Distance( aSectPoint );
+      aPrevPoint = aSectPoint;
+
+      if ( thePointIndex == i - 1 )
+        break;
+    }
   }
-  while ( aNamesMap.Contains( aResName ) );
+  else
+  {
+    gp_XYZ aPointToTest;
 
-  return aResName;
+    int aSectNbPoints = aSectPointsList.Size();
+    NCollection_Sequence<gp_XYZ> aPoints;
+    for( int i = 1 ; i <= aSectNbPoints; ++i )
+    {
+      const Point& aSectPoint = aSectPointsList.Value( i );
+
+      gp_XYZ aPoint( aSectPoint.X(), aSectPoint.Y(), 0.0 );
+      aPoints.Append( aPoint );
+
+      if ( thePointIndex == i - 1 )
+        aPointToTest = aPoint;
+    }
+
+    HYDROData_BSplineOperation aBSpline( aPoints, anIsSectionClosed, LOCAL_SELECTION_TOLERANCE );
+
+    Quantity_Parameter aFirstParam = aBSpline.Curve()->FirstParameter();
+    Quantity_Parameter aSecondParam = aBSpline.Curve()->LastParameter();
+
+    if ( thePointIndex != aSectNbPoints - 1 )
+    {
+      GeomAPI_ProjectPointOnCurve aProject( aPointToTest, aBSpline.Curve() );
+      aSecondParam = aProject.LowerDistanceParameter();
+    }
+
+    GeomAdaptor_Curve anAdap( aBSpline.Curve() );
+    
+    aResDistance = GCPnts_AbscissaPoint::Length( anAdap, aFirstParam, aSecondParam );
+  }
+
+  return aResDistance;
+}
+
+int HYDROData_PolylineXY::NbSections() const
+{
+  Handle(TDataStd_ExtStringList) aNamesList;
+  Handle(TDataStd_IntegerList)   aTypesList;
+  Handle(TDataStd_BooleanList)   aClosuresList;
+  getSectionsLists( aNamesList, aTypesList, aClosuresList, false );
+
+  return !aClosuresList.IsNull() ? aClosuresList->Extent() : 0;
 }
 
 void HYDROData_PolylineXY::AddSection( const TCollection_AsciiString& theSectName,
@@ -265,6 +608,8 @@ void HYDROData_PolylineXY::AddSection( const TCollection_AsciiString& theSectNam
   aNamesList->Append( aSectName );
   aTypesList->Append( theSectionType );
   aClosuresList->Append( theIsClosed );
+
+  SetToUpdate( true );
 }
 
 TCollection_AsciiString HYDROData_PolylineXY::GetSectionName( const int theSectionIndex ) const
@@ -308,6 +653,8 @@ void HYDROData_PolylineXY::SetSectionName( const int                      theSec
   TDataStd_ListIteratorOfListOfExtendedString aNamesIter( anOldNamesList );
   for ( int i = 0; aNamesIter.More(); aNamesIter.Next(), ++i )
     aNamesList->Append( i == theSectionIndex ? aNewSectName : aNamesIter.Value() );
+
+  SetToUpdate( true );
 }
 
 HYDROData_PolylineXY::SectionType HYDROData_PolylineXY::GetSectionType( const int theSectionIndex ) const
@@ -344,6 +691,8 @@ void HYDROData_PolylineXY::SetSectionType( const int         theSectionIndex,
   TColStd_ListIteratorOfListOfInteger aTypesIter( anOldTypesList );
   for ( int i = 0; aTypesIter.More(); aTypesIter.Next(), ++i )
     aTypesList->Append( i == theSectionIndex ? theSectionType : aTypesIter.Value() );
+
+  SetToUpdate( true );
 }
 
 bool HYDROData_PolylineXY::IsClosedSection( const int theSectionIndex ) const
@@ -380,6 +729,8 @@ void HYDROData_PolylineXY::SetSectionClosed( const int  theSectionIndex,
   TDataStd_ListIteratorOfListOfByte aClosuresIter( anOldClosuresList );
   for ( int i = 0; aClosuresIter.More(); aClosuresIter.Next(), ++i )
     aClosuresList->Append( i == theSectionIndex ? theIsClosed : (bool)aClosuresIter.Value() );
+
+  SetToUpdate( true );
 }
 
 void HYDROData_PolylineXY::GetSections( NCollection_Sequence<TCollection_AsciiString>& theSectNames,
@@ -460,12 +811,15 @@ void HYDROData_PolylineXY::RemoveSection( const int theSectionIndex )
     // Remove points that belongs to removed section
     removePointsLists( theSectionIndex );
   }
+
+  SetToUpdate( true );
 }
 
 void HYDROData_PolylineXY::RemoveSections()
 {
   removeSectionsLists();
   removePointsLists();
+  SetToUpdate( true );
 }
 
 void HYDROData_PolylineXY::AddPoint( const int    theSectionIndex,
@@ -510,6 +864,8 @@ void HYDROData_PolylineXY::AddPoint( const int    theSectionIndex,
       aListY->Append( aCoordY );
     }
   }
+
+  SetToUpdate( true );
 }
 
 void HYDROData_PolylineXY::SetPoint( const int    theSectionIndex,
@@ -559,6 +915,25 @@ void HYDROData_PolylineXY::SetPoint( const int    theSectionIndex,
       aListY->Append( aCoordY );
     }
   }
+
+  SetToUpdate( true );
+}
+
+void HYDROData_PolylineXY::SetPoints( const int         theSectionIndex,
+                                      const PointsList& thePoints )
+{
+  Handle(TDataStd_RealList) aListX, aListY;
+  getPointsLists( theSectionIndex, aListX, aListY );
+
+  aListX->Clear();
+  aListY->Clear();
+
+  for ( int i = 1, n = thePoints.Length(); i <= n; ++i )
+  {
+    const Point& aPoint = thePoints.Value( i );
+    aListX->Append( aPoint.X() );
+    aListY->Append( aPoint.Y() );
+  }
 }
 
 void HYDROData_PolylineXY::RemovePoint( const int theSectionIndex,
@@ -596,6 +971,8 @@ void HYDROData_PolylineXY::RemovePoint( const int theSectionIndex,
       aListY->Append( anIterY.Value() );
     }
   }
+
+  SetToUpdate( true );
 }
 
 HYDROData_PolylineXY::PointsList HYDROData_PolylineXY::GetPoints( const int theSectionIndex ) const
@@ -626,41 +1003,27 @@ QPainterPath HYDROData_PolylineXY::GetPainterPath() const
   NCollection_Sequence<HYDROData_PolylineXY::SectionType> aSectTypes;
   NCollection_Sequence<bool>                              aSectClosures;
   GetSections( aSectNames, aSectTypes, aSectClosures );
-  if( aSectNames.IsEmpty() )
-    return aPath;
-
-  PointsList aSectPointsList = GetPoints( 0 );
-  if( aSectPointsList.IsEmpty() )
-    return aPath;
-
-  SectionType aSectionType = aSectTypes.Value( 1 );
-  bool anIsSectionClosed = aSectClosures.Value( 1 );
 
-  if ( aSectionType == SECTION_POLYLINE )
+  for ( int aSectionId = 1, aNbSects = aSectNames.Size(); aSectionId <= aNbSects; aSectionId++ )
   {
-    aPath.moveTo( aSectPointsList.Value( 1 ).X(), aSectPointsList.Value( 1 ).Y() );
-
-    for( int i = 2, n = aSectPointsList.Size(); i <= n; ++i )
-    {
-      const Point& aSectPoint = aSectPointsList.Value( i );
+    TCollection_AsciiString aSectName = aSectNames.Value( aSectionId );
+    SectionType aSectionType = aSectTypes.Value( aSectionId );
+    bool anIsSectionClosed = aSectClosures.Value( aSectionId );
 
-      aPath.lineTo( aSectPoint.X(), aSectPoint.Y() );
-    }
+    PointsList aSectPointsList = GetPoints( aSectionId - 1 );
+    if ( aSectPointsList.IsEmpty() )
+      continue;
 
-    if( anIsSectionClosed )
-      aPath.closeSubpath();
-  }
-  else
-  {
-    QList<double> aPoints;
+    NCollection_Sequence<gp_XYZ> aPoints;
     for( int i = 1, n = aSectPointsList.Size(); i <= n; ++i )
     {
       const Point& aSectPoint = aSectPointsList.Value( i );
-      aPoints << aSectPoint.X() << aSectPoint.Y();
+
+      gp_XYZ aPoint( aSectPoint.X(), aSectPoint.Y(), 0.0 );
+      aPoints.Append( aPoint );
     }
 
-    HYDROData_BSplineOperation aBSpline( aPoints, 0, anIsSectionClosed );
-    aPath = aBSpline.ComputePath();
+    BuildPainterPath( aPath, aSectionType, anIsSectionClosed, aPoints );
   }
 
   return aPath;