merge BR_v14_rc

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

diff --git a/src/HYDROData/HYDROData_Stream.cxx b/src/HYDROData/HYDROData_Stream.cxx
index 42a62b5771f92a31f0ccbe1475d0e29404041127..a0f663f836bc9bae25390bd0f99351c97ca058f1 100644 (file)
--- a/src/HYDROData/HYDROData_Stream.cxx
+++ b/src/HYDROData/HYDROData_Stream.cxx
@@ -95,7 +95,7 @@ IMPLEMENT_STANDARD_RTTIEXT(HYDROData_Stream,HYDROData_NaturalObject)
 
 
 HYDROData_Stream::HYDROData_Stream()
-: HYDROData_NaturalObject()
+: HYDROData_NaturalObject( Geom_3d )
 {
 }
 
@@ -303,49 +303,28 @@ bool HYDROData_Stream::IsValidAsAxis( const Handle(HYDROData_PolylineXY)& theHyd
   return true;
 }
 
-TopoDS_Shape getShapeFromGroup( const HYDROData_SequenceOfObjects& theGroups,
-                                const int                          theGroupId )
-{
-  TopoDS_Shape aResShape;
-  if ( theGroups.Length() != 4 )
-    return aResShape;
-
-  Handle(HYDROData_ShapesGroup) aGroup =
-    Handle(HYDROData_ShapesGroup)::DownCast( theGroups.Value( theGroupId ) );
-  if ( aGroup.IsNull() )
-    return aResShape;
-
-  TopTools_SequenceOfShape aGroupShapes;
-  aGroup->GetShapes( aGroupShapes );
-
-  if ( !aGroupShapes.IsEmpty() )
-    aResShape = aGroupShapes.First();
-
-  return aResShape;
-}
-
 TopoDS_Shape HYDROData_Stream::GetLeftShape() const
 {
   HYDROData_SequenceOfObjects aGroups = GetGroups();
-  return getShapeFromGroup( aGroups, 1 );
+  return HYDROData_Tool::getFirstShapeFromGroup( aGroups, 1);
 }
 
 TopoDS_Shape HYDROData_Stream::GetRightShape() const
 {
   HYDROData_SequenceOfObjects aGroups = GetGroups();
-  return getShapeFromGroup( aGroups, 2 );
+  return HYDROData_Tool::getFirstShapeFromGroup( aGroups, 2);
 }
 
 TopoDS_Shape HYDROData_Stream::GetInletShape() const
 {
   HYDROData_SequenceOfObjects aGroups = GetGroups();
-  return getShapeFromGroup( aGroups, 3 );
+  return HYDROData_Tool::getFirstShapeFromGroup( aGroups, 3);
 }
 
 TopoDS_Shape HYDROData_Stream::GetOutletShape() const
 {
   HYDROData_SequenceOfObjects aGroups = GetGroups();
-  return getShapeFromGroup( aGroups, 4 );
+  return HYDROData_Tool::getFirstShapeFromGroup( aGroups, 4);
 }
 
 QColor HYDROData_Stream::getDefaultFillingColor() const
@@ -373,7 +352,7 @@ bool HYDROData_Stream::SetHydraulicAxis( const Handle(HYDROData_PolylineXY)& the
   updateProfilesOrder();
 
   // Indicate model of the need to update the stream presentation
-  SetToUpdate( true );
+  Changed( Geom_3d );
 
   return true;
 }
@@ -396,7 +375,7 @@ void HYDROData_Stream::RemoveHydraulicAxis()
   RemoveProfiles();
 
   // Indicate model of the need to update the stream presentation
-  SetToUpdate( true );
+  Changed( Geom_3d );
 }
 
 bool HYDROData_Stream::HasIntersection( const Handle(HYDROData_Profile)& theProfile,
@@ -530,7 +509,7 @@ bool HYDROData_Stream::AddProfile( const Handle(HYDROData_Profile)& theProfile )
   insertProfileInToOrder( theProfile, aProfileIndex );
   
   // Indicate model of the need to update the stream presentation
-  SetToUpdate( true );
+  Changed( Geom_3d );
 
   return true;
 }
@@ -575,7 +554,7 @@ bool HYDROData_Stream::SetProfiles( const HYDROData_SequenceOfObjects& theProfil
     SetReferenceObjects( theProfiles, DataTag_Profile );
 
     if ( anIsToUpdate )
-      SetToUpdate( true );
+      Changed( Geom_3d );
   }
 
   return true;
@@ -618,22 +597,20 @@ bool HYDROData_Stream::RemoveProfile( const Handle(HYDROData_Profile)& theProfil
   removeParameter( aProfileIndex );
 
   // Indicate model of the need to update the stream presentation
-  SetToUpdate( true );
+  Changed( Geom_3d );
 
   return true;
 }
 
 void HYDROData_Stream::RemoveProfiles()
 {
-  bool anIsToUpdate = IsMustBeUpdated() || NbReferenceObjects( DataTag_Profile ) > 0;
-
   ClearReferenceObjects( DataTag_Profile );
 
   // Remove the parameters array
   removeParametersArray();
 
   // Indicate model of the need to update the stream presentation
-  SetToUpdate( anIsToUpdate );
+  Changed( Geom_3d );
 }
 
 void HYDROData_Stream::insertProfileInToOrder( const Handle(HYDROData_Profile)& theProfile,
@@ -1028,7 +1005,8 @@ bool HYDROData_Stream::Interpolate( HYDROData_IProfilesInterpolator* theInterpol
   return isOK;
 }
 
-void HYDROData_Stream::CopyTo( const Handle(HYDROData_Entity)& theDestination ) const
+void HYDROData_Stream::CopyTo( const Handle(HYDROData_Entity)& theDestination,
+                               bool isGenerateNewName ) const
 {
   // Get the document
   Handle(HYDROData_Document) aDocument = HYDROData_Document::Document( myLab );
@@ -1037,7 +1015,7 @@ void HYDROData_Stream::CopyTo( const Handle(HYDROData_Entity)& theDestination )
   }
 
   // Call base method
-  HYDROData_Entity::CopyTo( theDestination );
+  HYDROData_Entity::CopyTo( theDestination, isGenerateNewName );
 
   Handle(HYDROData_Stream) aStreamCopy = 
     Handle(HYDROData_Stream)::DownCast( theDestination );