Lot 2: change bathy associated to natural object propagated to all cases without...

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

diff --git a/src/HYDROData/HYDROData_Profile.cxx b/src/HYDROData/HYDROData_Profile.cxx
index 0057722b7707d1bf1572393fb48bf378843795c2..cf738b2c929e0b8d03ffd9177af4de4750fb387a 100644 (file)
--- a/src/HYDROData/HYDROData_Profile.cxx
+++ b/src/HYDROData/HYDROData_Profile.cxx
@@ -162,15 +162,17 @@ TopoDS_Shape HYDROData_Profile::GetTopShape() const
   return aWire;
 }
 
-TopoDS_Shape HYDROData_Profile::GetShape3D() const
+TopoDS_Shape HYDROData_Profile::GetShape3D(bool forceRebuild, bool reverseXCoord) const
 {
+  if (forceRebuild)
+    return CreateProfileWire( true, reverseXCoord );
   TopoDS_Shape aShape = HYDROData_Object::GetShape3D();
   if( aShape.IsNull() )
-    aShape = CreateProfileWire( true );
+    aShape = CreateProfileWire( true, reverseXCoord );
   return aShape;
 }
 
-TopoDS_Shape HYDROData_Profile::CreateProfileWire( bool canUseDefaultPoints ) const
+TopoDS_Shape HYDROData_Profile::CreateProfileWire( bool canUseDefaultPoints, bool reverseXCoord ) const
 {
   TopoDS_Wire aWire;
   Handle(HYDROData_ProfileUZ) aProfile = GetProfileUZ( false );
@@ -178,7 +180,14 @@ TopoDS_Shape HYDROData_Profile::CreateProfileWire( bool canUseDefaultPoints ) co
   {
     ProfilePoints aProfilePoints = GetProfilePoints( false, canUseDefaultPoints );
     HYDROData_IPolyline::SectionType aSectionType = aProfile->GetSectionType( 0 );
-
+    if (reverseXCoord)
+    {
+      for ( int i = 1; i <= aProfilePoints.Size() ; i++ )
+      {
+        gp_XYZ& aPoint = aProfilePoints.ChangeValue(i);
+        aPoint.ChangeCoord(1) = -aPoint.X();
+      }
+    }
     aWire = HYDROData_PolylineXY::BuildWire( aSectionType, false, aProfilePoints );
   }
   return aWire;
@@ -218,14 +227,17 @@ 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 );
 
   Handle(TDataStd_RealArray) anArray;
   if ( !aLabel.FindAttribute( TDataStd_RealArray::GetID(), anArray ) )
+  {
     anArray = TDataStd_RealArray::Set( aLabel, 0, 1 );
+    anArray->SetID(TDataStd_RealArray::GetID());
+  }
 
   anArray->SetValue( 0, aLPoint.X() );
   anArray->SetValue( 1, aLPoint.Y() );
@@ -250,7 +262,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 ) )
   {
@@ -270,14 +282,17 @@ 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 );
 
   Handle(TDataStd_RealArray) anArray;
   if ( !aLabel.FindAttribute( TDataStd_RealArray::GetID(), anArray ) )
+  {
     anArray = TDataStd_RealArray::Set( aLabel, 0, 1 );
+    anArray->SetID(TDataStd_RealArray::GetID());
+  }
 
   anArray->SetValue( 0, aLPoint.X() );
   anArray->SetValue( 1, aLPoint.Y() );
@@ -301,7 +316,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 ) )
   {
@@ -392,7 +407,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 )
   {
@@ -420,19 +435,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();
@@ -441,9 +464,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;
@@ -463,7 +486,8 @@ HYDROData_Profile::ProfilePoints HYDROData_Profile::GetProfilePoints
 
 void HYDROData_Profile::SetFilePath( const TCollection_AsciiString& theFilePath )
 {
-  TDataStd_AsciiString::Set( myLab.FindChild( DataTag_FilePath ), theFilePath );
+   Handle(TDataStd_AsciiString) anAttr = TDataStd_AsciiString::Set( myLab.FindChild( DataTag_FilePath ), theFilePath );
+   anAttr->SetID(TDataStd_AsciiString::GetID());
 }
 
 TCollection_AsciiString HYDROData_Profile::GetFilePath() const
@@ -477,6 +501,16 @@ TCollection_AsciiString HYDROData_Profile::GetFilePath() const
   return aRes;
 }
 
+void HYDROData_Profile::SetProfileColor( const QColor& theColor )
+{
+  SetColor( theColor, DataTag_ProfileColor );
+}
+
+bool HYDROData_Profile::GetProfileColor(QColor& outColor) const
+{
+  return GetColor( outColor, DataTag_ProfileColor );
+}
+
 int HYDROData_Profile::ImportFromFile( const Handle(HYDROData_Document)& theDoc,
                                        const TCollection_AsciiString&    theFileName,
                                        NCollection_Sequence<int>&        theBadProfilesIds,
@@ -762,7 +796,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() );