X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FGroupGUI%2FGroupGUI.cxx;h=d8f92294fd42526026ca063dd8a62a5b0d0049a2;hb=48f5c2df5815348d168fd8e80fcc9e52dd69f137;hp=fd59b68b5995707f82fc90101706b67358898648;hpb=0b6826bc5f36b5420f41af1475e1a79371a25323;p=modules%2Fgeom.git

diff --git a/src/GroupGUI/GroupGUI.cxx b/src/GroupGUI/GroupGUI.cxx
index fd59b68b5..d8f92294f 100644
--- a/src/GroupGUI/GroupGUI.cxx
+++ b/src/GroupGUI/GroupGUI.cxx
@@ -1,32 +1,35 @@
-//  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
-//
-//  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+// 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
+
 // GEOM GEOMGUI : GUI for Geometry component
 // File   : GroupGUI.cxx
 // Author : Sergey ANIKIN, Open CASCADE S.A.S. (sergey.anikin@opencascade.com)
-//
+
 #include "GroupGUI.h"
 #include "GroupGUI_GroupDlg.h" 
+#include "GroupGUI_BooleanDlg.h" 
 
 #include <GeometryGUI.h>
+#include "GeometryGUI_Operations.h"
+
 #include <GEOMBase.h>
 #include <GEOMImpl_Types.hxx>
 
@@ -41,8 +44,8 @@
 // function : GroupGUI()
 // purpose  : Constructor
 //=======================================================================
-GroupGUI::GroupGUI( GeometryGUI* parent )
-  : GEOMGUI( parent )
+GroupGUI::GroupGUI (GeometryGUI* parent)
+  : GEOMGUI(parent)
 {
 }
 
@@ -59,61 +62,67 @@ GroupGUI::~GroupGUI()
 // function : OnGUIEvent()
 // purpose  : 
 //=======================================================================
-bool GroupGUI::OnGUIEvent( int theCommandID, SUIT_Desktop* parent )
+bool GroupGUI::OnGUIEvent (int theCommandID, SUIT_Desktop* parent)
 {
   SalomeApp_Application* app = getGeometryGUI()->getApp();
-  if ( !app ) return false;
+  if (!app) return false;
 
   getGeometryGUI()->EmitSignalDeactivateDialog();
 
   QDialog* aDlg = 0;
 
-  SalomeApp_Study* appStudy = dynamic_cast<SalomeApp_Study*>( app->activeStudy() );
-  if ( !appStudy ) return false;
+  SalomeApp_Study* appStudy = dynamic_cast<SalomeApp_Study*>(app->activeStudy());
+  if (!appStudy) return false;
   _PTR(Study) aStudy = appStudy->studyDS();
 
-  if ( aStudy->GetProperties()->IsLocked() ) {
-    SUIT_MessageBox::warning( parent,
-                              tr( "WRN_WARNING" ), 
-                              tr( "WRN_STUDY_LOCKED" ) );
+  if (aStudy->GetProperties()->IsLocked()) {
+    SUIT_MessageBox::warning(parent, tr("WRN_WARNING"), tr("WRN_STUDY_LOCKED"));
     return false;
   }
 
-  switch ( theCommandID ) {
-  case 800: 
-  case 8001: // CREATE GROUP
-    aDlg = new GroupGUI_GroupDlg( GroupGUI_GroupDlg::CreateGroup, getGeometryGUI(), parent ); 
+  switch (theCommandID) {
+  case GEOMOp::OpGroupCreate: 
+  case GEOMOp::OpGroupCreatePopup: // CREATE GROUP
+    aDlg = new GroupGUI_GroupDlg (GroupGUI_GroupDlg::CreateGroup, getGeometryGUI(), parent); 
     break;
-  case 801:  // EDIT GROUP
+  case GEOMOp::OpGroupEdit: // EDIT GROUP
     {
       SALOME_ListIO aList;
       aList.Clear();
 
       LightApp_SelectionMgr* aSelMgr = app->selectionMgr();
-      if ( aSelMgr )
-        aSelMgr->selectedObjects( aList );
+      if (aSelMgr)
+        aSelMgr->selectedObjects(aList);
 
-      if ( aList.Extent() == 1 ) {
-        Standard_Boolean aResult = Standard_False;
+      if (aList.Extent() == 1) {
         GEOM::GEOM_Object_var anObj =
-          GEOMBase::ConvertIOinGEOMObject( aList.First(), aResult );
+          GEOMBase::ConvertIOinGEOMObject(aList.First());
 
-        if ( aResult && !CORBA::is_nil( anObj ) && anObj->GetType() == GEOM_GROUP ) {
-          aDlg = new GroupGUI_GroupDlg( GroupGUI_GroupDlg::EditGroup, getGeometryGUI(), parent ); 
+        if (!CORBA::is_nil(anObj) && anObj->GetType() == GEOM_GROUP) {
+          aDlg = new GroupGUI_GroupDlg (GroupGUI_GroupDlg::EditGroup, getGeometryGUI(), parent); 
           break;
         }
       }
-      SUIT_MessageBox::warning( parent, tr( "WRN_WARNING" ), tr( "NO_GROUP" ) );
-      break;
+      SUIT_MessageBox::warning(parent, tr("WRN_WARNING"), tr("NO_GROUP"));
     }
+    break;
+  case GEOMOp::OpGroupUnion: // UNION GROUPS
+    aDlg = new GroupGUI_BooleanDlg (GroupGUI_BooleanDlg::UNION, getGeometryGUI(), parent); 
+    break;
+  case GEOMOp::OpGroupIntersect: // INTERSECT GROUPS
+    aDlg = new GroupGUI_BooleanDlg (GroupGUI_BooleanDlg::INTERSECT, getGeometryGUI(), parent); 
+    break;
+  case GEOMOp::OpGroupCut: // CUT GROUPS
+    aDlg = new GroupGUI_BooleanDlg (GroupGUI_BooleanDlg::CUT, getGeometryGUI(), parent); 
+    break;
   default: 
-    app->putInfo( tr( "GEOM_PRP_COMMAND" ).arg( theCommandID ) ); 
+    app->putInfo(tr("GEOM_PRP_COMMAND").arg(theCommandID)); 
     break;
   }
 
-  if ( aDlg ) {
+  if (aDlg) {
     aDlg->updateGeometry();
-    aDlg->resize( aDlg->minimumSizeHint() );
+    aDlg->resize(aDlg->minimumSizeHint());
     aDlg->show();
   }