patch for correct compilation on Linux

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

diff --git a/src/HYDROGUI/HYDROGUI_Operations.cxx b/src/HYDROGUI/HYDROGUI_Operations.cxx
index 79622a50b0ae4b2fe1251c8b6a9d737e03c004a5..96f78286d9da998e396e6abcac89ae8ceb50e9de 100644 (file)
--- a/src/HYDROGUI/HYDROGUI_Operations.cxx
+++ b/src/HYDROGUI/HYDROGUI_Operations.cxx
@@ -50,6 +50,7 @@
 #include "HYDROGUI_ImportProfilesOp.h"
 #include "HYDROGUI_GeoreferencementOp.h"
 #include "HYDROGUI_SetColorOp.h"
+#include "HYDROGUI_Tool.h"
 
 #include <HYDROData_Document.h>
 #include <HYDROData_Obstacle.h>
@@ -70,6 +71,7 @@
 #include <SUIT_Desktop.h>
 #include <SUIT_ResourceMgr.h>
 #include <SUIT_Session.h>
+#include <SUIT_MessageBox.h>
 
 #include <QAction>
 #include <QApplication>
@@ -120,6 +122,7 @@ void HYDROGUI_Module::createActions()
   createAction( SelectedGeoreferencementId, "GEOREFERENCEMENT" ); 
   
   createAction( ImportBathymetryId, "IMPORT_BATHYMETRY", "", Qt::CTRL + Qt::Key_B );
+  createAction( EditImportedBathymetryId, "EDIT_IMPORTED_BATHYMETRY" );
 
   createAction( CreateImmersibleZoneId, "CREATE_IMMERSIBLE_ZONE" );
   createAction( EditImmersibleZoneId, "EDIT_IMMERSIBLE_ZONE" );
@@ -187,11 +190,11 @@ void HYDROGUI_Module::createMenus()
   createMenu( AllGeoreferencementId, aNewProfileId, -1, -1 );
 
   int anArtificialMenuId = createMenu( tr( "MEN_DESK_ARTIFICIAL" ), aHydroId, -1 );
-  createMenu( CreateImmersibleZoneId, anArtificialMenuId, -1, -1 );
-  createMenu( CreateStreamId, anArtificialMenuId, -1, -1 );
+  createMenu( CreateChannelId, anArtificialMenuId, -1, -1 );
 
   int aNaturalMenuId = createMenu( tr( "MEN_DESK_NATURAL" ), aHydroId, -1 );
-  createMenu( CreateChannelId, aNaturalMenuId, -1, -1 );
+  createMenu( CreateImmersibleZoneId, aNaturalMenuId, -1, -1 );
+  createMenu( CreateStreamId, aNaturalMenuId, -1, -1 );
 
   int anObstacleMenuId = createMenu( tr( "MEN_DESK_OBSTACLE" ), aHydroId, -1 );
   createMenu( ImportObstacleFromFileId, anObstacleMenuId, -1, -1 );
@@ -372,7 +375,8 @@ LightApp_Operation* HYDROGUI_Module::createOperation( const int theId ) const
     anOp = new HYDROGUI_GeoreferencementOp( aModule, HYDROGUI_GeoreferencementOp::Selected ) ;
     break;
   case ImportBathymetryId:
-    anOp = new HYDROGUI_ImportBathymetryOp( aModule );
+  case EditImportedBathymetryId:
+    anOp = new HYDROGUI_ImportBathymetryOp( aModule, theId == EditImportedBathymetryId  );
     break;
   case CreateImmersibleZoneId:
   case EditImmersibleZoneId:
@@ -478,3 +482,49 @@ QStringList HYDROGUI_Module::GetGeomObjectsToImport()
 {
   return myGeomObjectsToImport;
 }
+
+/**
+ * Returns true if the object with the given entry can be renamed.
+ * @param theEntry the object entry
+ */
+bool HYDROGUI_Module::renameAllowed( const QString& theEntry ) const
+{
+  // Allow to rename all HYDRO objects
+  Handle(HYDROData_Entity) anEntity = getDataModel()->objectByEntry( theEntry );
+  return !anEntity.IsNull();
+}
+/**
+ * Returns true if the object with the given entry is renamed.
+ * @param theEntry the object entry
+ * @param theName the new name
+ */
+bool HYDROGUI_Module::renameObject( const QString& theEntry, const QString& theName )
+{
+  Handle(HYDROData_Entity) anEntity = getDataModel()->objectByEntry( theEntry );
+  bool aRes = !anEntity.IsNull();
+  if ( aRes )
+  {
+    HYDROGUI_DataModel* aModel = getDataModel();
+    if( aModel )
+    {
+      if( anEntity->GetName() != theName )
+      {
+        // check that there are no other objects with the same name in the document
+        Handle(HYDROData_Entity) anObject = HYDROGUI_Tool::FindObjectByName( this, theName );
+        aRes = anObject.IsNull();
+        if ( aRes )
+        {
+          aRes = aModel->rename( anEntity, theName );
+        }
+        else
+        {
+          // Inform the user that the name is already used
+          QString aTitle = QObject::tr( "INSUFFICIENT_INPUT_DATA" );
+          QString aMessage = QObject::tr( "OBJECT_EXISTS_IN_DOCUMENT" ).arg( theName );
+          SUIT_MessageBox::critical( getApp()->desktop(), aTitle, aMessage );
+        }
+      }
+    }
+  }
+  return aRes;
+}