Feature #86: The hierarchy in the Object Browser (T 19).

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

diff --git a/src/HYDROGUI/HYDROGUI_Tool.cxx b/src/HYDROGUI/HYDROGUI_Tool.cxx
index 19d4e9c93b53c47aa71d1d76f5b54ae486fc1902..45214704940a3249db75562b91414809bc3839be 100644 (file)
--- a/src/HYDROGUI/HYDROGUI_Tool.cxx
+++ b/src/HYDROGUI/HYDROGUI_Tool.cxx
@@ -217,6 +217,7 @@ void HYDROGUI_Tool::GetPrsSubObjects( HYDROGUI_Module* theModule,
         ( anObject->GetKind() == KIND_POLYLINE ) ||
         ( anObject->GetKind() == KIND_IMMERSIBLE_ZONE ) ||
         ( anObject->GetKind() == KIND_REGION ) ||
+        ( anObject->GetKind() == KIND_BATHYMETRY ) ||
         ( anObject->GetKind() == KIND_ZONE ) ||
         ( anObject->GetKind() == KIND_OBSTACLE ) ) )
       {
@@ -356,8 +357,6 @@ QStringList HYDROGUI_Tool::GetSelectedGeomObjects( HYDROGUI_Module* theModule )
   }
 
   // Get selection
-  HYDROGUI_DataModel* aModel = theModule->getDataModel();
-
   SUIT_SelectionMgr* aSelectionMgr = theModule->getApp()->selectionMgr();
   SUIT_DataOwnerPtrList anOwners;
   aSelectionMgr->selected( anOwners );
@@ -404,10 +403,11 @@ HYDROData_SequenceOfObjects HYDROGUI_Tool::FindObjectsByNames( HYDROGUI_Module*
 
 QString HYDROGUI_Tool::GenerateObjectName( HYDROGUI_Module*   theModule,
                                            const QString&     thePrefix,
-                                           const QStringList& theUsedNames )
+                                           const QStringList& theUsedNames,
+                                           const bool         theIsTryToUsePurePrefix)
 {
   Handle(HYDROData_Document) aDocument = HYDROData_Document::Document( theModule->getStudyId() );
-  return HYDROData_Tool::GenerateObjectName( aDocument, thePrefix, theUsedNames );
+  return HYDROData_Tool::GenerateObjectName( aDocument, thePrefix, theUsedNames, theIsTryToUsePurePrefix );
 }
 
 size_t HYDROGUI_Tool::GetActiveViewId( HYDROGUI_Module* theModule,