patch for correct compilation on Linux

[modules/hydro.git] / src / HYDROData / HYDROData_PolylineXY.cxx

diff --git a/src/HYDROData/HYDROData_PolylineXY.cxx b/src/HYDROData/HYDROData_PolylineXY.cxx
index 0d79dd238678eeb86abac756dc34ea566189eda2..b20f1bd8717e1fce598ba5a731723a7ba67f1342 100755 (executable)
--- a/src/HYDROData/HYDROData_PolylineXY.cxx
+++ b/src/HYDROData/HYDROData_PolylineXY.cxx
@@ -158,35 +158,34 @@ TopoDS_Wire HYDROData_PolylineXY::BuildWire( const SectionType&
   return aWire;
 }
 
-QPainterPath HYDROData_PolylineXY::BuildPainterPath( const SectionType&                  theType,
-                                                     const bool&                         theIsClosed,
-                                                     const NCollection_Sequence<gp_XYZ>& thePoints )
+void HYDROData_PolylineXY::BuildPainterPath( QPainterPath&                       thePath,
+                                             const SectionType&                  theType,
+                                             const bool&                         theIsClosed,
+                                             const NCollection_Sequence<gp_XYZ>& thePoints )
 {
-  QPainterPath aPath;
   if ( thePoints.IsEmpty() )
-    return aPath;
+    return;
 
   if ( theType == SECTION_POLYLINE )
   {
-    aPath.moveTo( thePoints.Value( 1 ).X(), thePoints.Value( 1 ).Y() );
+    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 );
 
-      aPath.lineTo( aSectPoint.X(), aSectPoint.Y() );
+      thePath.lineTo( aSectPoint.X(), aSectPoint.Y() );
     }
 
     if( theIsClosed )
-      aPath.closeSubpath();
+      thePath.closeSubpath();
   }
   else
   {
     HYDROData_BSplineOperation aBSpline( thePoints, theIsClosed );
-    aPath = aBSpline.ComputePath();
+    aBSpline.ComputePath( thePath );
   }
-
-  return aPath;
 }
 
 void HYDROData_PolylineXY::Update()
@@ -741,29 +740,30 @@ 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;
+  for ( int aSectionId = 1, aNbSects = aSectNames.Size(); aSectionId <= aNbSects; aSectionId++ )
+  {
+    TCollection_AsciiString aSectName = aSectNames.Value( aSectionId );
+    SectionType aSectionType = aSectTypes.Value( aSectionId );
+    bool anIsSectionClosed = aSectClosures.Value( aSectionId );
+
+    PointsList aSectPointsList = GetPoints( aSectionId - 1 );
+    if ( aSectPointsList.IsEmpty() )
+      continue;
 
-  SectionType aSectionType = aSectTypes.Value( 1 );
-  bool anIsSectionClosed = aSectClosures.Value( 1 );
+    NCollection_Sequence<gp_XYZ> aPoints;
+    for( int i = 1, n = aSectPointsList.Size(); i <= n; ++i )
+    {
+      const Point& aSectPoint = aSectPointsList.Value( i );
 
-  NCollection_Sequence<gp_XYZ> aPoints;
-  for( int i = 1, n = aSectPointsList.Size(); i <= n; ++i )
-  {
-    const Point& aSectPoint = aSectPointsList.Value( i );
+      gp_XYZ aPoint( aSectPoint.X(), aSectPoint.Y(), 0.0 );
+      aPoints.Append( aPoint );
+    }
 
-    gp_XYZ aPoint( aSectPoint.X(), aSectPoint.Y(), 0.0 );
-    aPoints.Append( aPoint );
+    BuildPainterPath( aPath, aSectionType, anIsSectionClosed, aPoints );
   }
 
-  aPath = BuildPainterPath( aSectionType, anIsSectionClosed, aPoints );
-
   return aPath;
-
 }