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
bos #24400 [CEA] Option in SALOME for not storing in med files the indices (number...
[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 d3fbdc742e35463c1c63c3d47637068344d8ee2f..1ee929550486579ee213b59ce800cc189ba39b91 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-202
0
CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-202
1
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
@@
-43,8
+43,6
@@
#include "utilities.h"
#include "utilities.h"
-using namespace SMESH;
-
//=============================================================================
/*!
*
//=============================================================================
/*!
*
@@
-158,7
+156,7
@@
void SMESH_GroupBase_i::SetName( const char* theName )
aGen->SetName( anSO, theName );
// Update Python script
aGen->SetName( anSO, theName );
// Update Python script
- TPythonDump() << anSO << ".SetName( '" << theName << "' )";
+
SMESH::
TPythonDump() << anSO << ".SetName( '" << theName << "' )";
}
}
}
}
@@
-209,7
+207,7
@@
SMESH::ElementType SMESH_GroupBase_i::GetType()
*/
//=============================================================================
*/
//=============================================================================
-
CORBA::Long
SMESH_GroupBase_i::Size()
+
SMESH::smIdType
SMESH_GroupBase_i::Size()
{
if ( myPreMeshInfo )
return GetType() == SMESH::NODE ? myPreMeshInfo->NbNodes() : myPreMeshInfo->NbElements();
{
if ( myPreMeshInfo )
return GetType() == SMESH::NODE ? myPreMeshInfo->NbNodes() : myPreMeshInfo->NbElements();
@@
-264,7
+262,7
@@
void SMESH_Group_i::Clear()
myPreMeshInfo->FullLoadFromFile();
// Update Python script
myPreMeshInfo->FullLoadFromFile();
// Update Python script
- TPythonDump() << SMESH::SMESH_Group_var(_this()) << ".Clear()";
+
SMESH::
TPythonDump() << SMESH::SMESH_Group_var(_this()) << ".Clear()";
// Clear the group
SMESHDS_Group* aGroupDS = dynamic_cast<SMESHDS_Group*>( GetGroupDS() );
// Clear the group
SMESHDS_Group* aGroupDS = dynamic_cast<SMESHDS_Group*>( GetGroupDS() );
@@
-281,7
+279,7
@@
void SMESH_Group_i::Clear()
*/
//=============================================================================
*/
//=============================================================================
-CORBA::Boolean SMESH_GroupBase_i::Contains(
CORBA::Long
theID )
+CORBA::Boolean SMESH_GroupBase_i::Contains(
SMESH::smIdType
theID )
{
if ( myPreMeshInfo )
myPreMeshInfo->FullLoadFromFile();
{
if ( myPreMeshInfo )
myPreMeshInfo->FullLoadFromFile();
@@
-298,13
+296,13
@@
CORBA::Boolean SMESH_GroupBase_i::Contains( CORBA::Long theID )
*/
//=============================================================================
*/
//=============================================================================
-
CORBA::Long SMESH_Group_i::Add( const SMESH::long
_array& theIDs )
+
SMESH::smIdType SMESH_Group_i::Add( const SMESH::smIdType
_array& theIDs )
{
if ( myPreMeshInfo )
myPreMeshInfo->FullLoadFromFile();
// Update Python script
{
if ( myPreMeshInfo )
myPreMeshInfo->FullLoadFromFile();
// Update Python script
- TPythonDump() << "nbAdd = " << SMESH::SMESH_Group_var(_this()) << ".Add( " << theIDs << " )";
+
SMESH::
TPythonDump() << "nbAdd = " << SMESH::SMESH_Group_var(_this()) << ".Add( " << theIDs << " )";
// Add elements to the group
SMESHDS_Group* aGroupDS = dynamic_cast<SMESHDS_Group*>( GetGroupDS() );
// Add elements to the group
SMESHDS_Group* aGroupDS = dynamic_cast<SMESHDS_Group*>( GetGroupDS() );
@@
-329,13
+327,13
@@
CORBA::Long SMESH_Group_i::Add( const SMESH::long_array& theIDs )
*/
//=============================================================================
*/
//=============================================================================
-
CORBA::Long SMESH_Group_i::Remove( const SMESH::long
_array& theIDs )
+
SMESH::smIdType SMESH_Group_i::Remove( const SMESH::smIdType
_array& theIDs )
{
if ( myPreMeshInfo )
myPreMeshInfo->FullLoadFromFile();
// Update Python script
{
if ( myPreMeshInfo )
myPreMeshInfo->FullLoadFromFile();
// Update Python script
- TPythonDump() << "nbDel = " << SMESH::SMESH_Group_var(_this())
+
SMESH::
TPythonDump() << "nbDel = " << SMESH::SMESH_Group_var(_this())
<< ".Remove( " << theIDs << " )";
// Remove elements from the group
<< ".Remove( " << theIDs << " )";
// Remove elements from the group
@@
-361,13
+359,13
@@
CORBA::Long SMESH_Group_i::Remove( const SMESH::long_array& theIDs )
*/
//=============================================================================
*/
//=============================================================================
-typedef bool (SMESHDS_Group::*TFunChangeGroup)(const
int
);
+typedef bool (SMESHDS_Group::*TFunChangeGroup)(const
smIdType
);
CORBA::Long
CORBA::Long
-ChangeByPredicate( SMESH::Predicate_i* thePredicate,
- SMESHDS_GroupBase* theGroupBase,
-
NotifyerAndWaiter*
theGroupImpl,
- TFunChangeGroup theFun)
+ChangeByPredicate( SMESH::Predicate_i*
thePredicate,
+ SMESHDS_GroupBase*
theGroupBase,
+
SMESH::NotifyerAndWaiter*
theGroupImpl,
+ TFunChangeGroup
theFun)
{
CORBA::Long aNb = 0;
if(SMESHDS_Group* aGroupDS = dynamic_cast<SMESHDS_Group*>(theGroupBase)){
{
CORBA::Long aNb = 0;
if(SMESHDS_Group* aGroupDS = dynamic_cast<SMESHDS_Group*>(theGroupBase)){
@@
-386,7
+384,7
@@
ChangeByPredicate( SMESH::Predicate_i* thePredicate,
return aNb;
}
return aNb;
}
-CORBA::Long
+SMESH::smIdType
SMESH_Group_i::
AddByPredicate( SMESH::Predicate_ptr thePredicate )
{
SMESH_Group_i::
AddByPredicate( SMESH::Predicate_ptr thePredicate )
{
@@
-394,14
+392,14
@@
AddByPredicate( SMESH::Predicate_ptr thePredicate )
myPreMeshInfo->FullLoadFromFile();
if(SMESH::Predicate_i* aPredicate = SMESH::GetPredicate(thePredicate)){
myPreMeshInfo->FullLoadFromFile();
if(SMESH::Predicate_i* aPredicate = SMESH::GetPredicate(thePredicate)){
- TPythonDump() << SMESH::SMESH_Group_var(_this())
- << ".AddByPredicate( " << aPredicate << " )";
+
SMESH::
TPythonDump() << SMESH::SMESH_Group_var(_this())
+
<< ".AddByPredicate( " << aPredicate << " )";
return ChangeByPredicate( aPredicate, GetGroupDS(), this, &SMESHDS_Group::Add );
}
return 0;
}
return ChangeByPredicate( aPredicate, GetGroupDS(), this, &SMESHDS_Group::Add );
}
return 0;
}
-CORBA::Long
+SMESH::smIdType
SMESH_Group_i::
RemoveByPredicate( SMESH::Predicate_ptr thePredicate )
{
SMESH_Group_i::
RemoveByPredicate( SMESH::Predicate_ptr thePredicate )
{
@@
-409,19
+407,19
@@
RemoveByPredicate( SMESH::Predicate_ptr thePredicate )
myPreMeshInfo->FullLoadFromFile();
if(SMESH::Predicate_i* aPredicate = SMESH::GetPredicate(thePredicate)){
myPreMeshInfo->FullLoadFromFile();
if(SMESH::Predicate_i* aPredicate = SMESH::GetPredicate(thePredicate)){
- TPythonDump() << SMESH::SMESH_Group_var(_this())
- << ".RemoveByPredicate( " << aPredicate << " )";
+
SMESH::
TPythonDump() << SMESH::SMESH_Group_var(_this())
+
<< ".RemoveByPredicate( " << aPredicate << " )";
return ChangeByPredicate(aPredicate,GetGroupDS(),this, &SMESHDS_Group::Remove);
}
return 0;
}
return ChangeByPredicate(aPredicate,GetGroupDS(),this, &SMESHDS_Group::Remove);
}
return 0;
}
-
CORBA::Long
SMESH_Group_i::AddFrom( SMESH::SMESH_IDSource_ptr theSource )
+
SMESH::smIdType
SMESH_Group_i::AddFrom( SMESH::SMESH_IDSource_ptr theSource )
{
if ( myPreMeshInfo )
myPreMeshInfo->FullLoadFromFile();
{
if ( myPreMeshInfo )
myPreMeshInfo->FullLoadFromFile();
- TPythonDump pd;
+
SMESH::
TPythonDump pd;
long prevNb = Size();
SMESHDS_Group* aGroupDS = dynamic_cast<SMESHDS_Group*>( GetGroupDS() );
if (aGroupDS) {
long prevNb = Size();
SMESHDS_Group* aGroupDS = dynamic_cast<SMESHDS_Group*>( GetGroupDS() );
if (aGroupDS) {
@@
-441,11
+439,11
@@
CORBA::Long SMESH_Group_i::AddFrom( SMESH::SMESH_IDSource_ptr theSource )
//=============================================================================
/*!
//=============================================================================
/*!
- *
+ *
Return ID of theIndex-th group item
*/
//=============================================================================
*/
//=============================================================================
-
CORBA::Long SMESH_GroupBase_i::GetID( CORBA::Long
theIndex )
+
SMESH::smIdType SMESH_GroupBase_i::GetID( SMESH::smIdType
theIndex )
{
if ( myPreMeshInfo )
myPreMeshInfo->FullLoadFromFile();
{
if ( myPreMeshInfo )
myPreMeshInfo->FullLoadFromFile();
@@
-463,19
+461,19
@@
CORBA::Long SMESH_GroupBase_i::GetID( CORBA::Long theIndex )
*/
//=============================================================================
*/
//=============================================================================
-SMESH::
long
_array* SMESH_GroupBase_i::GetListOfID()
+SMESH::
smIdType
_array* SMESH_GroupBase_i::GetListOfID()
{
if ( myPreMeshInfo )
myPreMeshInfo->FullLoadFromFile();
{
if ( myPreMeshInfo )
myPreMeshInfo->FullLoadFromFile();
- SMESH::
long_array_var aRes = new SMESH::long
_array();
+ SMESH::
smIdType_array_var aRes = new SMESH::smIdType
_array();
SMESHDS_GroupBase* aGroupDS = GetGroupDS();
if (aGroupDS)
{
SMESHDS_GroupBase* aGroupDS = GetGroupDS();
if (aGroupDS)
{
-
int
aSize = aGroupDS->Extent();
+
smIdType
aSize = aGroupDS->Extent();
aRes->length(aSize);
SMDS_ElemIteratorPtr it = aGroupDS->GetElements();
aRes->length(aSize);
SMDS_ElemIteratorPtr it = aGroupDS->GetElements();
- for (
int
i = 0; it->more(); i++)
+ for (
::smIdType
i = 0; it->more(); i++)
aRes[i] = it->next()->GetID();
if ( 0 < aSize && aSize < 100 ) // for comfortable testing ;)
aRes[i] = it->next()->GetID();
if ( 0 < aSize && aSize < 100 ) // for comfortable testing ;)
@@
-509,7
+507,7
@@
namespace
*/
//================================================================================
*/
//================================================================================
-
CORBA::Long
SMESH_GroupBase_i::GetNumberOfNodes()
+
SMESH::smIdType
SMESH_GroupBase_i::GetNumberOfNodes()
{
if ( GetType() == SMESH::NODE )
return Size();
{
if ( GetType() == SMESH::NODE )
return Size();
@@
-553,7
+551,7
@@
CORBA::Boolean SMESH_GroupBase_i::IsNodeInfoAvailable()
*/
//================================================================================
*/
//================================================================================
-SMESH::
long
_array* SMESH_GroupBase_i::GetNodeIDs()
+SMESH::
smIdType
_array* SMESH_GroupBase_i::GetNodeIDs()
{
if ( GetType() == SMESH::NODE )
return GetListOfID();
{
if ( GetType() == SMESH::NODE )
return GetListOfID();
@@
-561,7
+559,7
@@
SMESH::long_array* SMESH_GroupBase_i::GetNodeIDs()
if ( myPreMeshInfo )
myPreMeshInfo->FullLoadFromFile();
if ( myPreMeshInfo )
myPreMeshInfo->FullLoadFromFile();
- SMESH::
long_array_var aRes = new SMESH::long
_array();
+ SMESH::
smIdType_array_var aRes = new SMESH::smIdType
_array();
if ( SMESHDS_GroupBase* g = GetGroupDS())
{
std::set<const SMDS_MeshNode* > nodes;
if ( SMESHDS_GroupBase* g = GetGroupDS())
{
std::set<const SMDS_MeshNode* > nodes;
@@
-639,9
+637,9
@@
void SMESH_GroupBase_i::SetColor(const SALOMEDS::Color& color)
if ( oldColor != aQColor )
{
aGroupDS->SetColor(aQColor);
if ( oldColor != aQColor )
{
aGroupDS->SetColor(aQColor);
- TPythonDump()<< SMESH::SMESH_GroupBase_var(_this())
- << ".SetColor( SALOMEDS.Color( "
- <<color.R<<", "<<color.G<<", "<<color.B<<" ))";
+
SMESH::
TPythonDump()<< SMESH::SMESH_GroupBase_var(_this())
+
<< ".SetColor( SALOMEDS.Color( "
+
<<color.R<<", "<<color.G<<", "<<color.B<<" ))";
}
}
}
}
}
}
@@
-651,7
+649,7
@@
void SMESH_GroupBase_i::SetColor(const SALOMEDS::Color& color)
*
*/
//=============================================================================
*
*/
//=============================================================================
-CORBA::Long SMESH_GroupBase_i::GetColorNumber()
+CORBA::Long
SMESH_GroupBase_i::GetColorNumber()
{
SMESHDS_GroupBase* aGroupDS = GetGroupDS();
if (aGroupDS)
{
SMESHDS_GroupBase* aGroupDS = GetGroupDS();
if (aGroupDS)
@@
-671,7
+669,7
@@
void SMESH_GroupBase_i::SetColorNumber(CORBA::Long color)
if (aGroupDS)
{
aGroupDS->SetColorGroup(color);
if (aGroupDS)
{
aGroupDS->SetColorGroup(color);
- TPythonDump()<<SMESH::SMESH_GroupBase_var(_this())<<".SetColorNumber( "<<color<<" )";
+
SMESH::
TPythonDump()<<SMESH::SMESH_GroupBase_var(_this())<<".SetColorNumber( "<<color<<" )";
}
return ;
}
}
return ;
}
@@
-684,12
+682,12
@@
void SMESH_GroupBase_i::SetColorNumber(CORBA::Long color)
*/
//=============================================================================
*/
//=============================================================================
-SMESH::
long
_array* SMESH_GroupBase_i::GetMeshInfo()
+SMESH::
smIdType
_array* SMESH_GroupBase_i::GetMeshInfo()
{
if ( myPreMeshInfo )
return myPreMeshInfo->GetMeshInfo();
{
if ( myPreMeshInfo )
return myPreMeshInfo->GetMeshInfo();
- SMESH::
long_array_var aRes = new SMESH::long
_array();
+ SMESH::
smIdType_array_var aRes = new SMESH::smIdType
_array();
aRes->length(SMESH::Entity_Last);
for (int i = SMESH::Entity_Node; i < SMESH::Entity_Last; i++)
aRes[i] = 0;
aRes->length(SMESH::Entity_Last);
for (int i = SMESH::Entity_Node; i < SMESH::Entity_Last; i++)
aRes[i] = 0;
@@
-712,9
+710,9
@@
SMESH::long_array* SMESH_GroupBase_i::GetMeshInfo()
*/
//=============================================================================
*/
//=============================================================================
-SMESH::
long
_array* SMESH_GroupBase_i::GetNbElementsByType()
+SMESH::
smIdType
_array* SMESH_GroupBase_i::GetNbElementsByType()
{
{
- SMESH::
long_array_var aRes = new SMESH::long
_array();
+ SMESH::
smIdType_array_var aRes = new SMESH::smIdType
_array();
aRes->length(SMESH::NB_ELEMENT_TYPES);
for (int i = 0; i < SMESH::NB_ELEMENT_TYPES; i++)
aRes[ i ] = 0;
aRes->length(SMESH::NB_ELEMENT_TYPES);
for (int i = 0; i < SMESH::NB_ELEMENT_TYPES; i++)
aRes[ i ] = 0;
@@
-732,7
+730,7
@@
SMESH::long_array* SMESH_GroupBase_i::GetNbElementsByType()
//purpose : Return ids of members
//=======================================================================
//purpose : Return ids of members
//=======================================================================
-SMESH::
long
_array* SMESH_GroupBase_i::GetIDs()
+SMESH::
smIdType
_array* SMESH_GroupBase_i::GetIDs()
{
return GetListOfID();
}
{
return GetListOfID();
}
@@
-844,7
+842,7
@@
void SMESH_GroupOnFilter_i::SetFilter(SMESH::Filter_ptr theFilter)
GetMeshServant()->GetGen()->HighLightInvalid( me, false );
GetMeshServant()->GetGen()->HighLightInvalid( me, false );
- TPythonDump()<< me <<".SetFilter( "<< theFilter <<" )";
+
SMESH::
TPythonDump()<< me <<".SetFilter( "<< theFilter <<" )";
}
//================================================================================
}
//================================================================================
@@
-856,7
+854,7
@@
void SMESH_GroupOnFilter_i::SetFilter(SMESH::Filter_ptr theFilter)
SMESH::Filter_ptr SMESH_GroupOnFilter_i::GetFilter()
{
SMESH::Filter_var f = myFilter;
SMESH::Filter_ptr SMESH_GroupOnFilter_i::GetFilter()
{
SMESH::Filter_var f = myFilter;
- TPythonDump() << f << " = " << SMESH::SMESH_GroupOnFilter_var(_this()) << ".GetFilter()";
+
SMESH::
TPythonDump() << f << " = " << SMESH::SMESH_GroupOnFilter_var(_this()) << ".GetFilter()";
return f._retn();
}
return f._retn();
}
@@
-893,12
+891,12
@@
bool SMESH_GroupOnFilter_i::IsMeshInfoCorrect()
//purpose : Return ids of members
//=======================================================================
//purpose : Return ids of members
//=======================================================================
-SMESH::
long
_array* SMESH_GroupOnFilter_i::GetListOfID()
+SMESH::
smIdType
_array* SMESH_GroupOnFilter_i::GetListOfID()
{
if ( myPreMeshInfo )
myPreMeshInfo->FullLoadFromFile();
{
if ( myPreMeshInfo )
myPreMeshInfo->FullLoadFromFile();
- SMESH::
long_array_var aRes = new SMESH::long
_array();
+ SMESH::
smIdType_array_var aRes = new SMESH::smIdType
_array();
SMESHDS_GroupBase* aGroupDS = GetGroupDS();
if ( SMESHDS_GroupOnFilter* grDS = dynamic_cast< SMESHDS_GroupOnFilter*>( GetGroupDS() ))
{
SMESHDS_GroupBase* aGroupDS = GetGroupDS();
if ( SMESHDS_GroupOnFilter* grDS = dynamic_cast< SMESHDS_GroupOnFilter*>( GetGroupDS() ))
{
@@
-921,12
+919,12
@@
SMESH::long_array* SMESH_GroupOnFilter_i::GetListOfID()
*/
//=============================================================================
*/
//=============================================================================
-SMESH::
long
_array* SMESH_GroupOnFilter_i::GetMeshInfo()
+SMESH::
smIdType
_array* SMESH_GroupOnFilter_i::GetMeshInfo()
{
if ( myPreMeshInfo )
return myPreMeshInfo->GetMeshInfo();
{
if ( myPreMeshInfo )
return myPreMeshInfo->GetMeshInfo();
- SMESH::
long_array_var aRes = new SMESH::long
_array();
+ SMESH::
smIdType_array_var aRes = new SMESH::smIdType
_array();
aRes->length(SMESH::Entity_Last);
for (int i = SMESH::Entity_Node; i < SMESH::Entity_Last; i++)
aRes[i] = 0;
aRes->length(SMESH::Entity_Last);
for (int i = SMESH::Entity_Node; i < SMESH::Entity_Last; i++)
aRes[i] = 0;
@@
-938,7
+936,7
@@
SMESH::long_array* SMESH_GroupOnFilter_i::GetMeshInfo()
if ( g->GetType() != SMDSAbs_Node )
{
if ( g->GetType() != SMDSAbs_Node )
{
- std::vector<
int
> nbElems = static_cast< SMESHDS_GroupOnFilter* >( g )->GetMeshInfo();
+ std::vector<
smIdType
> 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 ];
@@
-1039,7
+1037,7
@@
SMESH::Filter_ptr SMESH_GroupOnFilter_i::StringToFilter(const std::string& thePe
}
// create a filter
}
// create a filter
- TPythonDump pd;
+
SMESH::
TPythonDump pd;
SMESH::FilterManager_i* aFilterMgr = new SMESH::FilterManager_i();
filter = aFilterMgr->CreateFilter();
filter->SetCriteria( criteria.inout() );
SMESH::FilterManager_i* aFilterMgr = new SMESH::FilterManager_i();
filter = aFilterMgr->CreateFilter();
filter->SetCriteria( criteria.inout() );