Merge branch 'master' of https://git.salome-platform.org/gitpub/modules/hydro

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

diff --git a/src/HYDROData/HYDROData_Channel.cxx b/src/HYDROData/HYDROData_Channel.cxx
index cd4800b425a3ae9a488280cd910d9659eaf9b5f5..03013b3ee85cceabf71072839ced9e306d14a75c 100644 (file)
--- a/src/HYDROData/HYDROData_Channel.cxx
+++ b/src/HYDROData/HYDROData_Channel.cxx
@@ -92,6 +92,8 @@ QStringList HYDROData_Channel::DumpToPython( const QString& thePyScriptPath,
   Handle(HYDROData_Profile) aRefProfile = GetProfile();
   setPythonReferenceObject( thePyScriptPath, theTreatedObjects, aResList, aRefProfile, "SetProfile" );
 
+  aResList << QString( "%1.SetEquiDistance( %2 );" ).arg( aName ).arg( GetEquiDistance() );
+
   aResList << QString( "" );
   aResList << QString( "%1.Update();" ).arg( aName );
   aResList << QString( "" );
@@ -116,7 +118,8 @@ HYDROData_SequenceOfObjects HYDROData_Channel::GetAllReferenceObjects() const
 
 bool HYDROData_Channel::CreatePresentations( const Handle(HYDROData_Polyline3D)& theGuideLine,
                                              const Handle(HYDROData_Profile)&    theProfile,
-                                             PrsDefinition&                      thePrs )
+                                             PrsDefinition&                      thePrs,
+                                             double                              theEquiDistance )
 {
   // Check input parameters
   if ( theGuideLine.IsNull() || theProfile.IsNull() ) {
@@ -146,18 +149,18 @@ bool HYDROData_Channel::CreatePresentations( const Handle(HYDROData_Polyline3D)&
   int aNbPoints = aPolylinePoints.Length();
   */
 
-  HYDROData_Polyline3D::Polyline3DPoints aPolylinePoints3D = theGuideLine->GetPoints();
+  HYDROData_Polyline3D::Polyline3DPoints aPolylinePoints3D = theGuideLine->GetPoints( theEquiDistance );
   int aNbPoints = aPolylinePoints3D.Length();
-  if ( aNbPoints < 2 ) {
+  if ( aNbPoints < 2 )
     return false;
-  }
   
   // Get tangent in each point of the guide line ( 2D )
   TColgp_Array1OfDir aTangents( 1, aNbPoints );
 
   HYDROData_IPolyline::SectionType aSectionType = aPolylineXY->GetSectionType( 0 );
   
-  if ( aSectionType == HYDROData_IPolyline::SECTION_POLYLINE ) {
+  if( aSectionType == HYDROData_IPolyline::SECTION_POLYLINE )
+  {
     for ( int i = 1; i <= aNbPoints; ++i ) {
       gp_XYZ aPnt = aPolylinePoints3D.Value( i );
       aPnt.SetZ( 0. );
@@ -294,7 +297,8 @@ void HYDROData_Channel::Update()
   Handle(HYDROData_Profile) aProfile = GetProfile();
 
   PrsDefinition aResultPrs;
-  if ( !CreatePresentations( aGuideLine, aProfile, aResultPrs ) )
+  double anEquiDistance = GetEquiDistance();
+  if ( !CreatePresentations( aGuideLine, aProfile, aResultPrs, anEquiDistance ) )
     return;
 
   SetShape3D( aResultPrs.myPrs3D );
@@ -451,3 +455,14 @@ TopoDS_Shape HYDROData_Channel::GetRightShape() const
   HYDROData_SequenceOfObjects aGroups = GetGroups();
   return HYDROData_Tool::getFirstShapeFromGroup( aGroups, 2);
 }
+
+void HYDROData_Channel::SetEquiDistance( double theEquiDistance )
+{
+  double anEquiDistance = theEquiDistance > 0 ? theEquiDistance : 1E-3;
+  SetDouble( DataTag_EquiDistance, theEquiDistance );
+}
+
+double HYDROData_Channel::GetEquiDistance() const
+{
+  return GetDouble( DataTag_EquiDistance, 1.0 );
+}