Merge branch 'BR_PY3'

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

diff --git a/src/HYDROData/HYDROData_Profile.cxx b/src/HYDROData/HYDROData_Profile.cxx
index ae79ef48f73ccf1487d3de92993222db037fcda0..bf834894e2434d281261f4a3803e03d7852768e9 100644 (file)
--- a/src/HYDROData/HYDROData_Profile.cxx
+++ b/src/HYDROData/HYDROData_Profile.cxx
@@ -53,6 +53,9 @@
 #include <QColor>
 #include <QStringList>
 
+//#define _DEVDEBUG_
+#include "HYDRO_trace.hxx"
+
 IMPLEMENT_STANDARD_RTTIEXT(HYDROData_Profile, HYDROData_Object)
 
 HYDROData_Profile::HYDROData_Profile()
@@ -227,7 +230,7 @@ void HYDROData_Profile::SetLeftPoint( const gp_XY& theGPoint, bool IsConvertFrom
   if ( aLabel.IsNull() )
     return;
 
-  Handle(HYDROData_Document) aDoc = HYDROData_Document::Document( Label() );
+  Handle(HYDROData_Document) aDoc = HYDROData_Document::Document();
   gp_XY aLPoint = theGPoint;
   if( IsConvertFromGlobal )
     aDoc->Transform( aLPoint, true );
@@ -262,7 +265,7 @@ bool HYDROData_Profile::GetLeftPoint( gp_XY& thePoint, bool IsConvertToGlobal,
     return CanUseDefault;
   }
 
-  Handle(HYDROData_Document) aDoc = HYDROData_Document::Document( myLab );
+  Handle(HYDROData_Document) aDoc = HYDROData_Document::Document();
   Handle(TDataStd_RealArray) anArray;
   if ( !aLabel.FindAttribute( TDataStd_RealArray::GetID(), anArray ) )
   {
@@ -282,7 +285,7 @@ void HYDROData_Profile::SetRightPoint( const gp_XY& theGPoint, bool IsConvertFro
 {
   TDF_Label aLabel = myLab.FindChild( DataTag_LastPoint );
 
-  Handle(HYDROData_Document) aDoc = HYDROData_Document::Document( Label() );
+  Handle(HYDROData_Document) aDoc = HYDROData_Document::Document();
   gp_XY aLPoint = theGPoint;
   if( IsConvertFromGlobal )
     aDoc->Transform( aLPoint, true );
@@ -316,7 +319,7 @@ bool HYDROData_Profile::GetRightPoint( gp_XY& thePoint, bool IsConvertToGlobal,
     return CanUseDefault;
   }
 
-  Handle(HYDROData_Document) aDoc = HYDROData_Document::Document( myLab );
+  Handle(HYDROData_Document) aDoc = HYDROData_Document::Document();
   Handle(TDataStd_RealArray) anArray;
   if ( !aLabel.FindAttribute( TDataStd_RealArray::GetID(), anArray ) )
   {
@@ -407,7 +410,7 @@ void HYDROData_Profile::SetProfilePoints( const ProfilePoints& thePoints, bool I
 
   gp_XY aFirstPoint, aLastPoint;
 
-  Handle(HYDROData_Document) aDoc = HYDROData_Document::Document( Label() );
+  Handle(HYDROData_Document) aDoc = HYDROData_Document::Document();
   Handle(HYDROData_ProfileUZ) aProfileUZ = GetProfileUZ();
   for ( int i = 1, n = thePoints.Length(); i <= n ; ++i )
   {
@@ -435,19 +438,27 @@ void HYDROData_Profile::SetProfilePoints( const ProfilePoints& thePoints, bool I
 HYDROData_Profile::ProfilePoints HYDROData_Profile::GetProfilePoints
   ( bool IsConvertToGlobal, bool CanUseDefaultLeftRight ) const
 {
-  ProfilePoints aResPoints;
-
   gp_XY aFirstPoint, aLastPoint;
   if ( !GetLeftPoint( aFirstPoint, IsConvertToGlobal, CanUseDefaultLeftRight ) ||
        !GetRightPoint( aLastPoint, IsConvertToGlobal, CanUseDefaultLeftRight ) )
-    return aResPoints;
+    return HYDROData_Profile::ProfilePoints();
 
   HYDROData_ProfileUZ::PointsList aParametricPoints = GetParametricPoints();
-  if ( aParametricPoints.Length() < 2 )
+
+  return CalculateProfilePoints(aParametricPoints, aFirstPoint, aLastPoint);
+}
+
+HYDROData_Profile::ProfilePoints HYDROData_Profile::CalculateProfilePoints(
+  const HYDROData_ProfileUZ::PointsList& theParametricPoints, 
+  const gp_XY& aFirstPoint, const gp_XY& aLastPoint)
+{
+  ProfilePoints aResPoints;
+
+  if ( theParametricPoints.Length() < 2 )
     return aResPoints;
 
-  const HYDROData_ProfileUZ::Point& aFirstParPoint = aParametricPoints.First();
-  const HYDROData_ProfileUZ::Point& aLastParPoint = aParametricPoints.Last();
+  const HYDROData_ProfileUZ::Point& aFirstParPoint = theParametricPoints.First();
+  const HYDROData_ProfileUZ::Point& aLastParPoint = theParametricPoints.Last();
 
   double aFullLength = aLastPoint.X() - aFirstPoint.X();
   double aParFullLength = aLastParPoint.X() - aFirstParPoint.X();
@@ -456,9 +467,9 @@ HYDROData_Profile::ProfilePoints HYDROData_Profile::GetProfilePoints
   aResPoints.Append( ProfilePoint( aFirstPoint.X(), aFirstPoint.Y(), aFirstParPoint.Y() ) );
 
   // Compute all other points
-  for ( int i = 2, n = aParametricPoints.Length(); i < n ; ++i )
+  for ( int i = 2, n = theParametricPoints.Length(); i < n ; ++i )
   {
-    const HYDROData_ProfileUZ::Point& aParPoint = aParametricPoints.Value( i );
+    const HYDROData_ProfileUZ::Point& aParPoint = theParametricPoints.Value( i );
 
     double aParPointDist = aParPoint.X() - aFirstParPoint.X();
     double aRatio = aParPointDist / aParFullLength;
@@ -788,7 +799,10 @@ HYDROData_Profile::ProfilePoint HYDROData_Profile::GetBottomPoint(bool IsConvert
      gp_Lin aMidLin( aMiddlePoint2d, gp::DZ() );
      TopoDS_Edge aMidEdge = BRepLib_MakeEdge( aMidLin );
 
-     TopoDS_Iterator anIt( TopoDS::Wire( GetShape3D() )  );
+    TopoDS_Shape aProf = TopoDS::Wire( GetShape3D() );
+     if (aProf.IsNull())
+       return aMiddlePoint;
+     TopoDS_Iterator anIt( aProf );
      for ( ; anIt.More(); anIt.Next()) {
        const TopoDS_Edge& anEdge = TopoDS::Edge( anIt.Value() );