Refs #289 - Spline profile is represented in OCC view as polyline profile

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

diff --git a/src/HYDROData/HYDROData_Profile.cxx b/src/HYDROData/HYDROData_Profile.cxx
index f2f8ba46bde8dd1b220323e21c8e77b38c9486d6..a3cbe730753853d77fcec0d3f75da78e268e1283 100755 (executable)
--- a/src/HYDROData/HYDROData_Profile.cxx
+++ b/src/HYDROData/HYDROData_Profile.cxx
@@ -4,9 +4,11 @@
 #include "HYDROData_Document.h"
 #include "HYDROData_Iterator.h"
 #include "HYDROData_Tool.h"
+#include "HYDROData_PolylineXY.h"
 
 #include <BRepBuilderAPI_MakeEdge.hxx>
 #include <BRepBuilderAPI_MakeWire.hxx>
+#include <BRepBuilderAPI_MakePolygon.hxx>
 
 #include <gp_XY.hxx>
 #include <gp_XYZ.hxx>
@@ -61,7 +63,7 @@ TopoDS_Shape HYDROData_Profile::GetTopShape() const
   TopoDS_Wire aWire;
 
   gp_XY aFirstPoint, aLastPoint;
-  if ( !GetFirstPoint( aFirstPoint ) || !GetLastPoint( aLastPoint ) )
+  if ( !GetLeftPoint( aFirstPoint ) || !GetRightPoint( aLastPoint ) )
     return aWire;
 
   gp_Pnt aPnt1( aFirstPoint.X(), aFirstPoint.Y(), 0 );
@@ -85,27 +87,15 @@ void HYDROData_Profile::Update()
 {
   HYDROData_Object::Update();
 
-  BRepBuilderAPI_MakeWire aMakeWire;
-
-  ProfilePoints aProfilePoints = GetProfilePoints();
-  for ( int i = 1, n = aProfilePoints.Length(); i < n ; ++i )
+  TopoDS_Wire aWire;
+  Handle(HYDROData_ProfileUZ) aProfile = GetProfileUZ( false );
+  if ( !aProfile.IsNull() )
   {
-    ProfilePoint aFirstPoint = aProfilePoints.Value( i );
-    ProfilePoint aSecPoint = aProfilePoints.Value( i + 1 );
-
-    gp_Pnt aPnt1( aFirstPoint.X(), aFirstPoint.Y(), aFirstPoint.Z() );
-    gp_Pnt aPnt2( aSecPoint.X(),   aSecPoint.Y(),   aSecPoint.Z()   );
-
-    BRepBuilderAPI_MakeEdge aMakeEdge( aPnt1, aPnt2 );
-    TopoDS_Edge anEdge = aMakeEdge;
+    ProfilePoints aProfilePoints = GetProfilePoints();
+    HYDROData_IPolyline::SectionType aSectionType = aProfile->GetSectionType( 0 );
 
-    aMakeWire.Add( anEdge );
+    aWire = HYDROData_PolylineXY::BuildWire( aSectionType, false, aProfilePoints );
   }
-
-  TopoDS_Wire aWire;
-  if ( aMakeWire.IsDone() )
-    aWire = aMakeWire;
-
   SetShape3D( aWire );
 }
 
@@ -132,14 +122,14 @@ QColor HYDROData_Profile::getDefaultBorderColor() const
 bool HYDROData_Profile::IsValid() const
 {
   gp_XY aFirstPoint, aLastPoint;
-  if ( !GetFirstPoint( aFirstPoint ) || !GetLastPoint( aLastPoint ) )
+  if ( !GetLeftPoint( aFirstPoint ) || !GetRightPoint( aLastPoint ) )
     return false;
 
   int aNbPoints = NbPoints();
   return aNbPoints > 1;
 }
 
-void HYDROData_Profile::SetFirstPoint( const gp_XY& thePoint )
+void HYDROData_Profile::SetLeftPoint( const gp_XY& thePoint )
 {
   TDF_Label aLabel = myLab.FindChild( DataTag_FirstPoint );
 
@@ -153,7 +143,7 @@ void HYDROData_Profile::SetFirstPoint( const gp_XY& thePoint )
   SetToUpdate( true );
 }
 
-bool HYDROData_Profile::GetFirstPoint( gp_XY& thePoint ) const
+bool HYDROData_Profile::GetLeftPoint( gp_XY& thePoint ) const
 {
   TDF_Label aLabel = myLab.FindChild( DataTag_FirstPoint, false );
   if ( aLabel.IsNull() )
@@ -169,7 +159,7 @@ bool HYDROData_Profile::GetFirstPoint( gp_XY& thePoint ) const
   return true;
 }
 
-void HYDROData_Profile::SetLastPoint( const gp_XY& thePoint )
+void HYDROData_Profile::SetRightPoint( const gp_XY& thePoint )
 {
   TDF_Label aLabel = myLab.FindChild( DataTag_LastPoint );
 
@@ -183,7 +173,7 @@ void HYDROData_Profile::SetLastPoint( const gp_XY& thePoint )
   SetToUpdate( true );
 }
 
-bool HYDROData_Profile::GetLastPoint( gp_XY& thePoint ) const
+bool HYDROData_Profile::GetRightPoint( gp_XY& thePoint ) const
 {
   TDF_Label aLabel = myLab.FindChild( DataTag_LastPoint, false );
   if ( aLabel.IsNull() )
@@ -291,8 +281,8 @@ void HYDROData_Profile::SetProfilePoints( const ProfilePoints& thePoints )
     aProfileUZ->AddPoint( 0, aParPoint );
   }
 
-  SetFirstPoint( aFirstPoint );
-  SetLastPoint( aLastPoint );
+  SetLeftPoint( aFirstPoint );
+  SetRightPoint( aLastPoint );
 }
 
 HYDROData_Profile::ProfilePoints HYDROData_Profile::GetProfilePoints() const
@@ -300,7 +290,7 @@ HYDROData_Profile::ProfilePoints HYDROData_Profile::GetProfilePoints() const
   ProfilePoints aResPoints;
 
   gp_XY aFirstPoint, aLastPoint;
-  if ( !GetFirstPoint( aFirstPoint ) || !GetLastPoint( aLastPoint ) )
+  if ( !GetLeftPoint( aFirstPoint ) || !GetRightPoint( aLastPoint ) )
     return aResPoints;
 
   HYDROData_ProfileUZ::PointsList aParametricPoints = GetParametricPoints();