-// Copyright (C) 2007-2010 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_SolidDlg.cxx
// Author : Damien COQUERET, Open CASCADE S.A.S.
-//
+
#include "BuildGUI_SolidDlg.h"
#include <DlgRef.h>
#include <SalomeApp_Application.h>
#include <LightApp_SelectionMgr.h>
+#include <TColStd_MapOfInteger.hxx>
+
//=================================================================================
// class : BuildGUI_SolidDlg()
-// purpose : Constructs a BuildGUI_SolidDlg which is a child of 'parent', with the
+// purpose : Constructs a BuildGUI_SolidDlg which is a child of 'parent', with the
// name 'name' and widget flags set to 'f'.
// The dialog will by default be modeless, unless you set 'modal' to
// TRUE to construct a modal dialog.
QPixmap image1( SUIT_Session::session()->resourceMgr()->loadPixmap( "GEOM", tr( "ICON_SELECT" ) ) );
setWindowTitle( tr( "GEOM_SOLID_TITLE" ) );
-
+
/***************************************************************/
mainFrame()->GroupConstructors->setTitle( tr( "GEOM_SOLID" ) );
mainFrame()->RadioButton1->setIcon( image0 );
GroupSolid->CheckButton1->setText( tr( "GEOM_CREATE_SINGLE_SOLID" ) );
GroupSolid->PushButton1->setIcon( image1 );
GroupSolid->LineEdit1->setReadOnly( true );
-
+
QVBoxLayout* layout = new QVBoxLayout( centralWidget() );
layout->setMargin( 0 ); layout->setSpacing( 6 );
layout->addWidget( GroupSolid );
GroupSolid->LineEdit1->setReadOnly( true );
GroupSolid->CheckButton1->setChecked( true );
- myOkShells = false;
+ myShells.clear();
- globalSelection( GEOM_SHELL );
+ //globalSelection( GEOM_SHELL );
+ TColStd_MapOfInteger aMap;
+ aMap.Add( GEOM_SHELL );
+ aMap.Add( GEOM_COMPOUNDFILTER );
+ QList<int> aSubShapes;
+ aSubShapes.append( GEOM_SHELL );
+ globalSelection( aMap, aSubShapes );
/* signals and slots connections */
connect( buttonOk(), SIGNAL( clicked() ), this, SLOT( ClickOnOk() ) );
SIGNAL( currentSelectionChanged() ), this, SLOT( SelectionIntoArgument() ) );
initName( tr( "GEOM_SOLID" ) );
+ SelectionIntoArgument();
}
//=================================================================================
void BuildGUI_SolidDlg::ClickOnOk()
{
+ setIsApplyAndClose( true );
if ( ClickOnApply() )
ClickOnCancel();
}
//=================================================================================
bool BuildGUI_SolidDlg::ClickOnApply()
{
- for ( int i = 0, n = myShells.length(); i< n; i++ ) {
- if ( !isClosed(i)) {
- QString aName = GEOMBase::GetName( myShells[i] );
- SUIT_MessageBox::warning( (QWidget*)SUIT_Session::session()->activeApplication()->desktop(),
- QObject::tr("WRN_WARNING"),
- QObject::tr("WRN_SHAPE_UNCLOSED").arg(aName) ,
- QObject::tr("BUT_OK") );
- return false;
- }
- }
-
if ( !onAccept() )
return false;
void BuildGUI_SolidDlg::SelectionIntoArgument()
{
myEditCurrentArgument->setText( "" );
- QString aString = "";
-
- LightApp_SelectionMgr* aSelMgr = myGeomGUI->getApp()->selectionMgr();
- SALOME_ListIO aSelList;
- aSelMgr->selectedObjects(aSelList);
-
- myOkShells = false;
- int nbSel = GEOMBase::GetNameOfSelectedIObjects(aSelList, aString);
- if ( nbSel == 0 )
- return;
- if ( nbSel != 1 )
- aString = tr( "%1_objects" ).arg( nbSel );
-
- GEOMBase::ConvertListOfIOInListOfGO(aSelList, myShells);
- if ( !myShells.length() )
- return;
-
- myEditCurrentArgument->setText( aString );
- myOkShells = true;
+
+ //myShells = getSelected( TopAbs_SHELL, -1 );
+ QList<TopAbs_ShapeEnum> types;
+ types << TopAbs_SHELL << TopAbs_COMPOUND;
+ myShells = getSelected( types, -1 );
+
+ if ( !myShells.isEmpty() ) {
+ QString aName = myShells.count() > 1 ? QString( "%1_objects").arg( myShells.count() ) : GEOMBase::GetName( myShells[0].get() );
+ myEditCurrentArgument->setText( aName );
+ }
}
//=================================================================================
QPushButton* send = (QPushButton*)sender();
if ( send != GroupSolid->PushButton1 )
return;
-
- globalSelection( GEOM_SHELL );
+
+ //globalSelection( GEOM_SHELL );
+ TColStd_MapOfInteger aMap;
+ aMap.Add( GEOM_SHELL );
+ aMap.Add( GEOM_COMPOUNDFILTER );
+ QList<int> aSubShapes;
+ aSubShapes.append( GEOM_SHELL );
+ globalSelection( aMap, aSubShapes );
+
myEditCurrentArgument = GroupSolid->LineEdit1;
myEditCurrentArgument->setFocus();
GEOMBase_Skeleton::ActivateThisDialog();
connect( ( (SalomeApp_Application*)( SUIT_Session::session()->activeApplication() ) )->selectionMgr(),
SIGNAL( currentSelectionChanged() ), this, SLOT( SelectionIntoArgument() ) );
- globalSelection( GEOM_SHELL );
+
+ //globalSelection( GEOM_SHELL );
+ TColStd_MapOfInteger aMap;
+ aMap.Add( GEOM_SHELL );
+ aMap.Add( GEOM_COMPOUNDFILTER );
+ QList<int> aSubShapes;
+ aSubShapes.append( GEOM_SHELL );
+ globalSelection( aMap, aSubShapes );
}
//=================================================================================
void BuildGUI_SolidDlg::EnableNameField( bool toEnable )
{
- mainFrame()->GroupBoxName->setEnabled( toEnable );
+ mainFrame()->GroupBoxName->setEnabled( toEnable );
}
//=================================================================================
// function : isValid
// purpose :
//=================================================================================
-bool BuildGUI_SolidDlg::isValid( QString& )
+bool BuildGUI_SolidDlg::isValid (QString& msg)
{
- return myOkShells;
+ bool ok = !myShells.isEmpty();
+
+ GEOM::MeasureOpPtr anOp;
+ anOp.take(myGeomGUI->GetGeomGen()->GetIMeasureOperations(getStudyId()));
+
+ for ( int i = 0, n = myShells.count(); i < n && ok; i++ ) {
+ CORBA::String_var aRes = anOp->IsGoodForSolid(myShells[i].get());
+ if (strlen(aRes.in())) {
+ msg = QObject::tr(aRes.in()).arg(GEOMBase::GetName(myShells[i].get()));
+ ok = false;
+ }
+ }
+ return ok;
}
+/*
//=================================================================================
// function : isClosed
// purpose : Check the object 'i' in myShells list is closed or unclosed
//=================================================================================
-bool BuildGUI_SolidDlg::isClosed(int i)
+bool BuildGUI_SolidDlg::isClosed( GEOM::GEOM_Object_ptr shell )
{
- GEOM::GEOM_Object_var aShape = myShells[i];
+ bool ok = false;
+
GEOM::GEOM_IKindOfShape::shape_kind aKind;
GEOM::ListOfLong_var anInts;
GEOM::ListOfDouble_var aDbls;
- if (aShape->_is_nil()) {
- MESSAGE ("Shape is NULL!!!");
- return false;
- }
-
- GEOM::GEOM_IMeasureOperations_var anOp = myGeomGUI->GetGeomGen()->GetIMeasureOperations( getStudyId() );
+ if ( !CORBA::is_nil( shell ) ) {
+ GEOM::MeasureOpPtr anOp;
+ anOp.take( myGeomGUI->GetGeomGen()->GetIMeasureOperations( getStudyId() ) );
- // Detect kind of shape and parameters
- aKind = anOp->KindOfShape(aShape, anInts, aDbls);
+ // Detect kind of shape and parameters
+ aKind = anOp->KindOfShape(shell, anInts, aDbls);
- if ( !anOp->IsDone() ) {
- MESSAGE ("KindOfShape Operation is NOT DONE!!!");
- return false;
+ if ( anOp->IsDone() ) {
+ if ( anInts[0] == 1 )
+ ok = true;
+ else if ( anInts[0] == 2 )
+ ok = false;
+ }
+ else {
+ MESSAGE ("KindOfShape Operation is NOT DONE!!!");
+ }
}
-
- if ( anInts[0] == 1 )
- return true;
- else if ( anInts[0] == 2 )
- return false;
-
- return false;
+ else {
+ MESSAGE ("Shape is NULL!!!");
+ }
+
+ return ok;
}
+*/
//=================================================================================
// function : execute
//=================================================================================
bool BuildGUI_SolidDlg::execute( ObjectList& objects )
{
- bool toCreateSingleSolid = GroupSolid->CheckButton1->isChecked();
-
GEOM::GEOM_IShapesOperations_var anOper = GEOM::GEOM_IShapesOperations::_narrow( getOperation() );
-
- if ( toCreateSingleSolid ) {
- GEOM::GEOM_Object_var anObj = anOper->MakeSolidShells( myShells );
+
+ if ( GroupSolid->CheckButton1->isChecked() ) {
+ GEOM::ListOfGO_var objlist = new GEOM::ListOfGO();
+ objlist->length( myShells.count() );
+ for ( int i = 0; i < myShells.count(); i++ )
+ objlist[i] = myShells[i].copy();
+
+ GEOM::GEOM_Object_var anObj = anOper->MakeSolidShells( objlist.in() );
if ( !anObj->_is_nil() )
objects.push_back( anObj._retn() );
}
else {
- for ( int i = 0, n = myShells.length(); i< n; i++ ) {
- GEOM::GEOM_Object_var anObj = anOper->MakeSolidShell( myShells[ i ] );
+ for ( int i = 0, n = myShells.count(); i< n; i++ ) {
+ GEOM::GEOM_Object_var anObj = anOper->MakeSolidShell( myShells[ i ].get() );
if ( !anObj->_is_nil() )
objects.push_back( anObj._retn() );
return true;
}
-
