patch for correct compilation on Linux

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

diff --git a/src/HYDROData/HYDROData_Channel.cxx b/src/HYDROData/HYDROData_Channel.cxx
index 9ad19c9716e70bc452562c8769c18b2d4c74dad0..3aab98b5ac6ea61db8394bc8904aa6fbefc5ddab 100644 (file)
--- a/src/HYDROData/HYDROData_Channel.cxx
+++ b/src/HYDROData/HYDROData_Channel.cxx
@@ -47,6 +47,21 @@ QStringList HYDROData_Channel::DumpToPython( MapOfTreatedObjects& theTreatedObje
   return aResList;
 }
 
+HYDROData_SequenceOfObjects HYDROData_Channel::GetAllReferenceObjects() const
+{
+  HYDROData_SequenceOfObjects aResSeq = HYDROData_ArtificialObject::GetAllReferenceObjects();
+
+  Handle(HYDROData_Polyline3D) aGuideLine = GetGuideLine();
+  if ( !aGuideLine.IsNull() )
+    aResSeq.Append( aGuideLine );
+
+  Handle(HYDROData_Profile) aProfile = GetProfile();
+  if ( !aProfile.IsNull() )
+    aResSeq.Append( aProfile );
+
+  return aResSeq;
+}
+
 TopoDS_Shape HYDROData_Channel::GetTopShape() const
 {
   return getTopShape();
@@ -59,9 +74,7 @@ TopoDS_Shape HYDROData_Channel::GetShape3D() const
 
 void HYDROData_Channel::Update()
 {
-  removeTopShape();
-  removeShape3D();
-  SetToUpdate( false );
+  HYDROData_ArtificialObject::Update();
 
   Handle(HYDROData_Polyline3D) aGuideLine = GetGuideLine();
   Handle(HYDROData_Profile) aProfile = GetProfile();
@@ -73,17 +86,21 @@ void HYDROData_Channel::Update()
 
 bool HYDROData_Channel::SetGuideLine( const Handle(HYDROData_Polyline3D)& theGuideLine )
 {
-  if ( theGuideLine.IsNull()  )
+  Handle(HYDROData_Polyline3D) aPrevGuideLine = GetGuideLine();
+
+  if ( theGuideLine.IsNull() )
+  {
+    RemoveGuideLine();
+    return !aPrevGuideLine.IsNull();
+  }
+
+  if ( IsEqual( aPrevGuideLine, theGuideLine ) )
     return false;
-  
+
   TopoDS_Wire aHydraulicWire = TopoDS::Wire( theGuideLine->GetTopShape() );
   if ( aHydraulicWire.IsNull() )
     return false; // The polyline must be a single wire
 
-  Handle(HYDROData_Polyline3D) aPrevGuideLine = GetGuideLine();
-  if ( IsEqual( aPrevGuideLine, theGuideLine ) )
-    return true;
-
   SetReferenceObject( theGuideLine, DataTag_GuideLine );
 
   // Indicate model of the need to update the chanel presentation
@@ -112,12 +129,16 @@ void HYDROData_Channel::RemoveGuideLine()
 
 bool HYDROData_Channel::SetProfile( const Handle(HYDROData_Profile)& theProfile )
 {
-  if ( theProfile.IsNull()  )
-    return false;
-  
   Handle(HYDROData_Profile) aPrevProfile = GetProfile();
+
+  if ( theProfile.IsNull() )
+  {
+    RemoveProfile();
+    return !aPrevProfile.IsNull();
+  }
+
   if ( IsEqual( aPrevProfile, theProfile ) )
-    return true;
+    return false;
 
   SetReferenceObject( theProfile, DataTag_Profile );