Correction for hydro_test

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

diff --git a/src/HYDROData/HYDROData_Profile.cxx b/src/HYDROData/HYDROData_Profile.cxx
index ae79ef48f73ccf1487d3de92993222db037fcda0..15e91a519143d02f8b19c4eb6e660a3a68b5d875 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()
@@ -71,14 +74,14 @@ QStringList HYDROData_Profile::DumpToPython( const QString&       thePyScriptPat
   QString aProfileName = GetObjPyName();
 
   //TCollection_AsciiString aFilePath = GetFilePath();
-  //if ( !aFilePath.IsEmpty() ) 
+  //if ( !aFilePath.IsEmpty() )
   //{
   //  aResList << QString( "%1.ImportFromFile( \"%2\" )" )
   //            .arg( aName ).arg( aFilePath.ToCString() );
   //}
 
   bool anIsValidProfile = IsValid();
-  
+
   QStringList aPntsDefinition;
   QString aPntsListName = HYDROData_Tool::GenerateNameForPython( theTreatedObjects, "profile_points" );
 
@@ -111,15 +114,15 @@ QStringList HYDROData_Profile::DumpToPython( const QString&       thePyScriptPat
     QString& aFirstStr = aPntsDefinition.first();
     aFirstStr = aFirstStr.trimmed();
     aFirstStr.prepend( QString( "%1 = [ " ).arg( aPntsListName ) );
-    
+
     aPntsDefinition.last().append( " ];" );
 
     aResList << aPntsDefinition;
-    
+
     aResList << QString( "%1.%3( %2 )" )
                 .arg( aProfileName ).arg( aPntsListName )
                 .arg( anIsValidProfile ? "SetProfilePoints" : "SetParametricPoints" );
-  
+
     aResList << QString( "" );
   }
 
@@ -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 )
   {
@@ -423,7 +426,7 @@ void HYDROData_Profile::SetProfilePoints( const ProfilePoints& thePoints, bool I
       aLastPoint = aPointXY;
 
     double aDistance = gp_Pnt2d( aFirstPoint ).Distance( aPointXY );
-    
+
     HYDROData_ProfileUZ::Point aParPoint( aDistance, aPoint.Z() );
     aProfileUZ->AddPoint( 0, aParPoint );
   }
@@ -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;
@@ -527,7 +538,7 @@ int HYDROData_Profile::ImportFromFile( const Handle(HYDROData_Document)& theDoc,
   {
     if ( aNewProfile.IsNull() )
       aNewProfile = Handle(HYDROData_Profile)::DownCast( theDoc->CreateObject( KIND_PROFILE ) );
-    
+
     bool anIsRead = false;
     if ( aNewProfile->ImportFromFile( aFile, isToProject, &anIsRead ) )
     {
@@ -683,8 +694,8 @@ bool HYDROData_Profile::ImportFromFile( OSD_File& theFile,
       aPointsXYZ.Append( aPoint );
     }
   }
-  
-  aRes = aRes && ( anIsParametric && !aPointsUZ.IsEmpty() || 
+
+  aRes = aRes && ( anIsParametric && !aPointsUZ.IsEmpty() ||
                    anIsGeoref && !aPointsXYZ.IsEmpty() );
   if ( aRes )
   {
@@ -778,17 +789,20 @@ HYDROData_Profile::ProfilePoint HYDROData_Profile::GetBottomPoint(bool IsConvert
  HYDROData_Profile::ProfilePoint HYDROData_Profile::GetMiddlePoint( bool CanUseDefault ) const
  {
    ProfilePoint aMiddlePoint;
-  
+
    gp_XY aLeftPnt, aRightPnt;
    if ( GetLeftPoint( aLeftPnt, true, CanUseDefault ) && GetRightPoint( aRightPnt, true, CanUseDefault ) ) {
      gp_XYZ aPnt1( aLeftPnt.X(), aLeftPnt.Y(), 0. );
      gp_XYZ aPnt2( aRightPnt.X(), aRightPnt.Y(), 0. );
-     gp_Pnt aMiddlePoint2d( 0.5 * ( aPnt1 + aPnt2 ) ); 
+     gp_Pnt aMiddlePoint2d( 0.5 * ( aPnt1 + aPnt2 ) );
 
      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() );