Merge remote branch 'origin/V7_dev' into V8_0_0_BR

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

diff --git a/src/BooleanGUI/BooleanGUI.cxx b/src/BooleanGUI/BooleanGUI.cxx
index ecda41b9a25d8f17754f66a528e409ad27ffc4e2..8166efa8dc0ee5b28091701c05df148137436081 100644 (file)
--- a/src/BooleanGUI/BooleanGUI.cxx
+++ b/src/BooleanGUI/BooleanGUI.cxx
@@ -1,65 +1,45 @@
-//  GEOM GEOMGUI : GUI for Geometry component
+// Copyright (C) 2007-2015  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-//  Copyright (C) 2003  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 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 
-// 
-//  See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org 
+// 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, or (at your option) any later version.
 //
+// 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
+//
+// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
-//  File   : BooleanGUI.cxx
-//  Author : Damien COQUERET
-//  Module : GEOM
-//  $Header$
-
 
+// GEOM GEOMGUI : GUI for Geometry component
+// File   : BooleanGUI.cxx
+// Author : Damien COQUERET, Open CASCADE S.A.S.
+//
 #include "BooleanGUI.h"
-
-#include "SUIT_Desktop.h"
 #include "BooleanGUI_Dialog.h"
 
-#include "GeometryGUI.h"
-
-using namespace std;
-
-BooleanGUI* BooleanGUI::myGUIObject = 0;
-
-//=======================================================================
-// function : GetBooleanGUI()
-// purpose  : Get the only BooleanGUI object [ static ]
-//=======================================================================
-BooleanGUI* BooleanGUI::GetBooleanGUI( GeometryGUI* parent )
-{
-  if ( myGUIObject == 0 ) {
-    // init BooleanGUI only once
-    myGUIObject = new BooleanGUI( parent );
-  }
-  return myGUIObject;
-}
+#include <GeometryGUI.h>
+#include "GeometryGUI_Operations.h"
+#include <SUIT_Desktop.h>
 
 //=======================================================================
 // function : BooleanGUI()
 // purpose  : Constructor
 //=======================================================================
-BooleanGUI::BooleanGUI( GeometryGUI* parent ) : GEOMGUI( parent )
+BooleanGUI::BooleanGUI( GeometryGUI* parent ) 
+  : GEOMGUI( parent )
 {
 }
 
-
 //=======================================================================
 // function : ~BooleanGUI()
 // purpose  : Destructor
@@ -73,25 +53,27 @@ BooleanGUI::~BooleanGUI()
 // function : OnGUIEvent()
 // purpose  : 
 //=======================================================================
-bool BooleanGUI::OnGUIEvent(int theCommandID, SUIT_Desktop* parent)
+bool BooleanGUI::OnGUIEvent( int theCommandID, SUIT_Desktop* parent )
 {
   getGeometryGUI()->EmitSignalDeactivateDialog();
 
-  int anOperation = 0; 
-  if      ( theCommandID == 5011 )
-    anOperation = FUSE;
-  else if ( theCommandID == 5012 )
-    anOperation = COMMON;
-  else if ( theCommandID == 5013 )
-    anOperation = CUT;
-  else if ( theCommandID == 5014 )
-    anOperation = SECTION;
-  else
+  int anOperation = 0;  
+  switch ( theCommandID ) {
+  case GEOMOp::OpFuse:
+    anOperation = FUSE;    break;
+  case GEOMOp::OpCommon:
+    anOperation = COMMON;  break;
+  case GEOMOp::OpCut:
+    anOperation = CUT;     break;
+  case GEOMOp::OpSection:
+    anOperation = SECTION; break;
+  default:
     return false;
-
-  QDialog* aDlg = new BooleanGUI_Dialog( anOperation, getGeometryGUI(), parent, "");
+  }
+  
+  QDialog* aDlg = new BooleanGUI_Dialog( anOperation, getGeometryGUI(), parent );
   aDlg->show();
-   
+
   return true;
 }
 
@@ -100,11 +82,11 @@ bool BooleanGUI::OnGUIEvent(int theCommandID, SUIT_Desktop* parent)
 //=====================================================================================
 extern "C"
 {
-#ifdef WNT
-       __declspec( dllexport )
+#ifdef WIN32
+  __declspec( dllexport )
 #endif
   GEOMGUI* GetLibGUI( GeometryGUI* parent )
   {
-    return BooleanGUI::GetBooleanGUI( parent );
+    return new BooleanGUI( parent );
   }
 }