6.12.2013.Fix of HasIntersection method.

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

diff --git a/src/HYDROData/HYDROData_Tool.cxx b/src/HYDROData/HYDROData_Tool.cxx
index fee6e1105dc018dac99aff70dd9077297291c9bb..68e759d729dc1ba2c6bf485ed9d56df19aa64885 100644 (file)
--- a/src/HYDROData/HYDROData_Tool.cxx
+++ b/src/HYDROData/HYDROData_Tool.cxx
@@ -25,42 +25,33 @@ void HYDROData_Tool::WriteStringsToFile( QFile&             theFile,
   anOutStream << aWriteStr << theSep << theSep;
 }
 
-void HYDROData_Tool::SetMustBeUpdatedImages(
+void HYDROData_Tool::SetMustBeUpdatedObjects(
   const Handle(HYDROData_Document)& theDoc  )
 {
   bool anIsChanged = true;
 
-  // iterate until there is no changes because images on all level of dependency must be updated
+  // iterate until there is no changes because objects on all level of dependency must be updated
   while ( anIsChanged )
   {
     anIsChanged = false;
 
-    HYDROData_Iterator anIter( theDoc, KIND_IMAGE );
+    HYDROData_Iterator anIter( theDoc );
     for ( ; anIter.More(); anIter.Next() )
     {
-      Handle(HYDROData_Image) anImage = 
-        Handle(HYDROData_Image)::DownCast( anIter.Current() );
-      if ( anImage.IsNull() || anImage->IsMustBeUpdated() )
+      Handle(HYDROData_Entity) anObject = anIter.Current();
+      if ( anObject.IsNull() || anObject->IsMustBeUpdated() )
         continue;
 
-      Handle(HYDROData_Image) aTrsfRefImage = anImage->GetTrsfReferenceImage();
-      if ( !aTrsfRefImage.IsNull() && aTrsfRefImage->IsMustBeUpdated() )
+      HYDROData_SequenceOfObjects aRefSeq = anObject->GetAllReferenceObjects();
+      for ( int i = 1, n = aRefSeq.Length(); i <= n; ++i )
       {
-        anImage->SetToUpdate( true );
-        anIsChanged = true;
-        continue;
-      }
+        Handle(HYDROData_Entity) aRefObject = aRefSeq.Value( i );
+        if ( aRefObject.IsNull() || !aRefObject->IsMustBeUpdated() )
+          continue;
 
-      for ( int i = 0, aNBRefs = anImage->NbReferences(); i < aNBRefs; ++i )
-      {
-        Handle(HYDROData_Image) aRefImage =
-          Handle(HYDROData_Image)::DownCast( anImage->Reference( i ) );
-        if ( !aRefImage.IsNull() && aRefImage->IsMustBeUpdated() )
-        {
-           // image references to updated => also must be updated
-           anImage->SetToUpdate( true );
-           anIsChanged = true;
-        }
+        anObject->SetToUpdate( true );
+        anIsChanged = true;
+        break;
       }
     }
   }