Salome HOME
projects
/
modules
/
smesh.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
23237: EDF 12367 - SIGSEGV with Remove group
[modules/smesh.git]
/
src
/
SMESH_I
/
SMESH_Group_i.cxx
diff --git
a/src/SMESH_I/SMESH_Group_i.cxx
b/src/SMESH_I/SMESH_Group_i.cxx
index 6218de9f8ba5485d3cd07b398da23c30a280d9bd..8bae7fb5bd72c39c7e5b62894c9a1092124a77d8 100644
(file)
--- a/
src/SMESH_I/SMESH_Group_i.cxx
+++ b/
src/SMESH_I/SMESH_Group_i.cxx
@@
-55,11
+55,11
@@
SMESH_GroupBase_i::SMESH_GroupBase_i( PortableServer::POA_ptr thePOA,
SMESH_Mesh_i* theMeshServant,
const int theLocalID )
: SALOME::GenericObj_i( thePOA ),
SMESH_Mesh_i* theMeshServant,
const int theLocalID )
: SALOME::GenericObj_i( thePOA ),
- myMeshServant( theMeshServant ),
- myLocalID( theLocalID ),
+ myPreMeshInfo(NULL),
myNbNodes(-1),
myGroupDSTic(0),
myNbNodes(-1),
myGroupDSTic(0),
- myPreMeshInfo(NULL)
+ myMeshServant( theMeshServant ),
+ myLocalID( theLocalID )
{
// PAL7962: san -- To ensure correct mapping of servant and correct reference counting in GenericObj_i,
// servant activation is performed by SMESH_Mesh_i::createGroup()
{
// PAL7962: san -- To ensure correct mapping of servant and correct reference counting in GenericObj_i,
// servant activation is performed by SMESH_Mesh_i::createGroup()
@@
-69,8
+69,8
@@
SMESH_GroupBase_i::SMESH_GroupBase_i( PortableServer::POA_ptr thePOA,
SMESH_Group_i::SMESH_Group_i( PortableServer::POA_ptr thePOA,
SMESH_Mesh_i* theMeshServant,
const int theLocalID )
SMESH_Group_i::SMESH_Group_i( PortableServer::POA_ptr thePOA,
SMESH_Mesh_i* theMeshServant,
const int theLocalID )
-
: SALOME::GenericObj_i( thePOA ),
-
SMESH_GroupBase_i( thePOA, theMeshServant, theLocalID )
+ : SALOME::GenericObj_i( thePOA ),
+ SMESH_GroupBase_i( thePOA, theMeshServant, theLocalID )
{
//MESSAGE("SMESH_Group_i; this = "<<this );
}
{
//MESSAGE("SMESH_Group_i; this = "<<this );
}
@@
-78,8
+78,8
@@
SMESH_Group_i::SMESH_Group_i( PortableServer::POA_ptr thePOA,
SMESH_GroupOnGeom_i::SMESH_GroupOnGeom_i( PortableServer::POA_ptr thePOA,
SMESH_Mesh_i* theMeshServant,
const int theLocalID )
SMESH_GroupOnGeom_i::SMESH_GroupOnGeom_i( PortableServer::POA_ptr thePOA,
SMESH_Mesh_i* theMeshServant,
const int theLocalID )
-
: SALOME::GenericObj_i( thePOA ),
-
SMESH_GroupBase_i( thePOA, theMeshServant, theLocalID )
+ : SALOME::GenericObj_i( thePOA ),
+ SMESH_GroupBase_i( thePOA, theMeshServant, theLocalID )
{
//MESSAGE("SMESH_GroupOnGeom_i; this = "<<this );
}
{
//MESSAGE("SMESH_GroupOnGeom_i; this = "<<this );
}
@@
-320,9
+320,9
@@
CORBA::Long SMESH_Group_i::Add( const SMESH::long_array& theIDs )
SMESHDS_Group* aGroupDS = dynamic_cast<SMESHDS_Group*>( GetGroupDS() );
if (aGroupDS) {
int nbAdd = 0;
SMESHDS_Group* aGroupDS = dynamic_cast<SMESHDS_Group*>( GetGroupDS() );
if (aGroupDS) {
int nbAdd = 0;
- for (
int
i = 0; i < theIDs.length(); i++) {
+ for (
CORBA::ULong
i = 0; i < theIDs.length(); i++) {
int anID = (int) theIDs[i];
int anID = (int) theIDs[i];
- if (
aGroupDS->Add(anID
))
+ if (
aGroupDS->Add( anID
))
nbAdd++;
}
if ( nbAdd )
nbAdd++;
}
if ( nbAdd )
@@
-335,7
+335,7
@@
CORBA::Long SMESH_Group_i::Add( const SMESH::long_array& theIDs )
//=============================================================================
/*!
//=============================================================================
/*!
- *
+ *
*/
//=============================================================================
*/
//=============================================================================
@@
-352,9
+352,9
@@
CORBA::Long SMESH_Group_i::Remove( const SMESH::long_array& theIDs )
SMESHDS_Group* aGroupDS = dynamic_cast<SMESHDS_Group*>( GetGroupDS() );
if (aGroupDS) {
int nbDel = 0;
SMESHDS_Group* aGroupDS = dynamic_cast<SMESHDS_Group*>( GetGroupDS() );
if (aGroupDS) {
int nbDel = 0;
- for (
int i = 0; i < theIDs.length(); i++
) {
+ for (
CORBA::ULong i = 0; i < theIDs.length(); i++
) {
int anID = (int) theIDs[i];
int anID = (int) theIDs[i];
- if (
aGroupDS->Remove(anID
))
+ if (
aGroupDS->Remove( anID
))
nbDel++;
}
if ( nbDel )
nbDel++;
}
if ( nbDel )
@@
-367,7
+367,7
@@
CORBA::Long SMESH_Group_i::Remove( const SMESH::long_array& theIDs )
//=============================================================================
/*!
//=============================================================================
/*!
- *
+ *
*/
//=============================================================================
*/
//=============================================================================
@@
-502,8
+502,8
@@
namespace
*/
//================================================================================
*/
//================================================================================
- void getNodesOfElements(SMDS_ElemIteratorPtr elemIt,
- set<const SMDS_MeshNode* >& nodes)
+ void getNodesOfElements(SMDS_ElemIteratorPtr
elemIt,
+ s
td::s
et<const SMDS_MeshNode* >& nodes)
{
while ( elemIt->more() )
{
{
while ( elemIt->more() )
{
@@
-531,7
+531,7
@@
CORBA::Long SMESH_GroupBase_i::GetNumberOfNodes()
{
if ( myNbNodes < 0 || g->GetTic() != myGroupDSTic )
{
{
if ( myNbNodes < 0 || g->GetTic() != myGroupDSTic )
{
- set<const SMDS_MeshNode* > nodes;
+ s
td::s
et<const SMDS_MeshNode* > nodes;
getNodesOfElements( g->GetElements(), nodes );
myNbNodes = nodes.size();
myGroupDSTic = g->GetTic();
getNodesOfElements( g->GetElements(), nodes );
myNbNodes = nodes.size();
myGroupDSTic = g->GetTic();
@@
-574,10
+574,10
@@
SMESH::long_array* SMESH_GroupBase_i::GetNodeIDs()
SMESH::long_array_var aRes = new SMESH::long_array();
if ( SMESHDS_GroupBase* g = GetGroupDS())
{
SMESH::long_array_var aRes = new SMESH::long_array();
if ( SMESHDS_GroupBase* g = GetGroupDS())
{
- set<const SMDS_MeshNode* > nodes;
+ s
td::s
et<const SMDS_MeshNode* > nodes;
getNodesOfElements( g->GetElements(), nodes );
aRes->length( nodes.size() );
getNodesOfElements( g->GetElements(), nodes );
aRes->length( nodes.size() );
- set<const SMDS_MeshNode*>::iterator nIt = nodes.begin(), nEnd = nodes.end();
+ s
td::s
et<const SMDS_MeshNode*>::iterator nIt = nodes.begin(), nEnd = nodes.end();
for ( int i = 0; nIt != nEnd; ++nIt, ++i )
aRes[i] = (*nIt)->GetID();
}
for ( int i = 0; nIt != nEnd; ++nIt, ++i )
aRes[i] = (*nIt)->GetID();
}
@@
-708,7
+708,7
@@
SMESH::long_array* SMESH_GroupBase_i::GetMeshInfo()
if ( SMESHDS_GroupBase* g = GetGroupDS())
{
if ( SMESHDS_GroupBase* g = GetGroupDS())
{
- if ( g->GetType() == SMDSAbs_Node
|| ( myNbNodes > -1 && g->GetTic() == myGroupDSTic)
)
+ if ( g->GetType() == SMDSAbs_Node
/*|| ( myNbNodes > -1 && g->GetTic() == myGroupDSTic)*/
)
aRes[ SMDSEntity_Node ] = GetNumberOfNodes();
if ( g->GetType() != SMDSAbs_Node )
aRes[ SMDSEntity_Node ] = GetNumberOfNodes();
if ( g->GetType() != SMDSAbs_Node )
@@
-913,12
+913,12
@@
SMESH::long_array* SMESH_GroupOnFilter_i::GetMeshInfo()
if ( SMESHDS_GroupBase* g = GetGroupDS())
{
if ( SMESHDS_GroupBase* g = GetGroupDS())
{
- if ( g->GetType() == SMDSAbs_Node
|| ( myNbNodes > -1 && g->GetTic() == myGroupDSTic)
)
+ if ( g->GetType() == SMDSAbs_Node
/*|| ( myNbNodes > -1 && g->GetTic() == myGroupDSTic)*/
)
aRes[ SMDSEntity_Node ] = GetNumberOfNodes();
if ( g->GetType() != SMDSAbs_Node )
{
aRes[ SMDSEntity_Node ] = GetNumberOfNodes();
if ( g->GetType() != SMDSAbs_Node )
{
- vector< int > nbElems = static_cast< SMESHDS_GroupOnFilter* >( g )->GetMeshInfo();
+
std::
vector< int > nbElems = static_cast< SMESHDS_GroupOnFilter* >( g )->GetMeshInfo();
for ( size_t i = SMESH::Entity_Node; i < SMESH::Entity_Last; i++)
if ( i < nbElems.size() )
aRes[i] = nbElems[ i ];
for ( size_t i = SMESH::Entity_Node; i < SMESH::Entity_Last; i++)
if ( i < nbElems.size() )
aRes[i] = nbElems[ i ];
@@
-947,7
+947,8
@@
std::string SMESH_GroupOnFilter_i::FilterToString() const
{
SMESH::Filter::Criterion& crit = criteria[ i ];
{
SMESH::Filter::Criterion& crit = criteria[ i ];
- if ( SMESH::FunctorType( crit.Type ) == SMESH::FT_BelongToMeshGroup )
+ if ( SMESH::FunctorType( crit.Type ) == SMESH::FT_BelongToMeshGroup &&
+ crit.ThresholdID.in() && crit.ThresholdID.in()[0] )
{
CORBA::Object_var obj = SMESH_Gen_i::GetORB()->string_to_object( crit.ThresholdID );
if ( SMESH_GroupBase_i * g = SMESH::DownCast< SMESH_GroupBase_i*>( obj ))
{
CORBA::Object_var obj = SMESH_Gen_i::GetORB()->string_to_object( crit.ThresholdID );
if ( SMESH_GroupBase_i * g = SMESH::DownCast< SMESH_GroupBase_i*>( obj ))