Merge from V5_1_4_BR 07/05/2010

[modules/geom.git] / src / OperationGUI / OperationGUI.cxx

diff --git a/src/OperationGUI/OperationGUI.cxx b/src/OperationGUI/OperationGUI.cxx
index ebc81748d1d95d6ee4e579d75f4efa450218dd47..d52dbb8b8f907d4e943e2f392bc95f6ebbf08427 100644 (file)
--- a/src/OperationGUI/OperationGUI.cxx
+++ b/src/OperationGUI/OperationGUI.cxx
@@ -1,4 +1,4 @@
-//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
+//  Copyright (C) 2007-2010  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 //  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 //  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@ -19,6 +19,7 @@
 //
 //  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
+
 // GEOM GEOMGUI : GUI for Geometry component
 // File   : OperationGUI.cxx
 // Author : Damien COQUERET, Open CASCADE S.A.S.
@@ -26,6 +27,7 @@
 #include "OperationGUI.h"
 
 #include <GeometryGUI.h>
+#include "GeometryGUI_Operations.h"
 
 #include <SUIT_Session.h>
 #include <SUIT_Desktop.h>
@@ -38,7 +40,7 @@
 #include "OperationGUI_PartitionDlg.h"   // Method PARTITION
 #include "OperationGUI_ArchimedeDlg.h"   // Method ARCHIMEDE
 #include "OperationGUI_FilletDlg.h"      // Method FILLET
-#include "OperationGUI_Fillet2dDlg.h"    // Method FILLET 2D
+#include "OperationGUI_Fillet1d2dDlg.h"  // Method FILLET 2D and FILLET 1D
 #include "OperationGUI_ChamferDlg.h"     // Method CHAMFER
 #include "OperationGUI_ClippingDlg.h"    // Clipping dialog box
 #include "OperationGUI_GetShapesOnShapeDlg.h"
@@ -73,13 +75,14 @@ bool OperationGUI::OnGUIEvent( int theCommandID, SUIT_Desktop* parent )
   getGeometryGUI()->EmitSignalDeactivateDialog();
 
   switch ( theCommandID ) {
-  case 503: ( new OperationGUI_PartitionDlg       ( getGeometryGUI(), parent ) )->show(); break;
-  case 504: ( new OperationGUI_ArchimedeDlg       ( getGeometryGUI(), parent ) )->show(); break;
-  case 505: ( new OperationGUI_FilletDlg          ( getGeometryGUI(), parent ) )->show(); break;
-  case 506: ( new OperationGUI_ChamferDlg         ( getGeometryGUI(), parent ) )->show(); break;
-  case 507: ( new OperationGUI_ClippingDlg        ( getGeometryGUI(), parent ) )->show(); break;
-  case 508: ( new OperationGUI_GetShapesOnShapeDlg( getGeometryGUI(), parent ) )->show(); break;
-  case 509: ( new OperationGUI_Fillet2dDlg        ( getGeometryGUI(), parent ) )->show(); break;
+  case GEOMOp::OpPartition:     ( new OperationGUI_PartitionDlg       ( getGeometryGUI(), parent ) )->show(); break;
+  case GEOMOp::OpArchimede:     ( new OperationGUI_ArchimedeDlg       ( getGeometryGUI(), parent ) )->show(); break;
+  case GEOMOp::OpFillet3d:      ( new OperationGUI_FilletDlg          ( getGeometryGUI(), parent ) )->show(); break;
+  case GEOMOp::OpChamfer:       ( new OperationGUI_ChamferDlg         ( getGeometryGUI(), parent ) )->show(); break;
+  case GEOMOp::OpClipping:      ( new OperationGUI_ClippingDlg        ( getGeometryGUI(), parent ) )->show(); break;
+  case GEOMOp::OpShapesOnShape: ( new OperationGUI_GetShapesOnShapeDlg( getGeometryGUI(), parent ) )->show(); break;
+  case GEOMOp::OpFillet1d:      ( new OperationGUI_Fillet1d2dDlg      ( getGeometryGUI(), parent, true ) )->show(); break;
+  case GEOMOp::OpFillet2d:      ( new OperationGUI_Fillet1d2dDlg      ( getGeometryGUI(), parent, false ) )->show(); break;
   default:
     app->putInfo( tr( "GEOM_PRP_COMMAND" ).arg( theCommandID ) );
   }