ForkMaster/smesh
1
0
Fork 0
mirror of https://git.salome-platform.org/gitpub/modules/smesh.git synced 2024-12-27 09:50:34 +05:00
Code Issues Packages Projects Releases Wiki Activity

In AddFrom() preview a case of filter

Browse Source
This commit is contained in:
eap 2010-10-14 12:32:57 +00:00
parent 36af430a9d
commit aaea280a53
1 changed files with 15 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
src/SMESH_I/SMESH_Group_i.cxx
View File

@ -36,6 +36,8 @@
#include "SMESH_Filter_i.hxx" #include "SMESH_Filter_i.hxx"
#include "SMESH_PythonDump.hxx" #include "SMESH_PythonDump.hxx"
#include CORBA_SERVER_HEADER(SMESH_Filter)
#include "utilities.h" #include "utilities.h"
using namespace SMESH; using namespace SMESH;
@ -353,19 +355,20 @@ CORBA::Long SMESH_Group_i::AddFrom( SMESH::SMESH_IDSource_ptr theSource )
SMESHDS_Group* aGroupDS = dynamic_cast<SMESHDS_Group*>( GetGroupDS() ); SMESHDS_Group* aGroupDS = dynamic_cast<SMESHDS_Group*>( GetGroupDS() );
if (aGroupDS) { if (aGroupDS) {
SMESH::long_array_var anIds; SMESH::long_array_var anIds;
if ( !CORBA::is_nil(SMESH::SMESH_GroupBase::_narrow(theSource)) && SMESH::SMESH_GroupBase_var group = SMESH::SMESH_GroupBase::_narrow(theSource);
SMESH::SMESH_GroupBase::_narrow(theSource)->GetType() == GetType() ) { SMESH::SMESH_Mesh_var mesh = SMESH::SMESH_Mesh::_narrow(theSource);
SMESH::SMESH_subMesh_var submesh = SMESH::SMESH_subMesh::_narrow(theSource);
SMESH::Filter_var filter = SMESH::Filter::_narrow(theSource);
if ( !group->_is_nil())
anIds = group->GetType()==GetType() ? theSource->GetIDs() : new SMESH::long_array();
else if ( !mesh->_is_nil() )
anIds = mesh->GetElementsByType( GetType() );
else if ( !submesh->_is_nil())
anIds = submesh->GetElementsByType( GetType() );
else if ( !filter->_is_nil() )
anIds = filter->GetElementType()==GetType() ? theSource->GetIDs() : new SMESH::long_array();
else
anIds = theSource->GetIDs(); anIds = theSource->GetIDs();
}
else if ( !CORBA::is_nil(SMESH::SMESH_Mesh::_narrow(theSource)) ) {
anIds = SMESH::SMESH_Mesh::_narrow(theSource)->GetElementsByType( GetType() );
}
else if ( !CORBA::is_nil(SMESH::SMESH_subMesh::_narrow(theSource)) ) {
anIds = SMESH::SMESH_subMesh::_narrow(theSource)->GetElementsByType( GetType() );
}
else {
anIds->length( 0 );
}
for ( int i = 0, total = anIds->length(); i < total; i++ ) { for ( int i = 0, total = anIds->length(); i < total; i++ ) {
if ( aGroupDS->Add((int)anIds[i]) ) nbAdd++; if ( aGroupDS->Add((int)anIds[i]) ) nbAdd++;
} }