Minor fix.

[modules/hydro.git] / src / HYDROGUI / HYDROGUI_Tool.cxx

diff --git a/src/HYDROGUI/HYDROGUI_Tool.cxx b/src/HYDROGUI/HYDROGUI_Tool.cxx
index dbe776593dc5096e680292bf2e48dfcc00dd116d..0a942119126c98e14d6a8c02e402cbafd70a6e83 100644 (file)
--- a/src/HYDROGUI/HYDROGUI_Tool.cxx
+++ b/src/HYDROGUI/HYDROGUI_Tool.cxx
@@ -27,7 +27,6 @@
 #include "HYDROGUI_Prs.h"
 
 #include <HYDROData_Document.h>
-#include <HYDROData_Image.h>
 #include <HYDROData_Iterator.h>
 
 #include <LightApp_Application.h>
@@ -161,26 +160,20 @@ void HYDROGUI_Tool::SetActiveViewManager( HYDROGUI_Module* theModule,
           aWorkstack->setActiveWindow( aViewWindow );
 }
 
-void HYDROGUI_Tool::GetPrsSubObjects( const HYDROGUI_DataModel* theModel,
+void HYDROGUI_Tool::GetPrsSubObjects( HYDROGUI_Module* theModule,
                                       const int theViewerId, // currently unused
                                       HYDROData_SequenceOfObjects& theSeq )
 {
-  if( !theModel )
-    return;
-
-  const int aStudyId = theModel->module()->application()->activeStudy()->id();
-
-  Handle(HYDROData_Document) aDocument = HYDROData_Document::Document( aStudyId );
+  Handle(HYDROData_Document) aDocument = HYDROData_Document::Document( theModule->getStudyId() );
   if( aDocument.IsNull() )
     return;
 
-  HYDROData_Iterator anIterator( aDocument, KIND_IMAGE );
+  HYDROData_Iterator anIterator( aDocument, KIND_UNKNOWN );
   for( ; anIterator.More(); anIterator.Next() )
   {
-    Handle(HYDROData_Image) anImageObj =
-      Handle(HYDROData_Image)::DownCast( anIterator.Current() );
-    if( !anImageObj.IsNull() )
-      theSeq.Append( anImageObj );
+    Handle(HYDROData_Object) anObject = anIterator.Current();
+    if( !anObject.IsNull() )
+      theSeq.Append( anObject );
   }
 }
 
@@ -245,3 +238,43 @@ Handle(HYDROData_Object) HYDROGUI_Tool::GetSelectedObject( HYDROGUI_Module* theM
     return aSeq.First();
   return NULL;
 }
+
+Handle(HYDROData_Object) HYDROGUI_Tool::FindObjectByName( HYDROGUI_Module* theModule,
+                                                          const QString& theName,
+                                                          const ObjectKind theObjectKind )
+{
+  Handle(HYDROData_Object) anObject;
+
+  Handle(HYDROData_Document) aDocument = HYDROData_Document::Document( theModule->getStudyId() );
+  if( aDocument.IsNull() )
+    return anObject;
+
+  HYDROData_Iterator anIter( aDocument, theObjectKind );
+  for( ; anIter.More(); anIter.Next() )
+  {
+    Handle(HYDROData_Object) anObjectRef = anIter.Current();
+    if( !anObjectRef.IsNull() && anObjectRef->GetName() == theName )
+    {
+      anObject = anObjectRef;
+      break;
+    }
+  }
+  return anObject;
+}
+
+QString HYDROGUI_Tool::GenerateObjectName( HYDROGUI_Module* theModule,
+                                           const QString& thePrefix )
+{
+  QString aName;
+  int anId = 1;
+  while( anId < 100 )
+  {
+    aName = QString( "%1_%2" ).arg( thePrefix ).arg( QString::number( anId++ ) );
+
+    // check that there are no other objects with the same name in the document
+    Handle(HYDROData_Object) anObject = FindObjectByName( theModule, aName, KIND_UNKNOWN );
+    if( anObject.IsNull() )
+      break;
+  }
+  return aName;
+}