Merge from V6_main (04/10/2012)

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

diff --git a/src/GroupGUI/GroupGUI.cxx b/src/GroupGUI/GroupGUI.cxx
index 990263407f6a530f2765c500c1490758a81923a0..d8f92294fd42526026ca063dd8a62a5b0d0049a2 100644 (file)
--- a/src/GroupGUI/GroupGUI.cxx
+++ b/src/GroupGUI/GroupGUI.cxx
@@ -18,14 +18,14 @@
 // 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"
@@ -44,8 +44,8 @@
 // function : GroupGUI()
 // purpose  : Constructor
 //=======================================================================
-GroupGUI::GroupGUI( GeometryGUI* parent )
-  : GEOMGUI( parent )
+GroupGUI::GroupGUI (GeometryGUI* parent)
+  : GEOMGUI(parent)
 {
 }
 
@@ -62,60 +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 ) {
+  switch (theCommandID) {
   case GEOMOp::OpGroupCreate: 
   case GEOMOp::OpGroupCreatePopup: // CREATE GROUP
-    aDlg = new GroupGUI_GroupDlg( GroupGUI_GroupDlg::CreateGroup, getGeometryGUI(), parent ); 
+    aDlg = new GroupGUI_GroupDlg (GroupGUI_GroupDlg::CreateGroup, getGeometryGUI(), parent); 
     break;
-  case GEOMOp::OpGroupEdit:  // 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 ) {
+      if (aList.Extent() == 1) {
         GEOM::GEOM_Object_var anObj =
-          GEOMBase::ConvertIOinGEOMObject( aList.First() );
+          GEOMBase::ConvertIOinGEOMObject(aList.First());
 
-        if ( !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();
   }