From 7fcd7955f1f7d10e37e5460567491542ce207b26 Mon Sep 17 00:00:00 2001
From: isn <isn@opencascade.com>
Date: Fri, 7 Dec 2018 18:21:56 +0300
Subject: [PATCH] lot 3 - coloring of section in OCC view see also refs #1838

---
 src/HYDROData/HYDROData_IPolyline.cxx         |  23 ++++-
 src/HYDROData/HYDROData_IPolyline.h           |  12 ++-
 src/HYDROData/HYDROData_PolylineOperator.cxx  |  87 +++++++++++++++---
 src/HYDROData/HYDROData_PolylineOperator.h    |   4 +-
 src/HYDROData/HYDROData_PolylineXY.cxx        |  86 +++++++++++------
 src/HYDROGUI/HYDROGUI_Polyline.cxx            |  61 +++++++++---
 src/HYDROGUI/HYDROGUI_Polyline.h              |  13 ++-
 src/HYDROGUI/HYDROGUI_PolylineOp.cxx          |  12 +--
 src/HYDROGUI/HYDROGUI_SetColorOp.cxx          |  17 +++-
 src/HYDROGUI/HYDROGUI_Shape.cxx               |  45 ++++++++-
 src/HYDROGUI/HYDROGUI_VTKPrsShape.cxx         |   2 +-
 src/HYDROPy/HYDROData_IPolyline.sip           |  11 +++
 .../linux/Split_Polylines_Colors.png          | Bin 5722 -> 3263 bytes
 .../win32/Split_Polylines_Colors.png          | Bin 4906 -> 3983 bytes
 src/HYDRO_tests/test_HYDROData_PolylineXY.cxx |  41 +++++++--
 15 files changed, 328 insertions(+), 86 deletions(-)

diff --git a/src/HYDROData/HYDROData_IPolyline.cxx b/src/HYDROData/HYDROData_IPolyline.cxx
index 1ec97913..ddd6908a 100644
--- a/src/HYDROData/HYDROData_IPolyline.cxx
+++ b/src/HYDROData/HYDROData_IPolyline.cxx
@@ -41,7 +41,11 @@ HYDROData_IPolyline::~HYDROData_IPolyline()
 
 void HYDROData_IPolyline::SetWireColor( const QColor& theColor )
 {
-  SetColor( theColor, DataTag_WireColor );
+  //SetColor( theColor, DataTag_WireColor ); //DEPRECATED;
+  //set theColor for all sections
+  int nbSec = NbSections();
+  for (int i = 0; i < nbSec; i++)
+    SetSectionColor(i, theColor);
 }
 
 QColor HYDROData_IPolyline::GetWireColor() const
@@ -168,7 +172,7 @@ void HYDROData_IPolyline::removePointsLists( const int theSectionIndex ) const
   }
 }
 
-bool HYDROData_IPolyline::getSectionColor( const int theSectionIndex, QColor &theColor) const
+bool HYDROData_IPolyline::GetSectionColor( const int theSectionIndex, QColor &theColor) const
 {
   TDF_Label aLabel = myLab.FindChild( DataTag_SectionColors, false );
   if ( aLabel.IsNull() )
@@ -189,8 +193,8 @@ bool HYDROData_IPolyline::getSectionColor( const int theSectionIndex, QColor &th
   }
 }
 
-void HYDROData_IPolyline::setSectionColor( const int theSectionIndex,
-                                           const QColor& theColor ) const
+void HYDROData_IPolyline::SetSectionColor( const int theSectionIndex,
+                                           const QColor& theColor )
 {
   TDF_Label aLabel = myLab.FindChild( DataTag_SectionColors, true );
   if ( aLabel.IsNull() )
@@ -228,3 +232,14 @@ void HYDROData_IPolyline::removeSectionColor( const int theSectionIndex ) const
       aSectLabel.ForgetAllAttributes();
   }
 }
+
+ void HYDROData_IPolyline::setPythonPolylineSectionColor( QStringList&  theScript,
+                                                          const int     theSectIndex,
+                                                          const QColor& theColor ) const
+{
+  QString anObjName = GetObjPyName();
+  theScript << QString( "%1.SetSectionColor( %2, QColor( %3, %4, %5, %6 ) )" )
+              .arg( anObjName ).arg( theSectIndex )
+              .arg( theColor.red()  ).arg( theColor.green() )
+              .arg( theColor.blue() ).arg( theColor.alpha() );
+}
diff --git a/src/HYDROData/HYDROData_IPolyline.h b/src/HYDROData/HYDROData_IPolyline.h
index c8916d4c..5795ce4b 100644
--- a/src/HYDROData/HYDROData_IPolyline.h
+++ b/src/HYDROData/HYDROData_IPolyline.h
@@ -51,7 +51,7 @@ protected:
     DataTag_Points,
     DataTag_Sections,
     DataTag_PolylineShape,
-    DataTag_WireColor,
+    DataTag_WireColor,  //DEPRECATED; DataTag_SectionColors for coloring of individual section of polyline
     DataTag_SectionColors,
   };
 
@@ -68,7 +68,7 @@ public:
   /**
    * Returns wire color of object.
    */
-  HYDRODATA_EXPORT virtual QColor GetWireColor() const;
+  HYDRODATA_EXPORT virtual QColor GetWireColor() const; //DEPRECATED
 
   /**
    * Returns default wire color for new object.
@@ -191,10 +191,9 @@ public:
   HYDRODATA_EXPORT TopoDS_Shape GetShape() const;
   HYDRODATA_EXPORT void SetShape( const TopoDS_Shape& theShape );
 
-  HYDRODATA_EXPORT void setSectionColor( const int theSectionIndex,
-                                         const QColor& theColor ) const;
+  HYDRODATA_EXPORT virtual void SetSectionColor( const int theSectionIndex, const QColor& theColor );
 
-  HYDRODATA_EXPORT bool getSectionColor( const int theSectionIndex, QColor &theColor) const;
+  HYDRODATA_EXPORT virtual bool GetSectionColor( const int theSectionIndex, QColor &theColor) const;
 
   HYDRODATA_EXPORT void removeSectionColor( const int theSectionIndex = -1 ) const;
 
@@ -215,6 +214,9 @@ protected:
 
   void removePointsLists( const int theSectionIndex = -1 ) const;
 
+  void setPythonPolylineSectionColor( QStringList&  theScript,
+                                      const int     theSectIndex,
+                                      const QColor& theColor ) const;
 
 
 protected:
diff --git a/src/HYDROData/HYDROData_PolylineOperator.cxx b/src/HYDROData/HYDROData_PolylineOperator.cxx
index 41d0f7c8..1b0c8985 100644
--- a/src/HYDROData/HYDROData_PolylineOperator.cxx
+++ b/src/HYDROData/HYDROData_PolylineOperator.cxx
@@ -86,13 +86,40 @@ bool HYDROData_PolylineOperator::Split( const Handle( HYDROData_Document )& theD
   std::vector<TopoDS_Wire> aCurves;
   GetWires(thePolyline, aCurves);
   bool isOK = true;
+
+  std::vector<QColor> aSectColors;
+  int nbSec = thePolyline->NbSections();
+  for (int i = 0; i < nbSec; i++)
+  {
+    QColor aColor;
+    thePolyline->GetSectionColor(i, aColor);
+    aSectColors.push_back(aColor);
+  }
+
+  bool bsetColor = aCurves.size() == aSectColors.size();
   for( int i=0, n=aCurves.size(); i<n; i++ )
   {
     std::vector<TopoDS_Shape> aCurvesList;
     Split( aCurves[i], thePoint, theTolerance, aCurvesList );
-    bool isLocalOK = CreatePolylines( theDoc, thePolyline, aCurvesList, true );
+    NCollection_IndexedDataMap<Handle(HYDROData_PolylineXY), TopoDS_Shape> outPoly2Sh;
+    bool isLocalOK = CreatePolylines( theDoc, thePolyline, aCurvesList, true, outPoly2Sh );
     isOK = isOK && isLocalOK;
+    if (bsetColor)
+    {
+      QColor aColor = aSectColors[i];
+      if( aColor.isValid() )
+      {
+        for (int j=1;j<=outPoly2Sh.Extent();j++)
+        {
+          const Handle(HYDROData_PolylineXY)& Poly = outPoly2Sh.FindKey(j); 
+          int nbSec = Poly->NbSections();
+          for (int k = 0; k < nbSec; k++)
+            Poly->SetSectionColor(k, aColor);
+        }
+      }
+    }
   }
+
   return isOK;
 }
 
@@ -212,9 +239,27 @@ bool HYDROData_PolylineOperator::split( const Handle( HYDROData_Document )& theD
     return false;
   }
 
+  std::vector<QColor> aSectColors;
+  int nbSec = thePolyline->NbSections();
+
+
+
   const int aPSCount = aCurves.size();
   const int aTSCount = aToolCurves.size();
   std::vector<TopoDS_Shape> aResult;
+
+  bool bSetColor = aPSCount == nbSec;
+  if (bSetColor)
+  {
+    for (int i = 0; i < nbSec; i++)
+    {
+      QColor aColor;
+      thePolyline->GetSectionColor(i, aColor);
+      aSectColors.push_back(aColor);
+    }
+  }
+  NCollection_DataMap <TopoDS_Shape, QColor, TopTools_ShapeMapHasher> W2Color;
+
   for (int aPSI = 0; aPSI < aPSCount; ++aPSI)
   {
     HYDROData_TopoCurve aCurve;
@@ -238,16 +283,35 @@ bool HYDROData_PolylineOperator::split( const Handle( HYDROData_Document )& theD
       aSplitCurves.end();
     for (int iw=0; aCIt != aLastCIt; ++aCIt, iw++)
     {
-      std::stringstream brepName;
-      brepName << "theSplitWire_";
-      brepName << iw;
-      brepName << ".brep";
-      BRepTools::Write(aCIt->Wire() , brepName.str().c_str() );
-      aResult.push_back(aCIt->Wire());
+      //std::stringstream brepName;
+      //brepName << "theSplitWire_";
+      //brepName << iw;
+      //brepName << ".brep";
+      //BRepTools::Write(aCIt->Wire() , brepName.str().c_str() );
+      const TopoDS_Wire& aW = aCIt->Wire();
+      if (bSetColor)
+        W2Color.Bind(aW, aSectColors[aPSI]);
+      aResult.push_back(aW);
     }
   }
 
-  CreatePolylines( theDoc, thePolyline, aResult, true );
+  NCollection_IndexedDataMap<Handle(HYDROData_PolylineXY), TopoDS_Shape> outPoly2Sh;
+  CreatePolylines( theDoc, thePolyline, aResult, true, outPoly2Sh );
+  
+  for (int j=1;j<=outPoly2Sh.Extent();j++)
+  {
+    const Handle(HYDROData_PolylineXY)& Poly = outPoly2Sh.FindKey(j); 
+    const TopoDS_Shape& Sh = outPoly2Sh.FindFromIndex(j); 
+
+    int nbSec = Poly->NbSections();
+    for (int k = 0; k < nbSec; k++)
+    {
+      const QColor* color = W2Color.Seek(Sh);
+      if (color)
+        Poly->SetSectionColor(k, *color);
+    }
+  }
+  
   return true;
 }
 
@@ -301,7 +365,8 @@ void HYDROData_PolylineOperator::Split(
 bool HYDROData_PolylineOperator::CreatePolylines( const Handle( HYDROData_Document )& theDoc,
                                                   const Handle( HYDROData_PolylineXY )& theOldPolyline,
                                                   const std::vector<TopoDS_Shape>& theShapes,
-                                                  bool isUseIndices )
+                                                  bool isUseIndices,
+                                                  NCollection_IndexedDataMap<Handle(HYDROData_PolylineXY), TopoDS_Shape>& outPoly2Sh)
 {
   if( theDoc.IsNull() )
     return false;
@@ -309,7 +374,6 @@ bool HYDROData_PolylineOperator::CreatePolylines( const Handle( HYDROData_Docume
   if ( theOldPolyline.IsNull() )
     return false;
   const QString& theNamePrefix = theOldPolyline->GetName();
-  const QColor& theColor = theOldPolyline->GetWireColor();
 
   int n = theShapes.size();
   DEBTRACE("theShapes.size() "<< n);
@@ -338,8 +402,7 @@ bool HYDROData_PolylineOperator::CreatePolylines( const Handle( HYDROData_Docume
       aPolyline->SetName( theNamePrefix );
     }
 
-    if( theColor.isValid() )
-      aPolyline->SetWireColor( theColor );
+    outPoly2Sh.Add(aPolyline, theShapes[i]);
   }
   return true;
 }
diff --git a/src/HYDROData/HYDROData_PolylineOperator.h b/src/HYDROData/HYDROData_PolylineOperator.h
index 6fea4512..ff64142a 100644
--- a/src/HYDROData/HYDROData_PolylineOperator.h
+++ b/src/HYDROData/HYDROData_PolylineOperator.h
@@ -23,6 +23,7 @@
 #include <Geom2d_Curve.hxx>
 #include <gp_Pnt2d.hxx>
 #include <vector>
+#include <NCollection_IndexedDataMap.hxx>
 
 class HYDROData_Document;
 class HYDROData_TopoCurve;
@@ -85,7 +86,8 @@ protected:
   static bool CreatePolylines( const Handle( HYDROData_Document )& theDoc,
                                const Handle( HYDROData_PolylineXY )& theOldPolyline,
                                const std::vector<TopoDS_Shape>& theShape,
-                               bool isUseIndices );
+                               bool isUseIndices,
+                               NCollection_IndexedDataMap<Handle(HYDROData_PolylineXY), TopoDS_Shape>& outPoly2Sh);
 };
 
 #endif
diff --git a/src/HYDROData/HYDROData_PolylineXY.cxx b/src/HYDROData/HYDROData_PolylineXY.cxx
index cd7a7100..54c418ac 100644
--- a/src/HYDROData/HYDROData_PolylineXY.cxx
+++ b/src/HYDROData/HYDROData_PolylineXY.cxx
@@ -149,8 +149,17 @@ QStringList HYDROData_PolylineXY::DumpToPython( const QString&       thePyScript
   // Set the wire color
   QStringList aWireColorDef;
 
-  QColor aWireColor = GetWireColor();
-  setPythonObjectColor( aWireColorDef, aWireColor, DefaultWireColor(), "SetWireColor" );
+  //QColor aWireColor = GetWireColor();
+  //setPythonObjectColor( aWireColorDef, aWireColor, DefaultWireColor(), "SetWireColor" );
+
+  int nbSec = NbSections();
+  for (int i = 0; i < nbSec; i++)
+  {
+    QColor aColor;
+    GetSectionColor(i, aColor);
+    setPythonPolylineSectionColor(aWireColorDef, i, aColor );
+    //aWireColorDef << "";
+  }
   
   if ( !aWireColorDef.isEmpty() )
   {
@@ -829,42 +838,59 @@ void HYDROData_PolylineXY::Update()
     }
   }
 // 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())
-  {
-    TopExp_Explorer it2(it.Value(), TopAbs_EDGE);
-    for(;it2.More();it2.Next()) 
-      aSeqEdges->Append(it2.Current());
-  }
 
+  TopoDS_Shape aResult;
   BRep_Builder aBB;
   TopoDS_Compound aCmp;
-  TopoDS_Shape aResult;
   aBB.MakeCompound(aCmp);
-  if(aSeqEdges->Length() >1)
+  if (aSectionWiresList.Size() == 1)
+    aResult = aSectionWiresList.First();
+  else if (aSectionWiresList.Size() > 1)
   {
-    ShapeAnalysis_FreeBounds::ConnectEdgesToWires( aSeqEdges, 1E-5, Standard_True, aSeqWires );
-
-    if( aSeqWires->Length()==1 )
-      aResult = aSeqWires->Value( 1 );
-    else
+    TopTools_ListIteratorOfListOfShape it(aSectionWiresList);
+    for(;it.More();it.Next())
     {
-      for (Standard_Integer i = 1; i <= aSeqWires->Length();i++)
-      {
-        const TopoDS_Shape& aS1 = aSeqWires->Value(i);
-        aBB.Add(aCmp, aS1);
-      }
-      aResult = aCmp;
+      aBB.Add(aCmp, it.Value());
     }
+    aResult = aCmp;
   }
-  else if (aSeqEdges->Length() == 1)
-  {
-    BRepBuilderAPI_MakeWire mkWire (TopoDS::Edge(aSeqEdges->Value(1)));
-    if (mkWire.IsDone())
-      aResult = mkWire.Wire();
-  }
+
+  //Handle(TopTools_HSequenceOfShape) aSeqWires = new TopTools_HSequenceOfShape;
+  //Handle(TopTools_HSequenceOfShape) aSeqEdges = new TopTools_HSequenceOfShape;
+  //TopTools_ListIteratorOfListOfShape it(aSectionWiresList);
+  //for(;it.More();it.Next())
+  //{
+  //  TopExp_Explorer it2(it.Value(), TopAbs_EDGE);
+  //  for(;it2.More();it2.Next()) 
+  //    aSeqEdges->Append(it2.Current());
+  //}
+  //
+  //BRep_Builder aBB;
+  //TopoDS_Compound aCmp;
+  //TopoDS_Shape aResult;
+  //aBB.MakeCompound(aCmp);
+  //if(aSeqEdges->Length() >1)
+  //{
+  //  ShapeAnalysis_FreeBounds::ConnectEdgesToWires( aSeqEdges, 1E-5, Standard_True, aSeqWires );
+  //
+  //  if( aSeqWires->Length()==1 )
+  //    aResult = aSeqWires->Value( 1 );
+  //  else
+  //  {
+  //    for (Standard_Integer i = 1; i <= aSeqWires->Length();i++)
+  //    {
+  //      const TopoDS_Shape& aS1 = aSeqWires->Value(i);
+  //      aBB.Add(aCmp, aS1);
+  //    }
+  //    aResult = aCmp;
+  //  }
+  //}
+  //else if (aSeqEdges->Length() == 1)
+  //{
+  //  BRepBuilderAPI_MakeWire mkWire (TopoDS::Edge(aSeqEdges->Value(1)));
+  //  if (mkWire.IsDone())
+  //    aResult = mkWire.Wire();
+  //}
 
   SetShape( aResult );
 }
diff --git a/src/HYDROGUI/HYDROGUI_Polyline.cxx b/src/HYDROGUI/HYDROGUI_Polyline.cxx
index edc05ccc..0119af16 100644
--- a/src/HYDROGUI/HYDROGUI_Polyline.cxx
+++ b/src/HYDROGUI/HYDROGUI_Polyline.cxx
@@ -62,12 +62,28 @@ Handle( Graphic3d_ArrayOfPolylines ) BuildEdgePresentation( const TopoDS_Edge& t
   return anArray;
 }
 
+bool HYDROGUI_Polyline::GetColorOfSubShape(const TopoDS_Shape& SubShape, Quantity_Color& outColor)
+{
+  for (int i=1; i<=myShapeToColor.Extent();i++)
+  {
+    const TopoDS_Shape& aCurShape = myShapeToColor.FindKey(i);
+    TopTools_IndexedMapOfShape aSubShMap;
+    TopExp::MapShapes(aCurShape, aSubShMap);
+    if (aSubShMap.Contains(SubShape))
+    {
+      outColor = myShapeToColor(i);
+      return true;
+    }
+  }
+  return false;
+}
+
 void HYDROGUI_Polyline::Compute(const Handle(PrsMgr_PresentationManager3d)& aPresentationManager,
                             const Handle(Prs3d_Presentation)& aPrs,
                             const Standard_Integer aMode)
 {  
   //AIS_Shape::Compute(aPresentationManager, aPrs, aMode);
-  //return;
+  // return;
 
   aPrs->Clear();
   Handle(Graphic3d_Group) aGroup = Prs3d_Root::CurrentGroup( aPrs );
@@ -78,7 +94,6 @@ void HYDROGUI_Polyline::Compute(const Handle(PrsMgr_PresentationManager3d)& aPre
   anWidth =2;
   Handle(Graphic3d_AspectLine3d) anAspect = new Graphic3d_AspectLine3d( aColor, aType, anWidth );
 
-  TopExp_Explorer Exp1 ( myshape, TopAbs_EDGE );
   Bnd_Box BB;
   BRepBndLib::AddClose(myshape, BB);
   double xmin, xmax, ymin, ymax, zmin, zmax;
@@ -89,14 +104,27 @@ void HYDROGUI_Polyline::Compute(const Handle(PrsMgr_PresentationManager3d)& aPre
     double minSide = Min(Abs(xmax - xmin), Abs(ymax - ymin));
     devCoeff = minSide > 50 ? 0.05 : minSide / 3000;
   }
-  for ( ; Exp1.More(); Exp1.Next() )
+
+  TopExp_Explorer Exp ( myshape, TopAbs_WIRE );
+  for ( ; Exp.More(); Exp.Next() )
   {
-    TopoDS_Edge anEdge = TopoDS::Edge( Exp1.Current() );
-    Handle( Graphic3d_ArrayOfPolylines ) anArray = BuildEdgePresentation( anEdge, devCoeff );
-    if( !anArray.IsNull() )
+    TopoDS_Shape W = Exp.Current();
+    TopExp_Explorer Exp1 (W, TopAbs_EDGE );
+    Quantity_Color aWCol = aColor; //from drawer
+    if (myShapeToColor.Contains(W))
+    {
+      Quantity_Color aWCol = myShapeToColor.FindFromKey(W);
+      anAspect = new Graphic3d_AspectLine3d( aWCol, aType, anWidth );
+    }
+    for ( ; Exp1.More(); Exp1.Next() )
     {
-      aGroup->SetPrimitivesAspect( anAspect );
-      aGroup->AddPrimitiveArray( anArray );
+      TopoDS_Edge anEdge = TopoDS::Edge( Exp1.Current() );
+      Handle( Graphic3d_ArrayOfPolylines ) anArray = BuildEdgePresentation( anEdge, devCoeff);
+      if( !anArray.IsNull() )
+      {
+        aGroup->SetPrimitivesAspect( anAspect );
+        aGroup->AddPrimitiveArray( anArray );
+      }
     }
   }
 }
@@ -107,7 +135,8 @@ QList<Handle(AIS_InteractiveObject)> HYDROGUI_Polyline::createPresentations
   QList<Handle(AIS_InteractiveObject)> shapes;
 
   // 1. Main shape
-  shapes.append( new HYDROGUI_Polyline( theShape ) );
+  Handle(HYDROGUI_Polyline) aMPoly = new HYDROGUI_Polyline( theShape );
+  shapes.append( aMPoly );
 
   // 2. Shapes for direction arrows on edges
   TopExp_Explorer Exp ( theShape, TopAbs_EDGE );
@@ -116,7 +145,7 @@ QList<Handle(AIS_InteractiveObject)> HYDROGUI_Polyline::createPresentations
     TopoDS_Edge anEdge = TopoDS::Edge(Exp.Current());
     if ( !anEdge.IsNull() ) 
     {
-      Handle(HYDROGUI_Arrow) arrow = new HYDROGUI_Arrow( anEdge );
+      Handle(HYDROGUI_Arrow) arrow = new HYDROGUI_Arrow( anEdge, aMPoly );
       if( theType>=0 )
         arrow->SetType( (HYDROGUI_Arrow::Type)theType );
       if( theSize>=0 )
@@ -149,8 +178,8 @@ void HYDROGUI_Polyline::update( const QList<Handle(AIS_InteractiveObject)>& theO
 IMPLEMENT_STANDARD_RTTIEXT(HYDROGUI_Arrow, AIS_Shape)
 
 
-HYDROGUI_Arrow::HYDROGUI_Arrow( const TopoDS_Edge& edge )
-  : AIS_Shape( edge ), myType( Cone ), mySize( 35 )
+  HYDROGUI_Arrow::HYDROGUI_Arrow( const TopoDS_Edge& edge, const Handle(HYDROGUI_Polyline)& polyline )
+  : AIS_Shape( edge ), myType( Cone ), mySize( 35 ), myParentPoly (polyline)
 {
 }
 
@@ -178,6 +207,11 @@ void HYDROGUI_Arrow::SetSize( int theSize )
   mySize = qMax( theSize, 0 );
 }
 
+const Handle(HYDROGUI_Polyline)& HYDROGUI_Arrow::getParentPolyline() const
+{
+  return myParentPoly;
+}
+
 void HYDROGUI_Arrow::BoundingBox (Bnd_Box& theBndBox)
 {
   //Nothing to change, we consider arrow as object with empty bounding box
@@ -239,6 +273,9 @@ void HYDROGUI_Arrow::Compute( const Handle(PrsMgr_PresentationManager3d)& aPrese
   Attributes()->LineAspect()->Aspect()->Values( aColor, aType, anWidth );
   anWidth = 1;
 
+  const Handle(HYDROGUI_Polyline)& aParentPoly = getParentPolyline();
+  aParentPoly->GetColorOfSubShape(anEdge, aColor);
+
   if( myType==Cone )
   {
     Handle(Graphic3d_AspectLine3d) anAspect = new Graphic3d_AspectLine3d( aColor, aType, anWidth );
diff --git a/src/HYDROGUI/HYDROGUI_Polyline.h b/src/HYDROGUI/HYDROGUI_Polyline.h
index 06f2ec44..be993fe6 100644
--- a/src/HYDROGUI/HYDROGUI_Polyline.h
+++ b/src/HYDROGUI/HYDROGUI_Polyline.h
@@ -21,6 +21,9 @@
 
 #include <AIS_Shape.hxx>
 #include <QList>
+#include <NCollection_IndexedDataMap.hxx>
+#include <Quantity_Color.hxx>
+#include <TopTools_ShapeMapHasher.hxx>
 
 class TopoDS_Shape;
 class TopoDS_Edge;
@@ -39,8 +42,13 @@ public:
     ( const TopoDS_Shape& theShape, int theType, int theSize );
   static void update( const QList<Handle(AIS_InteractiveObject)>&, int theType, int theSize );
 
+  NCollection_IndexedDataMap<TopoDS_Shape, Quantity_Color, TopTools_ShapeMapHasher> myShapeToColor;
+
+  bool GetColorOfSubShape(const TopoDS_Shape& SubShape, Quantity_Color& outColor);
+
 public:
   DEFINE_STANDARD_RTTIEXT(HYDROGUI_Polyline, AIS_Shape);
+
 };
 
 class HYDROGUI_Arrow : public AIS_Shape
@@ -48,7 +56,7 @@ class HYDROGUI_Arrow : public AIS_Shape
 public:
   enum Type { None, Triangle, Cone };
 
-  HYDROGUI_Arrow( const TopoDS_Edge& edge );
+  HYDROGUI_Arrow( const TopoDS_Edge& edge, const Handle(HYDROGUI_Polyline)& polyline );
   virtual ~HYDROGUI_Arrow();
 
   virtual void Compute( const Handle(PrsMgr_PresentationManager3d)& aPresentationManager,
@@ -63,12 +71,15 @@ public:
   int  GetSize() const;
   void SetSize( int );
 
+  const Handle(HYDROGUI_Polyline)& getParentPolyline() const;
+
 public:
   DEFINE_STANDARD_RTTIEXT(HYDROGUI_Arrow, AIS_Shape);
 
 private:
   Type myType;
   int  mySize;
+  Handle(HYDROGUI_Polyline) myParentPoly;
 };
 
 #endif
diff --git a/src/HYDROGUI/HYDROGUI_PolylineOp.cxx b/src/HYDROGUI/HYDROGUI_PolylineOp.cxx
index ff4205b1..9c3ffd7e 100755
--- a/src/HYDROGUI/HYDROGUI_PolylineOp.cxx
+++ b/src/HYDROGUI/HYDROGUI_PolylineOp.cxx
@@ -185,7 +185,7 @@ void HYDROGUI_PolylineOp::startOperation()
 
         Quantity_Color aColor = CurveCreator_Utils::getRandColor();      
         QColor aQColor = CurveCreator_Utils::colorConv(aColor);
-        myEditedObject->getSectionColor(i-1, aQColor);
+        myEditedObject->GetSectionColor(i-1, aQColor);
 
         myCurve->addSectionInternal( aSectName.toStdString(),
           aCurveType, aSectClosure, aCurveCoords, CurveCreator_Utils::colorConv(aQColor) );
@@ -359,7 +359,7 @@ bool HYDROGUI_PolylineOp::processApply( int& theUpdateFlags,
     aPolylineObj->AddSection( aSectName, aSectType, aSectClosure );
 
     Quantity_Color aColor = myCurve->getColorSection(i);
-    aPolylineObj->setSectionColor(i, CurveCreator_Utils::colorConv(aColor));
+    aPolylineObj->SetSectionColor(i, CurveCreator_Utils::colorConv(aColor));
 
     // Add the points from section
     CurveCreator::Coordinates aCurveCoords = myCurve->getCoords( i );
@@ -382,10 +382,10 @@ bool HYDROGUI_PolylineOp::processApply( int& theUpdateFlags,
     }
   }
 
-  if ( !myIsEdit )
-  {
-    aPolylineObj->SetWireColor( HYDROData_PolylineXY::DefaultWireColor() );
-  }
+ //if ( !myIsEdit )
+ //{
+ //  aPolylineObj->SetWireColor( HYDROData_PolylineXY::DefaultWireColor() );
+ //}
 
   // Update the wire of polyline
   aPolylineObj->Update();
diff --git a/src/HYDROGUI/HYDROGUI_SetColorOp.cxx b/src/HYDROGUI/HYDROGUI_SetColorOp.cxx
index 73263527..eb52c47e 100644
--- a/src/HYDROGUI/HYDROGUI_SetColorOp.cxx
+++ b/src/HYDROGUI/HYDROGUI_SetColorOp.cxx
@@ -96,7 +96,12 @@ void HYDROGUI_SetColorOp::startOperation()
     Handle(HYDROData_IPolyline) aPolyObject =
       Handle(HYDROData_IPolyline)::DownCast( myEditedObject );
 
-    aFirstColor = aPolyObject->GetWireColor();
+    //aFirstColor = aPolyObject->GetWireColor();
+
+    if (aPolyObject->NbSections() > 0)
+      aPolyObject->GetSectionColor(0, aFirstColor);
+    else
+      aFirstColor = aPolyObject->GetWireColor();
 
     anIsOneColor = true;
   }
@@ -159,7 +164,15 @@ bool HYDROGUI_SetColorOp::processApply( int& theUpdateFlags,
     Handle(HYDROData_IPolyline) aPolyObject =
       Handle(HYDROData_IPolyline)::DownCast( myEditedObject );
 
-    aPolyObject->SetWireColor( aFirstColor );
+    //aPolyObject->SetWireColor( aFirstColor );
+    int nbSec = aPolyObject->NbSections();
+    if (nbSec > 0)
+    {
+      for (int i = 0; i < nbSec; i++)
+        aPolyObject->SetSectionColor(i, aFirstColor);
+    }
+    else
+      aPolyObject->SetWireColor( aFirstColor );
   }
   else if ( myEditedObject->IsKind( STANDARD_TYPE(HYDROData_LandCoverMap) ) )
   {
diff --git a/src/HYDROGUI/HYDROGUI_Shape.cxx b/src/HYDROGUI/HYDROGUI_Shape.cxx
index 27568465..69158160 100644
--- a/src/HYDROGUI/HYDROGUI_Shape.cxx
+++ b/src/HYDROGUI/HYDROGUI_Shape.cxx
@@ -42,6 +42,7 @@
 #include <TopoDS_Face.hxx>
 #include <TopoDS_Wire.hxx>
 #include <TopExp_Explorer.hxx>
+#include <TopExp.hxx>
 
 #include <SUIT_ResourceMgr.h>
 #include <SUIT_Session.h>
@@ -185,8 +186,48 @@ void HYDROGUI_Shape::update( bool isUpdateViewer,
         }
       }
 
-      QColor aWireColor = aPolyline->GetWireColor();
-      setBorderColor( aWireColor, false, false );
+      //QColor aWireColor = aPolyline->GetWireColor();
+      std::vector<QColor> aSectColors;
+      //TODO backward comp. with old aWireColor??
+      int nbSec = aPolyline->NbSections();
+      for (int i = 0; i < nbSec; i++)
+      {
+        QColor aColor;
+        aPolyline->GetSectionColor(i, aColor);
+        aSectColors.push_back(aColor);
+      }         
+
+      //
+      //setBorderColor( aWireColor, false, false );
+
+      foreach( Handle(AIS_InteractiveObject) aShape, myShapes )
+      {
+        if( !myTopoShape.IsNull() )
+        {
+          Handle(HYDROGUI_Polyline) aPShape = Handle(HYDROGUI_Polyline)::DownCast( aShape );
+          bool WireOrCmp = myTopoShape.ShapeType() == TopAbs_WIRE || myTopoShape.ShapeType() == TopAbs_COMPOUND;
+          if ( !aPShape.IsNull() && WireOrCmp)
+          {
+            TopTools_IndexedMapOfShape MW;
+            TopExp::MapShapes(myTopoShape, TopAbs_WIRE, MW);
+            if (MW.Extent() == nbSec)
+            {
+              for (int i=0;i<nbSec;i++)
+              {
+                const TopoDS_Shape& CW = MW(i+1);
+                Quantity_Color aFColor( getQuantityColorVal( aSectColors[i].red() ), 
+                  getQuantityColorVal( aSectColors[i].green() ),
+                  getQuantityColorVal( aSectColors[i].blue() ),
+                  Quantity_TOC_RGB );
+                aPShape->myShapeToColor.Add(CW, aFColor);
+              }
+            }
+          }
+        }
+      }    
+
+      //if ( theToDisplay && isVisible() && !myContext.IsNull() )  
+      //  displayShape( false );
     }
     else if ( myObject->IsKind( STANDARD_TYPE(HYDROData_Polyline3D) ) )
     {
diff --git a/src/HYDROGUI/HYDROGUI_VTKPrsShape.cxx b/src/HYDROGUI/HYDROGUI_VTKPrsShape.cxx
index 487cc470..ce016a55 100644
--- a/src/HYDROGUI/HYDROGUI_VTKPrsShape.cxx
+++ b/src/HYDROGUI/HYDROGUI_VTKPrsShape.cxx
@@ -148,7 +148,7 @@ void HYDROGUI_VTKPrsShape::buildShape()
         }
       }
 
-      QColor aWireColor = aPolyline->GetWireColor();
+      //QColor aWireColor = aPolyline->GetWireColor();
       //setBorderColor( aWireColor, false, false );
     }
     else if ( anObject->IsKind( STANDARD_TYPE(HYDROData_Polyline3D) ) )
diff --git a/src/HYDROPy/HYDROData_IPolyline.sip b/src/HYDROPy/HYDROData_IPolyline.sip
index cb455acd..0960af1a 100644
--- a/src/HYDROPy/HYDROData_IPolyline.sip
+++ b/src/HYDROPy/HYDROData_IPolyline.sip
@@ -68,6 +68,17 @@ public:
    */
   static QColor DefaultWireColor();
 
+  /**
+   * Sets color for section of polyline.
+   */
+  virtual void SetSectionColor( const int theSectionIndex, const QColor& theColor );
+
+  /**
+   * Returns color of section of polyline.
+   */
+  virtual bool GetSectionColor( const int theSectionIndex, QColor &theColor ) const;
+
+
 public:
 
   /**
diff --git a/src/HYDRO_tests/reference_data/linux/Split_Polylines_Colors.png b/src/HYDRO_tests/reference_data/linux/Split_Polylines_Colors.png
index 98177d9911e6dd0514467e35bd86356c74fcb622..eb2d07c69df5d77dc52f181398a2c66465b6111d 100644
GIT binary patch
literal 3263
zcmeAS@N?(olHy`uVBq!ia0y~yU{+vYU<&471B!guShN{PaTa()7BevL9RXp+soH$f
z3=BMlo-U3d6?5L+I>>uiL4@_7|C4{wWnKr`GbT=*$#w6jP<NzpF+T%?!-L`~kV*FI
zE;HZw+|9-CU}k9*Lp0M9)*256hHAas`v-+}7#I|k9T*rIdKefP7>t-$7#L1)2#gAj
z2FPe)7|jTyCBtZ`I9el&)`p|C;b?6*S{n}k+AwB0`-bxQa==c5{ib6-#TXbmDw<ds
b7*h5<vEp12_vYC{pbUejtDnm{r-UW|0>!|A

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

diff --git a/src/HYDRO_tests/reference_data/win32/Split_Polylines_Colors.png b/src/HYDRO_tests/reference_data/win32/Split_Polylines_Colors.png
index 7bcb35d0d420488e27c60d70343cc11e83333191..fc98137fe370c36171509d2f970f32c0c095138c 100644
GIT binary patch
literal 3983
zcmeAS@N?(olHy`uVBq!ia0y~yU{+vYV2a>i1B%QlYbpRzoCO|{#S9F5M?jcysy3fA
z0|URKr;B4q#hkZy{X3>t${zTbu99QTaZ)HE;E5YcQ}xRY7f(j$AL=+I#A}tbt%KQ5
zXNQZlreYO`)mApg1<e0sB`yfE?W)i!c&@N<x&v2~ZAA5pN47soPo_?pR$BPX_J7>^
z%kL}G>h3=`HfVotd*1kbz68)EKwvg&<5jr^e{-p}i&^Ix7&gfDTApWRV9@$EVRu<>
z<Xc7thK94w4M2sGj7$s+DJ&ce3=;$u7#JMfMg>O$WHd31W`xm_VYE~ntr13R!_nGs
zv^E?Gwc$yol(e*GZ>zt*`<wW3-^!IMWBcW7e?7RdG5P+gXTXNCS?A83JIkl%`TP6t
zw=*>S*n4#rJ3~WnrU}pDtMeL7AN~6JdilTm*$fO3dQ2_;J|I<=mOG2f%D&CLI*%2o
z(zD@1&+hW~|DHWLIeB+jH6PGOHO526dNDgTly6OEU`Ti@q>w%R_y=HygEY#Ioobe~
zEP68g_xJbq8-VUIm$$3=F<sq%-k;we9v<GW4b~&gdpJYK?mDn-Z>IU5c~jX=R&EA{
z6C45z3<{e+F&f$Rv=vT20Cax11F*?IfdSa?H`10?@Xp^`BrV3kkW&TZaC^_&yXS%B
z8DKZzCX#k#kd7X(4ki|$nKcV7PPD(T|FOOGz3!XZU3+VPe+%E9clXy(VRgTl%9*A4
z_xJt1w=MT}++CnA&(C`|d)BO5rQhD%%uYWy=jX*UXU^P@PpbubbFZYln{j#izda?_
zpPrsxzbWSQ{e88+_b$D?+<*SRcNZ7C$49UG%E%B=@78>NLG<cL(Hrc3{aF0prndIa
zkB|BKdU|ymVzT9}N?u(5{Q2|#id}n)pP#$FE^hCy{-;s$z~J{k)_(DlzvKR*r>9O%
zwK%iXdwSpfoyE_mYi~4TV0hiFtuXuMB!-=(udkgCe`WCf{r&w_udb}TtG(3@DBI3(
z^UObSh3Dty{yyj>`{>Wl&-ro|1qsLBym@1-UCP72aE+gFQ(0>N!`i1)!}o0|`F*Tc
z`ts?G?|>fIw<-1XG~M!dcYanRB|X~C&CR_(s;`uhp`kRh#>9UAjvs&S%{I^f_oemT
zU&*gl=H}nueg2)6mUgf1<4*>L8yPW-k-Niw6gwPq&)@s??@?LneS31tzWIOOXZGjw
z<n=Yrd(HRR+3~#Je?iN;u2HNl@y*NE?EG?nK7M?Byxz9r!-MeW&!7J{<vCpN@zGKF
zcQ-dbKYo2(>}@Mc%b&kf|0Duqa=OX4oA*B%9h<Lt{$t|9rQtCVA7=tX`Muj=1F7PB
zJ0g4g=kZTG|21zqu)FwU&YdP;ib`QQacinAC_y<i0Fw~yx{Albsu}F=W=OcLwq<5G
jP-XJWMjU7#(9vh=87qq)$h)YEhJyH>u6{1-oD!M<Q8G2;

literal 4906
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
ZiSe%6(kg$PKLt@BXzb*`!~RV2zX2MAZjJx|

diff --git a/src/HYDRO_tests/test_HYDROData_PolylineXY.cxx b/src/HYDRO_tests/test_HYDROData_PolylineXY.cxx
index abc72f65..7ed3645f 100644
--- a/src/HYDRO_tests/test_HYDROData_PolylineXY.cxx
+++ b/src/HYDRO_tests/test_HYDROData_PolylineXY.cxx
@@ -300,9 +300,21 @@ void test_HYDROData_PolylineXY::test_split_refs_627()
     Handle(HYDROData_PolylineXY)::DownCast( aDoc->CreateObject( KIND_POLYLINEXY ) );
   aPolyline->SetName( "test" );
 
-  QList<double> aCoords = QList<double>() << 10 << 10 << 20 << 10 << 20 << 20 << 10 << 20;
-  TopoDS_Wire aWire = Wire2d( aCoords, false );
-  aPolyline->SetShape( aWire );
+
+  //QList<double> aCoords = QList<double>() << 10 << 10 << 20 << 10 << 20 << 20 << 10 << 20;
+  aPolyline->AddSection( "", HYDROData_PolylineXY::SECTION_POLYLINE, false );
+  aPolyline->AddPoint( 0, gp_XY( 10, 10  ) );
+  aPolyline->AddPoint( 0, gp_XY( 20, 10 ) );
+  aPolyline->AddPoint( 0, gp_XY( 20, 20 ) );
+  aPolyline->AddPoint( 0, gp_XY( 10, 20 ) );
+  aPolyline->Update();
+
+
+  //TopoDS_Wire aWire = Wire2d( aCoords, false );
+  //aPolyline->SetShape( aWire );
+  TopoDS_Shape aW = aPolyline->GetShape();
+  CPPUNIT_ASSERT (aW.ShapeType() == TopAbs_WIRE);
+
   aPolyline->SetWireColor( Qt::red );
 
   gp_Pnt2d aPnt( 20, 20 );
@@ -316,25 +328,34 @@ void test_HYDROData_PolylineXY::test_split_refs_627()
   {
     Handle(HYDROData_PolylineXY) anObj = Handle(HYDROData_PolylineXY)::DownCast( anIt.Current() );
     if( aPolyline->Label() != anObj->Label() )
-      TestViewer::show( anObj->GetShape(), 0, true, anObj->GetWireColor() );
+    {
+      QColor color;
+      anObj->GetSectionColor(0, color);
+      TestViewer::show( anObj->GetShape(), 0, true, color );
+    }
   }
   CPPUNIT_ASSERT_IMAGES
     
   HYDROData_Iterator anIt2( aDoc, KIND_POLYLINEXY );
   CPPUNIT_ASSERT_EQUAL( true, anIt2.More() );
   CPPUNIT_ASSERT_EQUAL( QString( "test" ), anIt2.Current()->GetName() );
-  CPPUNIT_ASSERT_EQUAL( QColor( Qt::red ),
-    Handle(HYDROData_PolylineXY)::DownCast( anIt2.Current() )->GetWireColor() );
+
+  QColor color1, color2, color3;
+  Handle(HYDROData_PolylineXY)::DownCast( anIt2.Current() )->GetSectionColor(0, color1);
+
+  CPPUNIT_ASSERT_EQUAL( QColor( Qt::red ), color1);
   anIt2.Next();
   CPPUNIT_ASSERT_EQUAL( true, anIt2.More() );
   CPPUNIT_ASSERT_EQUAL( QString( "test_1" ), anIt2.Current()->GetName() );
-  CPPUNIT_ASSERT_EQUAL( QColor( Qt::red ), 
-    Handle(HYDROData_PolylineXY)::DownCast( anIt2.Current() )->GetWireColor() );
+
+  Handle(HYDROData_PolylineXY)::DownCast( anIt2.Current() )->GetSectionColor(0, color2);
+  CPPUNIT_ASSERT_EQUAL( QColor( Qt::red ), color2 );
+
   anIt2.Next();
   CPPUNIT_ASSERT_EQUAL( true, anIt2.More() );
   CPPUNIT_ASSERT_EQUAL( QString( "test_2" ), anIt2.Current()->GetName() );
-  CPPUNIT_ASSERT_EQUAL( QColor( Qt::red ), 
-    Handle(HYDROData_PolylineXY)::DownCast( anIt2.Current() )->GetWireColor() );
+  Handle(HYDROData_PolylineXY)::DownCast( anIt2.Current() )->GetSectionColor(0, color3);
+  CPPUNIT_ASSERT_EQUAL( QColor( Qt::red ), color3 );
   anIt2.Next();
   CPPUNIT_ASSERT_EQUAL( false, anIt2.More() );
   anIt2.Next();
-- 
2.39.2