X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FBuildGUI%2FBuildGUI_CompoundDlg.cxx;h=62427ac2355f31c9709e40b043284293029b04cf;hb=f43bdeb895071d4bbaabb94d401da24f5973ba6e;hp=66ec085ebf631c6e8489a96137d6d6ee3063d259;hpb=392885c1a8d50369708bbe5e6b44033ed8b8ba51;p=modules%2Fgeom.git

diff --git a/src/BuildGUI/BuildGUI_CompoundDlg.cxx b/src/BuildGUI/BuildGUI_CompoundDlg.cxx
index 66ec085eb..62427ac23 100644
--- a/src/BuildGUI/BuildGUI_CompoundDlg.cxx
+++ b/src/BuildGUI/BuildGUI_CompoundDlg.cxx
@@ -1,24 +1,25 @@
-//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2011  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   : BuildGUI_CompoundDlg.cxx
 // Author : Lucien PIGNOLONI, Open CASCADE S.A.S.
@@ -98,20 +99,22 @@ void BuildGUI_CompoundDlg::Init()
   myEditCurrentArgument = GroupShapes->LineEdit1;
   GroupShapes->LineEdit1->setReadOnly( true );
   
-  myOkShapes = false;
+  myShapes.clear();
 
   mainFrame()->GroupBoxPublish->show();
+  mainFrame()->CheckBoxPreview->hide();
 
   /* signals and slots connections */
   connect( buttonOk(),    SIGNAL( clicked() ), this, SLOT( ClickOnOk() ) );
   connect( buttonApply(), SIGNAL( clicked() ), this, SLOT( ClickOnApply() ) );
   connect( GroupShapes->PushButton1, SIGNAL( clicked() ), this, SLOT( SetEditCurrentArgument() ) );
   connect( ( (SalomeApp_Application*)(SUIT_Session::session()->activeApplication() ) )->selectionMgr(), 
-	   SIGNAL(currentSelectionChanged() ), this, SLOT( SelectionIntoArgument() ) );
+           SIGNAL(currentSelectionChanged() ), this, SLOT( SelectionIntoArgument() ) );
 
   globalSelection( GEOM_ALLSHAPES );
 
   initName( tr( "GEOM_COMPOUND" ) );
+  SelectionIntoArgument();
 }
 
 
@@ -121,6 +124,7 @@ void BuildGUI_CompoundDlg::Init()
 //=================================================================================
 void BuildGUI_CompoundDlg::ClickOnOk()
 {
+  setIsApplyAndClose( true );
   if ( ClickOnApply() )
     ClickOnCancel();
 }
@@ -147,22 +151,13 @@ bool BuildGUI_CompoundDlg::ClickOnApply()
 void BuildGUI_CompoundDlg::SelectionIntoArgument()
 {
   myEditCurrentArgument->setText( "" );
-  QString aString = ""; /* name of selection */
 
-  LightApp_SelectionMgr* aSelMgr = myGeomGUI->getApp()->selectionMgr();
-  SALOME_ListIO aSelList;
-  aSelMgr->selectedObjects(aSelList);
+  myShapes = getSelected( TopAbs_SHAPE, -1 );
 
-  myOkShapes = false;
-  int nbSel = GEOMBase::GetNameOfSelectedIObjects(aSelList, aString, true);
-  if ( nbSel == 0 ) 
-    return;
-  if ( nbSel != 1 )
-    aString = QString( "%1_objects").arg( nbSel );
-  
-  GEOMBase::ConvertListOfIOInListOfGO(aSelList, myShapes, true);
-  myEditCurrentArgument->setText( aString );
-  myOkShapes = true;
+  if ( !myShapes.isEmpty() ) {
+    QString aName = myShapes.count() > 1 ? QString( "%1_objects").arg( myShapes.count() ) : GEOMBase::GetName( myShapes[0].get() );
+    myEditCurrentArgument->setText( aName );
+  }
 }
 
 
@@ -192,7 +187,7 @@ void BuildGUI_CompoundDlg::ActivateThisDialog()
   GEOMBase_Skeleton::ActivateThisDialog();
   globalSelection( GEOM_ALLSHAPES );
   connect( ( (SalomeApp_Application*)( SUIT_Session::session()->activeApplication() ) )->selectionMgr(),
-	   SIGNAL( currentSelectionChanged() ), this, SLOT( SelectionIntoArgument() ) );
+           SIGNAL( currentSelectionChanged() ), this, SLOT( SelectionIntoArgument() ) );
 }
 
 
@@ -221,7 +216,7 @@ GEOM::GEOM_IOperations_ptr BuildGUI_CompoundDlg::createOperation()
 //=================================================================================
 bool BuildGUI_CompoundDlg::isValid( QString& )
 {
-  return myOkShapes;
+  return !myShapes.isEmpty();
 }
 
 //=================================================================================
@@ -230,9 +225,14 @@ bool BuildGUI_CompoundDlg::isValid( QString& )
 //=================================================================================
 bool BuildGUI_CompoundDlg::execute( ObjectList& objects )
 {
-  GEOM::GEOM_Object_var anObj;
+  GEOM::GEOM_IShapesOperations_var anOper = GEOM::GEOM_IShapesOperations::_narrow( getOperation() );
+
+  GEOM::ListOfGO_var objlist = new GEOM::ListOfGO();
+  objlist->length( myShapes.count() );
+  for ( int i = 0; i < myShapes.count(); i++ )
+    objlist[i] = myShapes[i].copy();
 
-  anObj = GEOM::GEOM_IShapesOperations::_narrow( getOperation() )->MakeCompound( myShapes );
+  GEOM::GEOM_Object_var anObj = anOper->MakeCompound( objlist );
 
   if ( !anObj->_is_nil() )
     objects.push_back( anObj._retn() );
@@ -250,7 +250,8 @@ void BuildGUI_CompoundDlg::restoreSubShapes( SALOMEDS::Study_ptr   theStudy,
   if ( mainFrame()->CheckBoxRestoreSS->isChecked() ) {
     // empty list of arguments means that all arguments should be restored
     getGeomEngine()->RestoreSubShapesSO( theStudy, theSObject, GEOM::ListOfGO(),
-					 /*theFindMethod=*/GEOM::FSM_GetSame, // ? GEOM::FSM_GetInPlace
-					 /*theInheritFirstArg=*/false );
+                                         /*theFindMethod=*/GEOM::FSM_GetInPlace, // ? GEOM::FSM_GetSame
+                                         /*theInheritFirstArg=*/false,
+                                         mainFrame()->CheckBoxAddPrefix->isChecked() );
   }
 }