X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FHYDROGUI%2FHYDROGUI_Operations.cxx;h=829ca2adb65fcd22b2620bceab60780ac26db7a7;hb=a1431f03eac1d1aed4203d0568d987c41ce939b3;hp=d3a2d04ffb829f096f0e8f862ba440e795eb0983;hpb=0a9ef3eeee0bcca20637a13af42af8d4918f5dd1;p=modules%2Fhydro.git

diff --git a/src/HYDROGUI/HYDROGUI_Operations.cxx b/src/HYDROGUI/HYDROGUI_Operations.cxx
index d3a2d04f..829ca2ad 100644
--- a/src/HYDROGUI/HYDROGUI_Operations.cxx
+++ b/src/HYDROGUI/HYDROGUI_Operations.cxx
@@ -51,6 +51,7 @@
 #include "HYDROGUI_ImportProfilesOp.h"
 #include "HYDROGUI_GeoreferencementOp.h"
 #include "HYDROGUI_SetColorOp.h"
+#include "HYDROGUI_BathymetryBoundsOp.h"
 #include "HYDROGUI_Tool.h"
 
 #include <HYDROData_Document.h>
@@ -126,6 +127,7 @@ void HYDROGUI_Module::createActions()
   
   createAction( ImportBathymetryId, "IMPORT_BATHYMETRY", "IMPORT_BATHYMETRY_ICO", Qt::CTRL + Qt::Key_B );
   createAction( EditImportedBathymetryId, "EDIT_IMPORTED_BATHYMETRY", "EDIT_IMPORTED_BATHYMETRY_ICO" );
+  createAction( BathymetryBoundsId, "BATHYMETRY_BOUNDS", "BATHYMETRY_BOUNDS_ICO" );
 
   createAction( CreateImmersibleZoneId, "CREATE_IMMERSIBLE_ZONE", "CREATE_IMMERSIBLE_ZONE_ICO" );
   createAction( EditImmersibleZoneId, "EDIT_IMMERSIBLE_ZONE", "EDIT_IMMERSIBLE_ZONE_ICO" );
@@ -418,6 +420,9 @@ LightApp_Operation* HYDROGUI_Module::createOperation( const int theId ) const
   case EditImportedBathymetryId:
     anOp = new HYDROGUI_ImportBathymetryOp( aModule, theId == EditImportedBathymetryId  );
     break;
+  case BathymetryBoundsId:
+    anOp = new HYDROGUI_BathymetryBoundsOp( aModule );
+    break;
   case CreateImmersibleZoneId:
   case EditImmersibleZoneId:
     anOp = new HYDROGUI_ImmersibleZoneOp( aModule, theId == EditImmersibleZoneId );
@@ -456,9 +461,6 @@ LightApp_Operation* HYDROGUI_Module::createOperation( const int theId ) const
   case ImportObstacleFromFileId:
     anOp = new HYDROGUI_ImportObstacleFromFileOp( aModule );
     break;
-  case ImportCreatedPrimitiveId:
-    anOp = new HYDROGUI_ImportGeomObjectOp( aModule, HYDROGUI_ImportGeomObjectOp::ImportCreatedAsObstacle );
-    break;
   case ImportGeomObjectAsObstacleId:
     anOp = new HYDROGUI_ImportGeomObjectOp( aModule, HYDROGUI_ImportGeomObjectOp::ImportSelectedAsObstacle );
     break;
@@ -466,10 +468,12 @@ LightApp_Operation* HYDROGUI_Module::createOperation( const int theId ) const
     anOp = new HYDROGUI_ImportGeomObjectOp( aModule, HYDROGUI_ImportGeomObjectOp::ImportSelectedAsPolyline );
     break;
   case CreateBoxId:
-    application()->activateOperation( "Geometry", GEOMOp::OpBox );
+    anOp = new HYDROGUI_ImportGeomObjectOp( aModule, 
+      HYDROGUI_ImportGeomObjectOp::ImportCreatedAsObstacle, GEOMOp::OpBox );
     break;
   case CreateCylinderId:
-    application()->activateOperation( "Geometry", GEOMOp::OpCylinder );
+    anOp = new HYDROGUI_ImportGeomObjectOp( aModule, 
+      HYDROGUI_ImportGeomObjectOp::ImportCreatedAsObstacle, GEOMOp::OpCylinder );
     break;
   case DeleteId:
     anOp = new HYDROGUI_DeleteOp( aModule );
@@ -502,35 +506,6 @@ bool HYDROGUI_Module::reusableOperation( const int id )
   return LightApp_Module::reusableOperation( id );
 }
 
-/**
- * Called when the operation perfomed by another module is finished.
- * \param theModuleName the name of the module which perfomed the operation
- * \param theOperationName the operation name
- * \param theEntryList the list of the created objects entries
- */
-void HYDROGUI_Module::onExternalOperationFinished( const QString& theModuleName,
-                                                   const QString& theOperationName,
-                                                   const QStringList& theEntryList )
-{
-  // Process "Geometry" module operations with non-empty list of created objects only
-  if ( theModuleName != "Geometry" || theEntryList.isEmpty() ) {
-    return;
-  }
-  
-  // Start import GEOM object operation
-  myGeomObjectsToImport = theEntryList;
-  startOperation( ImportCreatedPrimitiveId );
-  myGeomObjectsToImport.clear();
-}
-
-/**
- * Returns the list of entries of GEOM objects to be imported.
- */
-QStringList HYDROGUI_Module::GetGeomObjectsToImport()
-{
-  return myGeomObjectsToImport;
-}
-
 /**
  * Returns true if the object with the given entry can be renamed.
  * @param theEntry the object entry