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

diff --git a/src/HYDROData/HYDROData_Tool.cxx b/src/HYDROData/HYDROData_Tool.cxx
index 8c05efa2..fee6e110 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>
@@ -66,7 +68,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 +90,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 +157,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) );
+}