ForkMaster/smesh
1
0
Fork 0
mirror of https://git.salome-platform.org/gitpub/modules/smesh.git synced 2024-12-26 17:30:35 +05:00
Code Issues Packages Projects Releases Wiki Activity

0020976: EDF 1471 SMESH: New ergonomy to display quality controls

Browse Source 
+  virtual SMESH::long_array* GetNbElementsByType();
This commit is contained in:
eap 2013-07-03 16:04:07 +00:00
parent 38e26e89c3
commit 95a58b5ecf
4 changed files with 92 additions and 57 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

@ -677,9 +677,9 @@ void SMESH_GroupBase_i::SetColorNumber(CORBA::Long color)
}
//=============================================================================
/*!
* Returns statistic of mesh elements
* Result array of number enityties
/*
* Returns number of mesh elements of each \a SMESH::EntityType
* Result array of number of elements per \a SMESH::EntityType
* Inherited from SMESH_IDSource
*/
//=============================================================================
@ -706,6 +706,27 @@ SMESH::long_array* SMESH_GroupBase_i::GetMeshInfo()
return aRes._retn();
}
//=============================================================================
/*
* Returns number of mesh elements of each \a ElementType
*/
//=============================================================================
SMESH::long_array* SMESH_GroupBase_i::GetNbElementsByType()
{
SMESH::long_array_var aRes = new SMESH::long_array();
aRes->length(SMESH::NB_ELEMENT_TYPES);
for (int i = 0; i < SMESH::NB_ELEMENT_TYPES; i++)
aRes[ i ] = 0;
if ( myPreMeshInfo )
aRes[ GetType() ] = myPreMeshInfo->NbElements( SMDSAbs_ElementType( GetType() ));
else
aRes[ GetType() ] = Size();
return aRes._retn();
}
//=======================================================================
//function : GetIDs
//purpose : Returns ids of members

14
src/SMESH_I/SMESH_Group_i.hxx
View File

@ -72,15 +72,19 @@ class SMESH_I_EXPORT SMESH_GroupBase_i:
virtual SMESH::SMESH_Mesh_ptr GetMesh();
/*!
* Returns statistic of mesh elements
* Result array of number enityties
* Returns number of mesh elements of each \a EntityType
* Result array of number of elements per \a EntityType
* Inherited from SMESH_IDSource
*/
virtual SMESH::long_array* GetMeshInfo();
// Inherited from SMESH_IDSource interface
/*!
* Returns number of mesh elements of each \a ElementType
*/
virtual SMESH::long_array* GetNbElementsByType();
/*!
* Returns a sequence of all element IDs
*/
virtual SMESH::long_array* GetIDs();
/*!
* Returns types of elements it contains
* Inherited from SMESH_IDSource interface

100
src/SMESH_I/SMESH_subMesh_i.cxx
View File

@ -207,53 +207,29 @@ CORBA::Long SMESH_subMesh_i::GetNumberOfNodes(CORBA::Boolean all)
::SMESH_subMesh* aSubMesh = _mesh_i->_mapSubMesh[_localId];
SMESHDS_SubMesh* aSubMeshDS = aSubMesh->GetSubMeshDS();
set<int> nodeIds;
// nodes are bound to shell instead of solid
TListOfSubMeshes smList;
if ( all && getSubMeshes( aSubMesh, smList ))
if ( aSubMeshDS && aSubMeshDS->IsComplexSubmesh() )
{
TListOfSubMeshes::iterator sm = smList.begin();
for ( ; sm != smList.end(); ++sm )
// sub-mesh on a geom group, always return all nodes
return aSubMeshDS->NbNodes();
}
if ( aSubMeshDS && !all )
{
// return anything we have
return aSubMeshDS->NbNodes();
}
if ( all ) // get nodes from aSubMesh and all child sub-meshes
{
int nbNodes = 0;
SMESH_subMeshIteratorPtr smIt = aSubMesh->getDependsOnIterator( /*includeSelf=*/true );
while ( smIt->more() )
{
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() );
}
aSubMesh = smIt->next();
if (( aSubMeshDS = aSubMesh->GetSubMeshDS() ))
nbNodes += aSubMeshDS->NbNodes();
}
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();
return aSubMeshDS ? aSubMeshDS->NbNodes() : 0;
}
//=============================================================================
@ -508,14 +484,13 @@ SMESH::ElementType SMESH_subMesh_i::GetElementType( const CORBA::Long id, const
return GetFather()->GetElementType( id, iselem );
}
//=============================================================================
/*!
* Returns statistic of mesh elements
* Result array of number enityties
* Inherited from SMESH_IDSource
/*
* Returns number of mesh elements of each \a EntityType
* @return array of number of elements per \a EntityType
*/
//=============================================================================
SMESH::long_array* SMESH_subMesh_i::GetMeshInfo()
{
if ( _preMeshInfo )
@ -540,6 +515,37 @@ SMESH::long_array* SMESH_subMesh_i::GetMeshInfo()
return aRes._retn();
}
//=======================================================================
/*
* Returns number of mesh elements of each \a ElementType
*/
//=======================================================================
SMESH::long_array* SMESH_subMesh_i::GetNbElementsByType()
{
SMESH::long_array_var aRes = new SMESH::long_array();
aRes->length(SMESH::NB_ELEMENT_TYPES);
for (int i = 0; i < SMESH::NB_ELEMENT_TYPES; i++)
if ( _preMeshInfo )
aRes[ i ] = _preMeshInfo->NbElements( SMDSAbs_ElementType( i ));
else
aRes[ i ] = 0;
if ( !_preMeshInfo )
{
aRes[ SMESH::NODE ] = GetNumberOfNodes(true);
::SMESH_subMesh* aSubMesh = _mesh_i->_mapSubMesh[_localId];
if ( SMESHDS_SubMesh* smDS = aSubMesh->GetSubMeshDS() )
{
SMDS_ElemIteratorPtr eIt = smDS->GetElements();
if ( eIt->more() )
aRes[ eIt->next()->GetType() ] = smDS->NbElements();
}
}
return aRes._retn();
}
//=======================================================================
//function : GetTypes

8
src/SMESH_I/SMESH_subMesh_i.hxx
View File

@ -88,11 +88,15 @@ public:
*/
virtual SMESH::long_array* GetIDs();
/*!
* Returns statistic of mesh elements
* Result array of number enityties
* Returns number of mesh elements of each \a EntityType
* Result array of number of elements per \a EntityType
* Inherited from SMESH_IDSource
*/
virtual SMESH::long_array* GetMeshInfo();
/*!
* Returns number of mesh elements of each \a ElementType
*/
virtual SMESH::long_array* GetNbElementsByType();
/*!
* Returns types of elements it contains
*/