X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FSMESH_I%2FSMESH_subMesh_i.cxx;h=d4e52582190150718423e78e03f9c95b1d8179e6;hb=65e61d86e9aead90aa58fd23d8ecd5fd968694b8;hp=8c6563ffd1cddda956e8058c88dc48584661d150;hpb=c3bf92bd87b770fd81631a3853f7f5bb1ac6a4e8;p=modules%2Fsmesh.git diff --git a/src/SMESH_I/SMESH_subMesh_i.cxx b/src/SMESH_I/SMESH_subMesh_i.cxx index 8c6563ffd..d4e525821 100644 --- a/src/SMESH_I/SMESH_subMesh_i.cxx +++ b/src/SMESH_I/SMESH_subMesh_i.cxx @@ -17,7 +17,7 @@ // 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.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // // @@ -26,7 +26,6 @@ // Module : SMESH // $Header$ -using namespace std; using namespace std; #include "SMESH_subMesh_i.hxx" #include "SMESH_Gen_i.hxx" @@ -37,6 +36,10 @@ using namespace std; #include "OpUtil.hxx" #include "Utils_ExceptHandlers.hxx" +#include +#include +#include + //============================================================================= /*! * @@ -81,6 +84,75 @@ SMESH_subMesh_i::~SMESH_subMesh_i() // **** } +//======================================================================= +//function : getSubMeshes +//purpose : for a submesh on shape to which elements are not bound directly, +// return submeshes containing elements +//======================================================================= + +typedef list TListOfSubMeshes; + +bool getSubMeshes(::SMESH_subMesh* theSubMesh, + TListOfSubMeshes& theSubMeshList) +{ + int size = theSubMeshList.size(); + + SMESH_Mesh* aMesh = theSubMesh->GetFather(); + SMESHDS_Mesh* aMeshDS = aMesh->GetMeshDS(); + SMESHDS_SubMesh* aSubMeshDS = theSubMesh->GetSubMeshDS(); + + // nodes can be bound to either vertex, edge, face or solid_or_shell + TopoDS_Shape aShape = theSubMesh->GetSubShape(); + switch ( aShape.ShapeType() ) + { + case TopAbs_SOLID: { + // add submesh of solid itself + aSubMeshDS = aMeshDS->MeshElements( aShape ); + if ( aSubMeshDS ) + theSubMeshList.push_back( aSubMeshDS ); + // and of the first shell + TopExp_Explorer exp( aShape, TopAbs_SHELL ); + if ( exp.More() ) { + aSubMeshDS = aMeshDS->MeshElements( exp.Current() ); + if ( aSubMeshDS ) + theSubMeshList.push_back( aSubMeshDS ); + } + break; + } + case TopAbs_WIRE: + case TopAbs_COMPOUND: + case TopAbs_COMPSOLID: { + // call getSubMeshes() for sub-shapes + list shapeList; + shapeList.push_back( aShape ); + list::iterator sh = shapeList.begin(); + for ( ; sh != shapeList.end(); ++sh ) { + for ( TopoDS_Iterator it( *sh ); it.More(); it.Next() ) { + if ( ::SMESH_subMesh* aSubMesh = aMesh->GetSubMeshContaining( it.Value() )) + getSubMeshes( aSubMesh, theSubMeshList ); // add found submesh or explore deeper + else + // no submesh for a compound inside compound + shapeList.push_back( it.Value() ); + } + } + // return only unique submeshes + set smSet; + TListOfSubMeshes::iterator sm = theSubMeshList.begin(); + while ( sm != theSubMeshList.end() ) { + if ( !smSet.insert( *sm ).second ) + sm = theSubMeshList.erase( sm ); + else + ++sm; + } + break; + } + default: + if ( aSubMeshDS ) + theSubMeshList.push_back( aSubMeshDS ); + } + return size < theSubMeshList.size(); +} + //============================================================================= /*! * @@ -95,11 +167,20 @@ CORBA::Long SMESH_subMesh_i::GetNumberOfElements() if ( _mesh_i->_mapSubMesh.find( _localId ) == _mesh_i->_mapSubMesh.end() ) return 0; - SMESHDS_SubMesh* aSubMeshDS = _mesh_i->_mapSubMesh[_localId]->GetSubMeshDS(); - if ( aSubMeshDS == NULL ) - return 0; + ::SMESH_subMesh* aSubMesh = _mesh_i->_mapSubMesh[_localId]; + SMESHDS_SubMesh* aSubMeshDS = aSubMesh->GetSubMeshDS(); - return aSubMeshDS->NbElements(); + int nbElems = aSubMeshDS ? aSubMeshDS->NbElements() : 0; + + // volumes are bound to shell + TListOfSubMeshes smList; + if ( nbElems == 0 && getSubMeshes( aSubMesh, smList )) + { + TListOfSubMeshes::iterator sm = smList.begin(); + for ( ; sm != smList.end(); ++sm ) + nbElems += (*sm)->NbElements(); + } + return nbElems; } //============================================================================= @@ -108,7 +189,7 @@ CORBA::Long SMESH_subMesh_i::GetNumberOfElements() */ //============================================================================= -CORBA::Long SMESH_subMesh_i::GetNumberOfNodes() +CORBA::Long SMESH_subMesh_i::GetNumberOfNodes(CORBA::Boolean all) throw (SALOME::SALOME_Exception) { Unexpect aCatch(SALOME_SalomeException); @@ -116,10 +197,55 @@ CORBA::Long SMESH_subMesh_i::GetNumberOfNodes() if ( _mesh_i->_mapSubMesh.find( _localId ) == _mesh_i->_mapSubMesh.end() ) return 0; - SMESHDS_SubMesh* aSubMeshDS = _mesh_i->_mapSubMesh[_localId]->GetSubMeshDS(); + ::SMESH_subMesh* aSubMesh = _mesh_i->_mapSubMesh[_localId]; + SMESHDS_SubMesh* aSubMeshDS = aSubMesh->GetSubMeshDS(); + + set nodeIds; + + // nodes are bound to shell instead of solid + TListOfSubMeshes smList; + if ( all && getSubMeshes( aSubMesh, smList )) + { + TListOfSubMeshes::iterator sm = smList.begin(); + for ( ; sm != smList.end(); ++sm ) + { + SMDS_ElemIteratorPtr eIt = (*sm)->GetElements(); + if ( eIt->more() ) { + while ( eIt->more() ) { + const SMDS_MeshElement* anElem = eIt->next(); + SMDS_ElemIteratorPtr nIt = anElem->nodesIterator(); + while ( nIt->more() ) + nodeIds.insert( nIt->next()->GetID() ); + } + } else { + SMDS_NodeIteratorPtr nIt = (*sm)->GetNodes(); + while ( nIt->more() ) + nodeIds.insert( nIt->next()->GetID() ); + } + } + return nodeIds.size(); + } + if ( aSubMeshDS == NULL ) return 0; + if ( all ) { // all nodes of submesh elements + SMDS_ElemIteratorPtr eIt = aSubMeshDS->GetElements(); + if ( eIt->more() ) { + while ( eIt->more() ) { + const SMDS_MeshElement* anElem = eIt->next(); + SMDS_ElemIteratorPtr nIt = anElem->nodesIterator(); + while ( nIt->more() ) + nodeIds.insert( nIt->next()->GetID() ); + } + } else { + SMDS_NodeIteratorPtr nIt = aSubMeshDS->GetNodes(); + while ( nIt->more() ) + nodeIds.insert( nIt->next()->GetID() ); + } + return nodeIds.size(); + } + return aSubMeshDS->NbNodes(); } @@ -128,7 +254,7 @@ CORBA::Long SMESH_subMesh_i::GetNumberOfNodes() * */ //============================================================================= - + SMESH::long_array* SMESH_subMesh_i::GetElementsId() throw (SALOME::SALOME_Exception) { @@ -139,15 +265,33 @@ SMESH::long_array* SMESH_subMesh_i::GetElementsId() if ( _mesh_i->_mapSubMesh.find( _localId ) == _mesh_i->_mapSubMesh.end() ) return aResult._retn(); - SMESHDS_SubMesh* aSubMeshDS = _mesh_i->_mapSubMesh[_localId]->GetSubMeshDS(); - if ( aSubMeshDS == NULL ) - return aResult._retn(); + ::SMESH_subMesh* aSubMesh = _mesh_i->_mapSubMesh[_localId]; + SMESHDS_SubMesh* aSubMeshDS = aSubMesh->GetSubMeshDS(); - aResult->length( aSubMeshDS->NbElements() ); - SMDS_ElemIteratorPtr anIt = aSubMeshDS->GetElements(); - for ( int i = 0, n = aSubMeshDS->NbElements(); i < n && anIt->more(); i++ ) - aResult[i] = anIt->next()->GetID(); + int nbElems = aSubMeshDS ? aSubMeshDS->NbElements() : 0; + TListOfSubMeshes smList; + if ( nbElems ) + smList.push_back( aSubMeshDS ); + + // volumes are bound to shell + if ( nbElems == 0 && getSubMeshes( aSubMesh, smList )) + { + TListOfSubMeshes::iterator sm = smList.begin(); + for ( ; sm != smList.end(); ++sm ) + nbElems += (*sm)->NbElements(); + } + aResult->length( nbElems ); + if ( nbElems ) + { + TListOfSubMeshes::iterator sm = smList.begin(); + for ( int i = 0; sm != smList.end(); sm++ ) + { + SMDS_ElemIteratorPtr anIt = (*sm)->GetElements(); + for ( ; i < nbElems && anIt->more(); i++ ) + aResult[i] = anIt->next()->GetID(); + } + } return aResult._retn(); } @@ -168,32 +312,90 @@ SMESH::long_array* SMESH_subMesh_i::GetElementsByType( SMESH::ElementType theEle if ( _mesh_i->_mapSubMesh.find( _localId ) == _mesh_i->_mapSubMesh.end() ) return aResult._retn(); - SMESHDS_SubMesh* aSubMeshDS = _mesh_i->_mapSubMesh[_localId]->GetSubMeshDS(); - if ( aSubMeshDS == NULL ) - return aResult._retn(); + ::SMESH_subMesh* aSubMesh = _mesh_i->_mapSubMesh[_localId]; + SMESHDS_SubMesh* aSubMeshDS = aSubMesh->GetSubMeshDS(); + + // PAL5440, return all nodes belonging to elements of submesh + set nodeIds; + int nbElems = aSubMeshDS ? aSubMeshDS->NbElements() : 0; + + // volumes may be bound to shell instead of solid + TListOfSubMeshes smList; + if ( nbElems == 0 && getSubMeshes( aSubMesh, smList )) + { + TListOfSubMeshes::iterator sm = smList.begin(); + for ( ; sm != smList.end(); ++sm ) + { + if ( theElemType == SMESH::NODE ) + { + SMDS_ElemIteratorPtr eIt = (*sm)->GetElements(); + if ( eIt->more() ) { + while ( eIt->more() ) { + const SMDS_MeshElement* anElem = eIt->next(); + SMDS_ElemIteratorPtr nIt = anElem->nodesIterator(); + while ( nIt->more() ) + nodeIds.insert( nIt->next()->GetID() ); + } + } else { + SMDS_NodeIteratorPtr nIt = (*sm)->GetNodes(); + while ( nIt->more() ) + nodeIds.insert( nIt->next()->GetID() ); + } + } + else + { + nbElems += (*sm)->NbElements(); + } + } + aSubMeshDS = 0; + } + else + { + if ( nbElems ) + smList.push_back( aSubMeshDS ); + } - int i = 0; - if ( theElemType == SMESH::ALL ) - aResult->length( aSubMeshDS->NbElements() + aSubMeshDS->NbNodes() ); - else if ( theElemType == SMESH::NODE ) - aResult->length( aSubMeshDS->NbNodes() ); + if ( theElemType == SMESH::NODE && aSubMeshDS ) + { + SMDS_ElemIteratorPtr eIt = aSubMeshDS->GetElements(); + if ( eIt->more() ) { + while ( eIt->more() ) { + const SMDS_MeshElement* anElem = eIt->next(); + SMDS_ElemIteratorPtr nIt = anElem->nodesIterator(); + while ( nIt->more() ) + nodeIds.insert( nIt->next()->GetID() ); + } + } else { + SMDS_NodeIteratorPtr nIt = aSubMeshDS->GetNodes(); + while ( nIt->more() ) + nodeIds.insert( nIt->next()->GetID() ); + } + } + + if ( theElemType == SMESH::NODE ) + aResult->length( nodeIds.size() ); else - aResult->length( aSubMeshDS->NbElements() ); + aResult->length( nbElems ); - int n = aResult->length(); + int i = 0, n = aResult->length(); - if ( theElemType == SMESH::ALL || theElemType == SMESH::NODE ) { - SMDS_NodeIteratorPtr anIt = aSubMeshDS->GetNodes(); - while ( i < n && anIt->more() ) - aResult[i++] = anIt->next()->GetID(); + if ( theElemType == SMESH::NODE && !nodeIds.empty() ) { + set::iterator idIt = nodeIds.begin(); + for ( ; i < n && idIt != nodeIds.end() ; i++, idIt++ ) + aResult[i] = *idIt; } - if ( theElemType == SMESH::ALL || theElemType != SMESH::NODE ) { - SMDS_ElemIteratorPtr anIt = aSubMeshDS->GetElements(); - while ( i < n && anIt->more() ) { - const SMDS_MeshElement* anElem = anIt->next(); - if ( theElemType == SMESH::ALL || anElem->GetType() == (SMDSAbs_ElementType)theElemType ) - aResult[i++] = anElem->GetID(); + if ( theElemType != SMESH::NODE ) { + TListOfSubMeshes::iterator sm = smList.begin(); + for ( i = 0; sm != smList.end(); sm++ ) + { + aSubMeshDS = *sm; + SMDS_ElemIteratorPtr anIt = aSubMeshDS->GetElements(); + while ( i < n && anIt->more() ) { + const SMDS_MeshElement* anElem = anIt->next(); + if ( theElemType == SMESH::ALL || anElem->GetType() == (SMDSAbs_ElementType)theElemType ) + aResult[i++] = anElem->GetID(); + } } } @@ -213,20 +415,7 @@ SMESH::long_array* SMESH_subMesh_i::GetNodesId() { Unexpect aCatch(SALOME_SalomeException); MESSAGE("SMESH_subMesh_i::GetNodesId"); - SMESH::long_array_var aResult = new SMESH::long_array(); - - if ( _mesh_i->_mapSubMesh.find( _localId ) == _mesh_i->_mapSubMesh.end() ) - return aResult._retn(); - - SMESHDS_SubMesh* aSubMeshDS = _mesh_i->_mapSubMesh[_localId]->GetSubMeshDS(); - if ( aSubMeshDS == NULL ) - return aResult._retn(); - - aResult->length( aSubMeshDS->NbNodes() ); - SMDS_NodeIteratorPtr anIt = aSubMeshDS->GetNodes(); - for ( int i = 0, n = aSubMeshDS->NbNodes(); i < n && anIt->more(); i++ ) - aResult[i] = anIt->next()->GetID(); - + SMESH::long_array_var aResult = GetElementsByType( SMESH::NODE ); return aResult._retn(); } @@ -256,6 +445,35 @@ CORBA::Long SMESH_subMesh_i::GetId() return _localId; } +//======================================================================= +//function : GetSubShape +//purpose : +//======================================================================= + +GEOM::GEOM_Object_ptr SMESH_subMesh_i::GetSubShape() + throw (SALOME::SALOME_Exception) +{ + Unexpect aCatch(SALOME_SalomeException); + GEOM::GEOM_Object_var aShapeObj; + try { + if ( _mesh_i->_mapSubMesh.find( _localId ) != _mesh_i->_mapSubMesh.end()) { + TopoDS_Shape S = _mesh_i->_mapSubMesh[ _localId ]->GetSubShape(); + if ( !S.IsNull() ) { + aShapeObj = _gen_i->ShapeToGeomObject( S ); + //mzn: N7PAL16232, N7PAL16233 + //In some cases it's possible that GEOM_Client contains the shape same to S, but + //with another orientation. + if (aShapeObj->_is_nil()) + aShapeObj = _gen_i->ShapeToGeomObject( S.Reversed() ); + } + } + } + catch(SALOME_Exception & S_ex) { + THROW_SALOME_CORBA_EXCEPTION(S_ex.what(), SALOME::BAD_PARAM); + } + return aShapeObj._retn(); +} + //============================================================================= /*! * @@ -274,4 +492,28 @@ SALOME_MED::FAMILY_ptr SMESH_subMesh_i::GetFamily() if ( families[i]->getIdentifier() == ( _localId ) ) return families[i]; } + + return SALOME_MED::FAMILY::_nil(); +} + +//============================================================================= +/*! + * + */ +//============================================================================= +SMESH::long_array* SMESH_subMesh_i::GetIDs() +{ + SMESH::long_array_var aResult = GetElementsId(); + return aResult._retn(); +} + +//============================================================================= +/*! + * + */ +//============================================================================= +SMESH::ElementType SMESH_subMesh_i::GetElementType( const CORBA::Long id, const bool iselem ) + throw (SALOME::SALOME_Exception) +{ + return GetFather()->GetElementType( id, iselem ); }