-// 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 : BuildGUI_CompoundDlg.cxx
// Author : Lucien PIGNOLONI, Open CASCADE S.A.S.
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();
}
//=================================================================================
void BuildGUI_CompoundDlg::ClickOnOk()
{
+ setIsApplyAndClose( true );
if ( ClickOnApply() )
ClickOnCancel();
}
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 );
+ }
}
GEOMBase_Skeleton::ActivateThisDialog();
globalSelection( GEOM_ALLSHAPES );
connect( ( (SalomeApp_Application*)( SUIT_Session::session()->activeApplication() ) )->selectionMgr(),
- SIGNAL( currentSelectionChanged() ), this, SLOT( SelectionIntoArgument() ) );
+ SIGNAL( currentSelectionChanged() ), this, SLOT( SelectionIntoArgument() ) );
}
//=================================================================================
bool BuildGUI_CompoundDlg::isValid( QString& )
{
- return myOkShapes;
+ return !myShapes.isEmpty();
}
//=================================================================================
//=================================================================================
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() );
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() );
}
}
