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
54250: Wrong group contents after SplitQuad()
[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 d51714ae79a7d94929cba87714c2436f2470fd34..d580262ded1d33b8a9dc214ee0e14d6ed3e21475 100644
(file)
--- a/
src/SMESH_I/SMESH_Group_i.cxx
+++ b/
src/SMESH_I/SMESH_Group_i.cxx
@@
-1,4
+1,4
@@
-// Copyright (C) 2007-201
5
CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-201
6
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
@@
-27,10
+27,10
@@
//
#include "SMESH_Group_i.hxx"
//
#include "SMESH_Group_i.hxx"
-#include "SMDSAbs_ElementType.hxx"
#include "SMESHDS_Group.hxx"
#include "SMESHDS_GroupOnFilter.hxx"
#include "SMESHDS_GroupOnGeom.hxx"
#include "SMESHDS_Group.hxx"
#include "SMESHDS_GroupOnFilter.hxx"
#include "SMESHDS_GroupOnGeom.hxx"
+#include "SMESHDS_Mesh.hxx"
#include "SMESH_Comment.hxx"
#include "SMESH_Filter_i.hxx"
#include "SMESH_Gen_i.hxx"
#include "SMESH_Comment.hxx"
#include "SMESH_Filter_i.hxx"
#include "SMESH_Gen_i.hxx"
@@
-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,19
+69,17
@@
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 );
}
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 );
}
SMESH_GroupOnFilter_i::SMESH_GroupOnFilter_i( PortableServer::POA_ptr thePOA,
}
SMESH_GroupOnFilter_i::SMESH_GroupOnFilter_i( PortableServer::POA_ptr thePOA,
@@
-90,7
+88,6
@@
SMESH_GroupOnFilter_i::SMESH_GroupOnFilter_i( PortableServer::POA_ptr thePOA,
: 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 );
}
//=============================================================================
}
//=============================================================================
@@
-176,7
+173,6
@@
char* SMESH_GroupBase_i::GetName()
::SMESH_Group* aGroup = GetSmeshGroup();
if (aGroup)
return CORBA::string_dup (aGroup->GetName());
::SMESH_Group* aGroup = GetSmeshGroup();
if (aGroup)
return CORBA::string_dup (aGroup->GetName());
- MESSAGE("get name of a vague group");
return CORBA::string_dup( "NO_NAME" );
}
return CORBA::string_dup( "NO_NAME" );
}
@@
-203,7
+199,6
@@
SMESH::ElementType SMESH_GroupBase_i::GetType()
}
return aType;
}
}
return aType;
}
- MESSAGE("get type of a vague group");
return SMESH::ALL;
}
return SMESH::ALL;
}
@@
-222,7
+217,6
@@
CORBA::Long SMESH_GroupBase_i::Size()
SMESHDS_GroupBase* aGroupDS = GetGroupDS();
if (aGroupDS)
return aGroupDS->Extent();
SMESHDS_GroupBase* aGroupDS = GetGroupDS();
if (aGroupDS)
return aGroupDS->Extent();
- MESSAGE("get size of a vague group");
return 0;
}
return 0;
}
@@
-240,7
+234,6
@@
CORBA::Boolean SMESH_GroupBase_i::IsEmpty()
SMESHDS_GroupBase* aGroupDS = GetGroupDS();
if (aGroupDS)
return aGroupDS->IsEmpty();
SMESHDS_GroupBase* aGroupDS = GetGroupDS();
if (aGroupDS)
return aGroupDS->IsEmpty();
- MESSAGE("checking IsEmpty of a vague group");
return true;
}
return true;
}
@@
-280,8
+273,6
@@
void SMESH_Group_i::Clear()
return;
}
Modified(); // notify dependent Filter with FT_BelongToMeshGroup criterion
return;
}
Modified(); // notify dependent Filter with FT_BelongToMeshGroup criterion
-
- MESSAGE("attempt to clear a vague group");
}
//=============================================================================
}
//=============================================================================
@@
-298,7
+289,6
@@
CORBA::Boolean SMESH_GroupBase_i::Contains( CORBA::Long theID )
SMESHDS_GroupBase* aGroupDS = GetGroupDS();
if (aGroupDS)
return aGroupDS->Contains(theID);
SMESHDS_GroupBase* aGroupDS = GetGroupDS();
if (aGroupDS)
return aGroupDS->Contains(theID);
- MESSAGE("attempt to check contents of a vague group");
return false;
}
return false;
}
@@
-320,9
+310,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
+325,7
@@
CORBA::Long SMESH_Group_i::Add( const SMESH::long_array& theIDs )
//=============================================================================
/*!
//=============================================================================
/*!
- *
+ *
*/
//=============================================================================
*/
//=============================================================================
@@
-352,9
+342,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
+357,7
@@
CORBA::Long SMESH_Group_i::Remove( const SMESH::long_array& theIDs )
//=============================================================================
/*!
//=============================================================================
/*!
- *
+ *
*/
//=============================================================================
*/
//=============================================================================
@@
-484,13
+474,13
@@
SMESH::long_array* SMESH_GroupBase_i::GetListOfID()
{
int aSize = aGroupDS->Extent();
aRes->length(aSize);
{
int aSize = aGroupDS->Extent();
aRes->length(aSize);
- for (int i = 0; i < aSize; i++)
- aRes[i] = aGroupDS->GetID(i+1);
+ SMDS_ElemIteratorPtr it = aGroupDS->GetElements();
+ for (int i = 0; it->more(); i++)
+ aRes[i] = it->next()->GetID();
if ( 0 < aSize && aSize < 100 ) // for comfortable testing ;)
std::sort( &aRes[0], &aRes[0]+aSize );
}
if ( 0 < aSize && aSize < 100 ) // for comfortable testing ;)
std::sort( &aRes[0], &aRes[0]+aSize );
}
- MESSAGE("get list of IDs of a vague group");
return aRes._retn();
}
return aRes._retn();
}
@@
-502,8
+492,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
+521,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
+564,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();
}
@@
-631,7
+621,6
@@
SALOMEDS::Color SMESH_GroupBase_i::GetColor()
return aColor;
}
return aColor;
}
- MESSAGE("get color of a group");
return SALOMEDS::Color();
}
return SALOMEDS::Color();
}
@@
-684,7
+673,6
@@
void SMESH_GroupBase_i::SetColorNumber(CORBA::Long color)
aGroupDS->SetColorGroup(color);
TPythonDump()<<SMESH::SMESH_GroupBase_var(_this())<<".SetColorNumber( "<<color<<" )";
}
aGroupDS->SetColorGroup(color);
TPythonDump()<<SMESH::SMESH_GroupBase_var(_this())<<".SetColorNumber( "<<color<<" )";
}
- MESSAGE("set color number of a group");
return ;
}
return ;
}
@@
-708,7
+696,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 )
@@
-889,7
+877,6
@@
SMESH::long_array* SMESH_GroupOnFilter_i::GetListOfID()
if ( 0 < aRes->length() && aRes->length() < 100 ) // for comfortable testing ;)
std::sort( &aRes[0], &aRes[0] + aRes->length() );
}
if ( 0 < aRes->length() && aRes->length() < 100 ) // for comfortable testing ;)
std::sort( &aRes[0], &aRes[0] + aRes->length() );
}
- MESSAGE("get list of IDs of a vague group");
return aRes._retn();
}
return aRes._retn();
}
@@
-913,12
+900,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 ];