X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FHYDROData%2FHYDROData_Tool.cxx;h=68e759d729dc1ba2c6bf485ed9d56df19aa64885;hb=424f8230c9003d00fb27499b2441c4b3a2a28292;hp=8c05efa2c76e06080484797edf185ff42c7195ce;hpb=c374597f70481110faa82dc189353d689d66bc0c;p=modules%2Fhydro.git

diff --git a/src/HYDROData/HYDROData_Tool.cxx b/src/HYDROData/HYDROData_Tool.cxx
index 8c05efa2..68e759d7 100644
--- a/src/HYDROData/HYDROData_Tool.cxx
+++ b/src/HYDROData/HYDROData_Tool.cxx
@@ -1,8 +1,10 @@
 
 #include "HYDROData_Tool.h"
 
+#include "HYDROData_ArtificialObject.h"
 #include "HYDROData_Image.h"
 #include "HYDROData_Iterator.h"
+#include "HYDROData_NaturalObject.h"
 
 #include <QFile>
 #include <QStringList>
@@ -23,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;
       }
     }
   }
@@ -66,7 +59,8 @@ void HYDROData_Tool::SetMustBeUpdatedImages(
 
 QString HYDROData_Tool::GenerateObjectName( const Handle(HYDROData_Document)& theDoc,
                                             const QString&                    thePrefix,
-                                            const QStringList&                theUsedNames )
+                                            const QStringList&                theUsedNames,
+                                            const bool                        theIsTryToUsePurePrefix )
 {
   QStringList aNamesList( theUsedNames );
 
@@ -87,14 +81,18 @@ QString HYDROData_Tool::GenerateObjectName( const Handle(HYDROData_Document)& th
 
   QString aName;
 
-  int anId = 1;
-  while( anId < 1000 )
-  {
-    aName = QString( "%1_%2" ).arg( thePrefix ).arg( QString::number( anId++ ) );
+  if ( theIsTryToUsePurePrefix && !aNamesList.contains( thePrefix ) ) {
+    aName = thePrefix;
+  } else {
+    int anId = 1;
+    while( anId < 1000 )
+    {
+      aName = QString( "%1_%2" ).arg( thePrefix ).arg( QString::number( anId++ ) );
 
-    // check that there are no other objects with the same name in the document
-    if ( !aNamesList.contains( aName ) )
-      break;
+      // check that there are no other objects with the same name in the document
+      if ( !aNamesList.contains( aName ) )
+        break;
+    }
   }
 
   return aName;
@@ -150,3 +148,11 @@ HYDROData_SequenceOfObjects HYDROData_Tool::FindObjectsByNames( const Handle(HYD
   return aResSeq;
 }
 
+bool HYDROData_Tool::IsGeometryObject( const Handle(HYDROData_Entity)& theObject )
+{
+  if ( theObject.IsNull() )
+    return false;
+  
+  return theObject->IsKind( STANDARD_TYPE(HYDROData_ArtificialObject) ) ||
+         theObject->IsKind( STANDARD_TYPE(HYDROData_NaturalObject) );
+}