Merge from V6_main_20120808 08Aug12

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

diff --git a/src/BasicGUI/BasicGUI.cxx b/src/BasicGUI/BasicGUI.cxx
index 47c7e1135039c41188ac7913da05c49510fcbcb9..10ae19e27860fe25a0e8d32650a919d2194e7dc8 100644 (file)
--- a/src/BasicGUI/BasicGUI.cxx
+++ b/src/BasicGUI/BasicGUI.cxx
@@ -1,24 +1,25 @@
-//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  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
+// Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-//  This library is free software; you can redistribute it and/or
-//  modify it under the terms of the GNU Lesser General Public
-//  License as published by the Free Software Foundation; either
-//  version 2.1 of the License.
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License.
 //
-//  This library is distributed in the hope that it will be useful,
-//  but WITHOUT ANY WARRANTY; without even the implied warranty of
-//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-//  Lesser General Public License for more details.
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
 //
-//  You should have received a copy of the GNU Lesser General Public
-//  License along with this library; if not, write to the Free Software
-//  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
 //
-//  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
+
 // GEOM GEOMGUI : GUI for Geometry component
 // File   : BasicGUI.cxx
 // Author : Damien COQUERET, Open CASCADE S.A.S.
@@ -33,10 +34,10 @@
 #include "BasicGUI_CurveDlg.h"        // Method CURVE
 #include "BasicGUI_VectorDlg.h"       // Method VECTOR
 #include "BasicGUI_PlaneDlg.h"        // Method PLANE
-#include "BasicGUI_WorkingPlaneDlg.h" // Method WORKING PLANE
-#include "BasicGUI_MarkerDlg.h"       // Method REPAIR
+#include "BasicGUI_MarkerDlg.h"       // Method LOCAL COORDINATE SYSTEM
 
 #include <GeometryGUI.h>
+#include "GeometryGUI_Operations.h"
 
 #include <SUIT_Session.h>
 #include <SUIT_Desktop.h>
@@ -81,34 +82,31 @@ bool BasicGUI::OnGUIEvent( int theCommandID, SUIT_Desktop* parent )
   QDialog* aDlg = NULL;
 
   switch ( theCommandID ) {
-  case 4011: // POINT
+  case GEOMOp::OpPoint:    // POINT
     aDlg = new BasicGUI_PointDlg( getGeometryGUI(), parent ); 
     break;
-  case 4012:  // LINE
+  case GEOMOp::OpLine:     // LINE
     aDlg = new BasicGUI_LineDlg( getGeometryGUI(), parent );
     break;
-  case 4013:  // CIRCLE
+  case GEOMOp::OpCircle:   // CIRCLE
     aDlg = new BasicGUI_CircleDlg( getGeometryGUI(), parent );
     break;
-  case 4014:  // ELLIPSE
+  case GEOMOp::OpEllipse:  // ELLIPSE
     aDlg = new BasicGUI_EllipseDlg( getGeometryGUI(), parent );
     break;
-  case 4015:  // ARC
+  case GEOMOp::OpArc:      // ARC
     aDlg = new BasicGUI_ArcDlg( getGeometryGUI(), parent );
     break ;
-  case 4016: // VECTOR
+  case GEOMOp::OpVector:   // VECTOR
     aDlg = new BasicGUI_VectorDlg( getGeometryGUI(), parent );
     break;
-  case 4017: // PLANE
+  case GEOMOp::OpPlane:    // PLANE
     aDlg = new BasicGUI_PlaneDlg( getGeometryGUI(), parent );
     break;
-  case 4018: // WORKING PLANE
-    aDlg = new BasicGUI_WorkingPlaneDlg( getGeometryGUI(), parent );
-    break;
-  case 4019: // CURVE
+  case GEOMOp::OpCurve:    // CURVE
     aDlg = new BasicGUI_CurveDlg( getGeometryGUI(), parent );
     break;
-  case 4020: // REPAIR
+  case GEOMOp::OpLCS:      // LOCAL COORDINATE SYSTEM
     aDlg = new BasicGUI_MarkerDlg( getGeometryGUI(), parent );
     break;      
   default: