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
Merge branch 'V9_11_BR'
[modules/smesh.git]
/
src
/
OBJECT
/
SMESH_Object.cxx
diff --git
a/src/OBJECT/SMESH_Object.cxx
b/src/OBJECT/SMESH_Object.cxx
index 550dac28faeb7903b6048ec4afb155d832d584bd..fd80edb472a6fa9351f38252be96c665f6b2926b 100644
(file)
--- a/
src/OBJECT/SMESH_Object.cxx
+++ b/
src/OBJECT/SMESH_Object.cxx
@@
-1,4
+1,4
@@
-// Copyright (C) 2007-20
19 CEA/DEN, EDF R&D
, OPEN CASCADE
+// Copyright (C) 2007-20
23 CEA, EDF
, 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
@@
-38,7
+38,7
@@
#include <SalomeApp_Application.h>
#include <VTKViewer_ExtractUnstructuredGrid.h>
#include <SalomeApp_Application.h>
#include <VTKViewer_ExtractUnstructuredGrid.h>
-#include <VTKViewer_CellLocationsArray.h>
+
//
#include <VTKViewer_CellLocationsArray.h>
#include CORBA_SERVER_HEADER(SMESH_Gen)
#include CORBA_SERVER_HEADER(SALOME_Exception)
#include CORBA_SERVER_HEADER(SMESH_Gen)
#include CORBA_SERVER_HEADER(SALOME_Exception)
@@
-67,14
+67,7
@@
using namespace std;
}
#endif
}
#endif
-#ifdef _DEBUG_
-static int MYDEBUG = 0;
static int MYDEBUGWITHFILES = 0;//1;
static int MYDEBUGWITHFILES = 0;//1;
-#else
-static int MYDEBUG = 0;
-static int MYDEBUGWITHFILES = 0;
-#endif
-
/*
Class : SMESH_VisualObjDef
/*
Class : SMESH_VisualObjDef
@@
-86,7
+79,7
@@
static int MYDEBUGWITHFILES = 0;
//=================================================================================
SMESH_VisualObjDef::SMESH_VisualObjDef()
{
//=================================================================================
SMESH_VisualObjDef::SMESH_VisualObjDef()
{
-
if ( MYDEBUG )
MESSAGE("-------------------------------SMESH_VisualObjDef::SMESH_VisualObjDef");
+ MESSAGE("-------------------------------SMESH_VisualObjDef::SMESH_VisualObjDef");
myGrid = vtkUnstructuredGrid::New();
myLocalGrid = false;
ClearEntitiesFlags();
myGrid = vtkUnstructuredGrid::New();
myLocalGrid = false;
ClearEntitiesFlags();
@@
-94,8
+87,8
@@
SMESH_VisualObjDef::SMESH_VisualObjDef()
}
SMESH_VisualObjDef::~SMESH_VisualObjDef()
{
}
SMESH_VisualObjDef::~SMESH_VisualObjDef()
{
-
if ( MYDEBUG )
MESSAGE("--------------------------------SMESH_VisualObjDef::~SMESH_VisualObjDef");
-
if ( MYDEBUG )
MESSAGE( "myGrid->GetReferenceCount() = " << myGrid->GetReferenceCount() );
+ MESSAGE("--------------------------------SMESH_VisualObjDef::~SMESH_VisualObjDef");
+ MESSAGE( "myGrid->GetReferenceCount() = " << myGrid->GetReferenceCount() );
myGrid->Delete();
}
myGrid->Delete();
}
@@
-103,7
+96,7
@@
SMESH_VisualObjDef::~SMESH_VisualObjDef()
// functions : GetNodeObjId, GetNodeVTKId, GetElemObjId, GetElemVTKId
// purpose : Methods for retrieving VTK IDs by SMDS IDs and vice versa
//=================================================================================
// functions : GetNodeObjId, GetNodeVTKId, GetElemObjId, GetElemVTKId
// purpose : Methods for retrieving VTK IDs by SMDS IDs and vice versa
//=================================================================================
-vtkIdType SMESH_VisualObjDef::GetNodeObjId(
int
theVTKID )
+vtkIdType SMESH_VisualObjDef::GetNodeObjId(
vtkIdType
theVTKID )
{
if (myLocalGrid)
{
{
if (myLocalGrid)
{
@@
-114,10
+107,10
@@
vtkIdType SMESH_VisualObjDef::GetNodeObjId( int theVTKID )
if( this->GetMesh() )
aNode = this->GetMesh()->FindNodeVtk( theVTKID );
if( this->GetMesh() )
aNode = this->GetMesh()->FindNodeVtk( theVTKID );
- return aNode ?
aNode->GetID(
) : -1;
+ return aNode ?
FromSmIdType<vtkIdType>(aNode->GetID()
) : -1;
}
}
-vtkIdType SMESH_VisualObjDef::GetNodeVTKId(
int
theObjID )
+vtkIdType SMESH_VisualObjDef::GetNodeVTKId(
vtkIdType
theObjID )
{
if (myLocalGrid)
{
{
if (myLocalGrid)
{
@@
-132,17
+125,17
@@
vtkIdType SMESH_VisualObjDef::GetNodeVTKId( int theObjID )
return aNode ? aNode->GetVtkID() : -1;
}
return aNode ? aNode->GetVtkID() : -1;
}
-vtkIdType SMESH_VisualObjDef::GetElemObjId(
int
theVTKID )
+vtkIdType SMESH_VisualObjDef::GetElemObjId(
vtkIdType
theVTKID )
{
if (myLocalGrid)
{
TMapOfIds::const_iterator i = myVTK2SMDSElems.find(theVTKID);
return i == myVTK2SMDSElems.end() ? -1 : i->second;
}
{
if (myLocalGrid)
{
TMapOfIds::const_iterator i = myVTK2SMDSElems.find(theVTKID);
return i == myVTK2SMDSElems.end() ? -1 : i->second;
}
- return
this->GetMesh()->FromVtkToSmds(theVTKID
);
+ return
FromSmIdType<vtkIdType>(this->GetMesh()->FromVtkToSmds(theVTKID)
);
}
}
-vtkIdType SMESH_VisualObjDef::GetElemVTKId(
int
theObjID )
+vtkIdType SMESH_VisualObjDef::GetElemVTKId(
vtkIdType
theObjID )
{
if (myLocalGrid)
{
{
if (myLocalGrid)
{
@@
-171,7
+164,7
@@
void SMESH_VisualObjDef::createPoints( vtkPoints* thePoints )
return;
TEntityList aNodes;
return;
TEntityList aNodes;
- vtkIdType nbNodes =
GetEntities( SMDSAbs_Node, aNodes
);
+ vtkIdType nbNodes =
FromSmIdType<vtkIdType>(GetEntities( SMDSAbs_Node, aNodes )
);
thePoints->SetNumberOfPoints( nbNodes );
int nbPoints = 0;
thePoints->SetNumberOfPoints( nbNodes );
int nbPoints = 0;
@@
-183,7
+176,7
@@
void SMESH_VisualObjDef::createPoints( vtkPoints* thePoints )
if ( aNode != 0 )
{
thePoints->SetPoint( nbPoints, aNode->X(), aNode->Y(), aNode->Z() );
if ( aNode != 0 )
{
thePoints->SetPoint( nbPoints, aNode->X(), aNode->Y(), aNode->Z() );
-
int
anId = aNode->GetID();
+
smIdType
anId = aNode->GetID();
mySMDS2VTKNodes.insert( mySMDS2VTKNodes.end(), std::make_pair( anId, nbPoints ));
myVTK2SMDSNodes.insert( myVTK2SMDSNodes.end(), std::make_pair( nbPoints, anId ));
nbPoints++;
mySMDS2VTKNodes.insert( mySMDS2VTKNodes.end(), std::make_pair( anId, nbPoints ));
myVTK2SMDSNodes.insert( myVTK2SMDSNodes.end(), std::make_pair( nbPoints, anId ));
nbPoints++;
@@
-200,7
+193,7
@@
void SMESH_VisualObjDef::createPoints( vtkPoints* thePoints )
//=================================================================================
void SMESH_VisualObjDef::buildPrs(bool buildGrid)
{
//=================================================================================
void SMESH_VisualObjDef::buildPrs(bool buildGrid)
{
-
if ( MYDEBUG )
MESSAGE("---------------------------SMESH_VisualObjDef::buildPrs " << buildGrid);
+ MESSAGE("---------------------------SMESH_VisualObjDef::buildPrs " << buildGrid);
if (buildGrid)
{
myLocalGrid = true;
if (buildGrid)
{
myLocalGrid = true;
@@
-234,7
+227,7
@@
void SMESH_VisualObjDef::buildPrs(bool buildGrid)
if (!GetMesh()->IsCompacted())
{
NulData(); // detach from the SMDS grid to allow immediate memory de-allocation in compactMesh()
if (!GetMesh()->IsCompacted())
{
NulData(); // detach from the SMDS grid to allow immediate memory de-allocation in compactMesh()
-
if ( MYDEBUG )
MESSAGE("*** buildPrs ==> compactMesh!");
+ MESSAGE("*** buildPrs ==> compactMesh!");
GetMesh()->CompactMesh();
if ( SMESHDS_Mesh* m = dynamic_cast<SMESHDS_Mesh*>( GetMesh() )) // IPAL53915
m->GetScript()->SetModified(false); // drop IsModified set in compactMesh()
GetMesh()->CompactMesh();
if ( SMESHDS_Mesh* m = dynamic_cast<SMESHDS_Mesh*>( GetMesh() )) // IPAL53915
m->GetScript()->SetModified(false); // drop IsModified set in compactMesh()
@@
-284,7
+277,7
@@
namespace{
theConnect.clear();
for(; theNodesIter->more();)
theConnect.push_back(theNodesIter->next());
theConnect.clear();
for(; theNodesIter->more();)
theConnect.push_back(theNodesIter->next());
- return theConnect.size();
+ return
(int)
theConnect.size();
}
inline
}
inline
@@
-292,7
+285,7
@@
namespace{
const SMESH_VisualObjDef::TMapOfIds& theSMDS2VTKNodes,
const TConnect& theConnect,
int thePosition,
const SMESH_VisualObjDef::TMapOfIds& theSMDS2VTKNodes,
const TConnect& theConnect,
int thePosition,
-
int
theId)
+
vtkIdType
theId)
{
theIdList->SetId(thePosition,theSMDS2VTKNodes.find(theConnect[theId]->GetID())->second);
}
{
theIdList->SetId(thePosition,theSMDS2VTKNodes.find(theConnect[theId]->GetID())->second);
}
@@
-309,8
+302,7
@@
void SMESH_VisualObjDef::buildElemPrs()
myGrid->SetPoints( aPoints );
aPoints->Delete();
myGrid->SetPoints( aPoints );
aPoints->Delete();
- if ( MYDEBUG )
- MESSAGE("Update - myGrid->GetNumberOfPoints() = "<<myGrid->GetNumberOfPoints());
+ MESSAGE("Update - myGrid->GetNumberOfPoints() = "<<myGrid->GetNumberOfPoints());
// Calculate cells size
// Calculate cells size
@@
-319,7
+311,7
@@
void SMESH_VisualObjDef::buildElemPrs()
{ SMDSAbs_Edge, SMDSAbs_Face, SMDSAbs_Volume, SMDSAbs_Ball, SMDSAbs_0DElement };
// get entity data
{ SMDSAbs_Edge, SMDSAbs_Face, SMDSAbs_Volume, SMDSAbs_Ball, SMDSAbs_0DElement };
// get entity data
- map<SMDSAbs_ElementType,
int
> nbEnts;
+ map<SMDSAbs_ElementType,
smIdType
> nbEnts;
map<SMDSAbs_ElementType,TEntityList> anEnts;
vtkIdType aNbCells = 0;
map<SMDSAbs_ElementType,TEntityList> anEnts;
vtkIdType aNbCells = 0;
@@
-361,8
+353,8
@@
void SMESH_VisualObjDef::buildElemPrs()
}
}
}
}
}
}
- if ( MYDEBUG )
-
MESSAGE( "Update - aNbCells = "<<aNbCells<<"; aCellsSize = "<<aCellsSize );
+
+ MESSAGE( "Update - aNbCells = "<<aNbCells<<"; aCellsSize = "<<aCellsSize );
// Create cells
// Create cells
@@
-404,9
+396,9
@@
void SMESH_VisualObjDef::buildElemPrs()
vtkIdType aNbNodes = anElem->NbNodes();
anIdList->SetNumberOfIds( aNbNodes );
vtkIdType aNbNodes = anElem->NbNodes();
anIdList->SetNumberOfIds( aNbNodes );
- const
vtkId
Type vtkElemType = SMDS_MeshCell::toVtkType( anElem->GetEntityType() );
+ const
VTKCell
Type vtkElemType = SMDS_MeshCell::toVtkType( anElem->GetEntityType() );
-
int
anId = anElem->GetID();
+
smIdType
anId = anElem->GetID();
mySMDS2VTKElems.insert( mySMDS2VTKElems.end(), std::make_pair( anId, iElem ));
myVTK2SMDSElems.insert( myVTK2SMDSElems.end(), std::make_pair( iElem, anId ));
mySMDS2VTKElems.insert( mySMDS2VTKElems.end(), std::make_pair( anId, iElem ));
myVTK2SMDSElems.insert( myVTK2SMDSElems.end(), std::make_pair( iElem, anId ));
@@
-424,7
+416,7
@@
void SMESH_VisualObjDef::buildElemPrs()
anIdList->InsertNextId(ph->NbFaceNodes(i));
for(int j = 1; j <= ph->NbFaceNodes(i); j++) {
if ( const SMDS_MeshNode* n = ph->GetFaceNode( i, j ))
anIdList->InsertNextId(ph->NbFaceNodes(i));
for(int j = 1; j <= ph->NbFaceNodes(i); j++) {
if ( const SMDS_MeshNode* n = ph->GetFaceNode( i, j ))
- anIdList->InsertNextId( mySMDS2VTKNodes[
n->GetID(
) ]);
+ anIdList->InsertNextId( mySMDS2VTKNodes[
FromSmIdType<vtkIdType>(n->GetID()
) ]);
}
}
}
}
}
}
@@
-435,13
+427,13
@@
void SMESH_VisualObjDef::buildElemPrs()
if (aConnectivities.size() > 0) {
aConnect.clear();
GetConnect(aNodesIter,aConnect);
if (aConnectivities.size() > 0) {
aConnect.clear();
GetConnect(aNodesIter,aConnect);
- for (
vtkIdType
aNodeId = 0; aNodeId < aNbNodes; aNodeId++)
+ for (
int
aNodeId = 0; aNodeId < aNbNodes; aNodeId++)
SetId(anIdList,mySMDS2VTKNodes,aConnect,aNodeId,aConnectivities[aNodeId]);
}
else {
for( vtkIdType aNodeId = 0; aNodesIter->more(); aNodeId++ ){
const SMDS_MeshElement* aNode = aNodesIter->next();
SetId(anIdList,mySMDS2VTKNodes,aConnect,aNodeId,aConnectivities[aNodeId]);
}
else {
for( vtkIdType aNodeId = 0; aNodesIter->more(); aNodeId++ ){
const SMDS_MeshElement* aNode = aNodesIter->next();
- anIdList->SetId( aNodeId, mySMDS2VTKNodes[
aNode->GetID()]
);
+ anIdList->SetId( aNodeId, mySMDS2VTKNodes[
FromSmIdType<vtkIdType>(aNode->GetID())]
);
}
}
}
}
}
}
@@
-465,14
+457,15
@@
void SMESH_VisualObjDef::buildElemPrs()
// Insert cells in grid
// Insert cells in grid
-
VTKViewer_CellLocationsArray* aCellLocationsArray = VTKViewer_CellLocations
Array::New();
+
vtkIdTypeArray* aCellLocationsArray = vtkIdType
Array::New();
aCellLocationsArray->SetNumberOfComponents( 1 );
aCellLocationsArray->SetNumberOfTuples( aNbCells );
SMDS_Mesh::CheckMemory(); // PAL16631
aConnectivity->InitTraversal();
aCellLocationsArray->SetNumberOfComponents( 1 );
aCellLocationsArray->SetNumberOfTuples( aNbCells );
SMDS_Mesh::CheckMemory(); // PAL16631
aConnectivity->InitTraversal();
- for( vtkIdType idType = 0, *pts, npts; aConnectivity->GetNextCell( npts, pts ); idType++ )
+ vtkIdType const *pts(nullptr);
+ for( vtkIdType idType = 0, npts; aConnectivity->GetNextCell( npts, pts ); idType++ )
aCellLocationsArray->SetValue( idType, aConnectivity->GetTraversalLocation( npts ) );
myGrid->SetCells( aCellTypesArray, aCellLocationsArray,aConnectivity );
aCellLocationsArray->SetValue( idType, aConnectivity->GetTraversalLocation( npts ) );
myGrid->SetCells( aCellTypesArray, aCellLocationsArray,aConnectivity );
@@
-490,10
+483,10
@@
void SMESH_VisualObjDef::buildElemPrs()
// function : GetEdgeNodes
// purpose : Retrieve ids of nodes from edge of elements ( edge is numbered from 0 )
//=================================================================================
// function : GetEdgeNodes
// purpose : Retrieve ids of nodes from edge of elements ( edge is numbered from 0 )
//=================================================================================
-bool SMESH_VisualObjDef::GetEdgeNodes( const
int
theElemId,
- const int theEdgeNum,
-
int
& theNodeId1,
-
int
& theNodeId2 ) const
+bool SMESH_VisualObjDef::GetEdgeNodes( const
smIdType
theElemId,
+ const int
theEdgeNum,
+
smIdType
& theNodeId1,
+
smIdType
& theNodeId2 ) const
{
const SMDS_Mesh* aMesh = GetMesh();
if ( aMesh == 0 )
{
const SMDS_Mesh* aMesh = GetMesh();
if ( aMesh == 0 )
@@
-556,7
+549,7
@@
void SMESH_VisualObjDef::updateEntitiesFlags()
unsigned int tmp = myEntitiesState;
ClearEntitiesFlags();
unsigned int tmp = myEntitiesState;
ClearEntitiesFlags();
- map<SMDSAbs_ElementType,
int
> entities = SMESH::GetEntitiesFromObject(this);
+ map<SMDSAbs_ElementType,
::smIdType
> entities = SMESH::GetEntitiesFromObject(this);
if( myEntitiesCache[SMDSAbs_0DElement] != 0 ||
if( myEntitiesCache[SMDSAbs_0DElement] != 0 ||
@@
-627,8
+620,8
@@
SMESH_MeshObj::SMESH_MeshObj(SMESH::SMESH_Mesh_ptr theMesh):
myClient(SalomeApp_Application::orb(),theMesh)
{
myEmptyGrid = 0;
myClient(SalomeApp_Application::orb(),theMesh)
{
myEmptyGrid = 0;
- if ( MYDEBUG )
-
MESSAGE("SMESH_MeshObj - this = "<<this<<"; theMesh->_is_nil() = "<<theMesh->_is_nil());
+
+ MESSAGE("SMESH_MeshObj - this = "<<this<<"; theMesh->_is_nil() = "<<theMesh->_is_nil());
}
//=================================================================================
}
//=================================================================================
@@
-637,8
+630,7
@@
SMESH_MeshObj::SMESH_MeshObj(SMESH::SMESH_Mesh_ptr theMesh):
//=================================================================================
SMESH_MeshObj::~SMESH_MeshObj()
{
//=================================================================================
SMESH_MeshObj::~SMESH_MeshObj()
{
- if ( MYDEBUG )
- MESSAGE("SMESH_MeshObj - this = "<<this<<"\n");
+ MESSAGE("SMESH_MeshObj - this = "<<this<<"\n");
if ( myEmptyGrid )
myEmptyGrid->Delete();
}
if ( myEmptyGrid )
myEmptyGrid->Delete();
}
@@
-650,9
+642,9
@@
SMESH_MeshObj::~SMESH_MeshObj()
bool SMESH_MeshObj::Update( int theIsClear )
{
// Update SMDS_Mesh on client part
bool SMESH_MeshObj::Update( int theIsClear )
{
// Update SMDS_Mesh on client part
-
if ( MYDEBUG )
MESSAGE("SMESH_MeshObj::Update " << this);
+ MESSAGE("SMESH_MeshObj::Update " << this);
if ( myClient.Update(theIsClear) || GetUnstructuredGrid()->GetNumberOfPoints()==0) {
if ( myClient.Update(theIsClear) || GetUnstructuredGrid()->GetNumberOfPoints()==0) {
-
if ( MYDEBUG )
MESSAGE("buildPrs");
+ MESSAGE("buildPrs");
buildPrs(); // Fill unstructured grid
return true;
}
buildPrs(); // Fill unstructured grid
return true;
}
@@
-661,7
+653,7
@@
bool SMESH_MeshObj::Update( int theIsClear )
bool SMESH_MeshObj::NulData()
{
bool SMESH_MeshObj::NulData()
{
-
if ( MYDEBUG )
MESSAGE ("SMESH_MeshObj::NulData() =============================================");
+ MESSAGE ("SMESH_MeshObj::NulData() =============================================");
if (!myEmptyGrid)
{
myEmptyGrid = SMDS_UnstructuredGrid::New();
if (!myEmptyGrid)
{
myEmptyGrid = SMDS_UnstructuredGrid::New();
@@
-680,7
+672,7
@@
bool SMESH_MeshObj::NulData()
// function : GetElemDimension
// purpose : Get dimension of element
//=================================================================================
// function : GetElemDimension
// purpose : Get dimension of element
//=================================================================================
-int SMESH_MeshObj::GetElemDimension( const
int
theObjId )
+int SMESH_MeshObj::GetElemDimension( const
smIdType
theObjId )
{
const SMDS_MeshElement* anElem = myClient->FindElement( theObjId );
if ( anElem == 0 )
{
const SMDS_MeshElement* anElem = myClient->FindElement( theObjId );
if ( anElem == 0 )
@@
-702,7
+694,7
@@
int SMESH_MeshObj::GetElemDimension( const int theObjId )
// function : GetEntities
// purpose : Get entities of specified type. Return number of entities
//=================================================================================
// function : GetEntities
// purpose : Get entities of specified type. Return number of entities
//=================================================================================
-
int
SMESH_MeshObj::GetNbEntities( const SMDSAbs_ElementType theType) const
+
smIdType
SMESH_MeshObj::GetNbEntities( const SMDSAbs_ElementType theType) const
{
switch ( theType )
{
{
switch ( theType )
{
@@
-741,7
+733,7
@@
int SMESH_MeshObj::GetNbEntities( const SMDSAbs_ElementType theType) const
}
}
}
}
-
int
SMESH_MeshObj::GetEntities( const SMDSAbs_ElementType theType, TEntityList& theObjs ) const
+
smIdType
SMESH_MeshObj::GetEntities( const SMDSAbs_ElementType theType, TEntityList& theObjs ) const
{
theObjs.clear();
{
theObjs.clear();
@@
-820,7
+812,7
@@
bool SMESH_MeshObj::IsNodePrs() const
//=================================================================================
SMESH_SubMeshObj::SMESH_SubMeshObj( SMESH_MeshObj* theMeshObj )
{
//=================================================================================
SMESH_SubMeshObj::SMESH_SubMeshObj( SMESH_MeshObj* theMeshObj )
{
-
if ( MYDEBUG )
MESSAGE( "SMESH_SubMeshObj - theMeshObj = " << theMeshObj );
+ MESSAGE( "SMESH_SubMeshObj - theMeshObj = " << theMeshObj );
myMeshObj = theMeshObj;
}
myMeshObj = theMeshObj;
}
@@
-833,7
+825,7
@@
SMESH_SubMeshObj::~SMESH_SubMeshObj()
// function : GetElemDimension
// purpose : Get dimension of element
//=================================================================================
// function : GetElemDimension
// purpose : Get dimension of element
//=================================================================================
-int SMESH_SubMeshObj::GetElemDimension( const
int
theObjId )
+int SMESH_SubMeshObj::GetElemDimension( const
smIdType
theObjId )
{
return myMeshObj == 0 ? 0 : myMeshObj->GetElemDimension( theObjId );
}
{
return myMeshObj == 0 ? 0 : myMeshObj->GetElemDimension( theObjId );
}
@@
-854,7
+846,7
@@
void SMESH_SubMeshObj::UpdateFunctor( const SMESH::Controls::FunctorPtr& theFunc
//=================================================================================
bool SMESH_SubMeshObj::Update( int theIsClear )
{
//=================================================================================
bool SMESH_SubMeshObj::Update( int theIsClear )
{
- if ( MYDEBUG ) MESSAGE("SMESH_SubMeshObj::Update " << this)
+ MESSAGE("SMESH_SubMeshObj::Update " << this);
bool changed = myMeshObj->Update( theIsClear );
buildPrs(true);
return changed;
bool changed = myMeshObj->Update( theIsClear );
buildPrs(true);
return changed;
@@
-875,13
+867,13
@@
SMESH_GroupObj::SMESH_GroupObj( SMESH::SMESH_GroupBase_ptr theGroup,
: SMESH_SubMeshObj( theMeshObj ),
myGroupServer( SMESH::SMESH_GroupBase::_duplicate(theGroup) )
{
: SMESH_SubMeshObj( theMeshObj ),
myGroupServer( SMESH::SMESH_GroupBase::_duplicate(theGroup) )
{
-
if ( MYDEBUG )
MESSAGE("SMESH_GroupObj - theGroup->_is_nil() = "<<theGroup->_is_nil());
+ MESSAGE("SMESH_GroupObj - theGroup->_is_nil() = "<<theGroup->_is_nil());
myGroupServer->Register();
}
SMESH_GroupObj::~SMESH_GroupObj()
{
myGroupServer->Register();
}
SMESH_GroupObj::~SMESH_GroupObj()
{
-
if ( MYDEBUG )
MESSAGE("~SMESH_GroupObj");
+ MESSAGE("~SMESH_GroupObj");
myGroupServer->UnRegister();
}
myGroupServer->UnRegister();
}
@@
-907,13
+899,13
@@
SMDSAbs_ElementType SMESH_GroupObj::GetElementType() const
// function : getNodesFromElems
// purpose : Retrieve nodes from elements
//=================================================================================
// function : getNodesFromElems
// purpose : Retrieve nodes from elements
//=================================================================================
-static int getNodesFromElems( SMESH::
long_array_var&
theElemIds,
+static int getNodesFromElems( SMESH::
smIdType_array_var&
theElemIds,
const SMDS_Mesh* theMesh,
std::list<const SMDS_MeshElement*>& theResList )
{
set<const SMDS_MeshElement*> aNodeSet;
const SMDS_Mesh* theMesh,
std::list<const SMDS_MeshElement*>& theResList )
{
set<const SMDS_MeshElement*> aNodeSet;
- for ( CORBA::Long i = 0, n = theElemIds->length(); i < n; i++ )
+ for ( CORBA::
U
Long i = 0, n = theElemIds->length(); i < n; i++ )
{
const SMDS_MeshElement* anElem = theMesh->FindElement( theElemIds[ i ] );
if ( anElem != 0 )
{
const SMDS_MeshElement* anElem = theMesh->FindElement( theElemIds[ i ] );
if ( anElem != 0 )
@@
-928,11
+920,9
@@
static int getNodesFromElems( SMESH::long_array_var& theElemIds,
}
}
}
}
- set<const SMDS_MeshElement*>::const_iterator anIter;
- for ( anIter = aNodeSet.begin(); anIter != aNodeSet.end(); ++anIter )
- theResList.push_back( *anIter );
+ theResList.assign( aNodeSet.begin(), aNodeSet.end() );
- return
theResList.size();
+ return
(int) aNodeSet.size();
}
//=================================================================================
}
//=================================================================================
@@
-940,11
+930,11
@@
static int getNodesFromElems( SMESH::long_array_var& theElemIds,
// purpose : Get std::list<const SMDS_MeshElement*> from list of IDs
//=================================================================================
static int getPointers( const SMDSAbs_ElementType theRequestType,
// purpose : Get std::list<const SMDS_MeshElement*> from list of IDs
//=================================================================================
static int getPointers( const SMDSAbs_ElementType theRequestType,
- SMESH::
long_array_var&
theElemIds,
+ SMESH::
smIdType_array_var&
theElemIds,
const SMDS_Mesh* theMesh,
std::list<const SMDS_MeshElement*>& theResList )
{
const SMDS_Mesh* theMesh,
std::list<const SMDS_MeshElement*>& theResList )
{
- for ( CORBA::Long i = 0, n = theElemIds->length(); i < n; i++ )
+ for ( CORBA::
U
Long i = 0, n = theElemIds->length(); i < n; i++ )
{
const SMDS_MeshElement* anElem = theRequestType == SMDSAbs_Node
? theMesh->FindNode( theElemIds[ i ] ) : theMesh->FindElement( theElemIds[ i ] );
{
const SMDS_MeshElement* anElem = theRequestType == SMDSAbs_Node
? theMesh->FindNode( theElemIds[ i ] ) : theMesh->FindElement( theElemIds[ i ] );
@@
-953,7
+943,7
@@
static int getPointers( const SMDSAbs_ElementType theRequestType,
theResList.push_back( anElem );
}
theResList.push_back( anElem );
}
- return theResList.size();
+ return
(int)
theResList.size();
}
}
@@
-961,7
+951,7
@@
static int getPointers( const SMDSAbs_ElementType theRequestType,
// function : GetEntities
// purpose : Get entities of specified type. Return number of entities
//=================================================================================
// function : GetEntities
// purpose : Get entities of specified type. Return number of entities
//=================================================================================
-
int
SMESH_GroupObj::GetNbEntities( const SMDSAbs_ElementType theType) const
+
smIdType
SMESH_GroupObj::GetNbEntities( const SMDSAbs_ElementType theType) const
{
if(SMDSAbs_ElementType(myGroupServer->GetType()) == theType) {
return myGroupServer->Size();
{
if(SMDSAbs_ElementType(myGroupServer->GetType()) == theType) {
return myGroupServer->Size();
@@
-972,11
+962,11
@@
int SMESH_GroupObj::GetNbEntities( const SMDSAbs_ElementType theType) const
return 0;
}
return 0;
}
-
int
SMESH_GroupObj::GetEntities( const SMDSAbs_ElementType theType, TEntityList& theResList ) const
+
smIdType
SMESH_GroupObj::GetEntities( const SMDSAbs_ElementType theType, TEntityList& theResList ) const
{
theResList.clear();
SMDS_Mesh* aMesh = myMeshObj->GetMesh();
{
theResList.clear();
SMDS_Mesh* aMesh = myMeshObj->GetMesh();
-
+
if ( aMesh == 0 )
return 0;
if ( aMesh == 0 )
return 0;
@@
-984,7
+974,7
@@
int SMESH_GroupObj::GetEntities( const SMDSAbs_ElementType theType, TEntityList&
if ( aGrpType != theType && theType != SMDSAbs_Node )
return 0;
if ( aGrpType != theType && theType != SMDSAbs_Node )
return 0;
- SMESH::
long
_array_var anIds = myGroupServer->GetListOfID();
+ SMESH::
smIdType
_array_var anIds = myGroupServer->GetListOfID();
if ( anIds->length() == 0 )
return 0;
if ( anIds->length() == 0 )
return 0;
@@
-1012,14
+1002,14
@@
SMESH_subMeshObj::SMESH_subMeshObj( SMESH::SMESH_subMesh_ptr theSubMesh,
: SMESH_SubMeshObj( theMeshObj ),
mySubMeshServer( SMESH::SMESH_subMesh::_duplicate( theSubMesh ) )
{
: SMESH_SubMeshObj( theMeshObj ),
mySubMeshServer( SMESH::SMESH_subMesh::_duplicate( theSubMesh ) )
{
-
if ( MYDEBUG )
MESSAGE( "SMESH_subMeshObj - theSubMesh->_is_nil() = " << theSubMesh->_is_nil() );
+ MESSAGE( "SMESH_subMeshObj - theSubMesh->_is_nil() = " << theSubMesh->_is_nil() );
mySubMeshServer->Register();
}
SMESH_subMeshObj::~SMESH_subMeshObj()
{
mySubMeshServer->Register();
}
SMESH_subMeshObj::~SMESH_subMeshObj()
{
-
if ( MYDEBUG )
MESSAGE( "~SMESH_subMeshObj" );
+ MESSAGE( "~SMESH_subMeshObj" );
mySubMeshServer->UnRegister();
}
mySubMeshServer->UnRegister();
}
@@
-1027,7
+1017,7
@@
SMESH_subMeshObj::~SMESH_subMeshObj()
// function : GetEntities
// purpose : Get entities of specified type. Return number of entities
//=================================================================================
// function : GetEntities
// purpose : Get entities of specified type. Return number of entities
//=================================================================================
-
int
SMESH_subMeshObj::GetNbEntities( const SMDSAbs_ElementType theType) const
+
smIdType
SMESH_subMeshObj::GetNbEntities( const SMDSAbs_ElementType theType) const
{
switch ( theType )
{
{
switch ( theType )
{
@@
-1042,7
+1032,7
@@
int SMESH_subMeshObj::GetNbEntities( const SMDSAbs_ElementType theType) const
case SMDSAbs_Face:
case SMDSAbs_Volume:
{
case SMDSAbs_Face:
case SMDSAbs_Volume:
{
- SMESH::
long
_array_var anIds =
+ SMESH::
smIdType
_array_var anIds =
mySubMeshServer->GetElementsByType( SMESH::ElementType(theType) );
return anIds->length();
}
mySubMeshServer->GetElementsByType( SMESH::ElementType(theType) );
return anIds->length();
}
@@
-1052,7
+1042,7
@@
int SMESH_subMeshObj::GetNbEntities( const SMDSAbs_ElementType theType) const
}
}
}
}
-
int
SMESH_subMeshObj::GetEntities( const SMDSAbs_ElementType theType, TEntityList& theResList ) const
+
smIdType
SMESH_subMeshObj::GetEntities( const SMDSAbs_ElementType theType, TEntityList& theResList ) const
{
theResList.clear();
{
theResList.clear();
@@
-1066,7
+1056,7
@@
int SMESH_subMeshObj::GetEntities( const SMDSAbs_ElementType theType, TEntityLis
{
if ( theType == SMDSAbs_Node )
{
{
if ( theType == SMDSAbs_Node )
{
- SMESH::
long
_array_var anIds = mySubMeshServer->GetNodesId();
+ SMESH::
smIdType
_array_var anIds = mySubMeshServer->GetNodesId();
return getPointers( SMDSAbs_Node, anIds, aMesh, theResList );
}
}
return getPointers( SMDSAbs_Node, anIds, aMesh, theResList );
}
}
@@
-1074,12
+1064,12
@@
int SMESH_subMeshObj::GetEntities( const SMDSAbs_ElementType theType, TEntityLis
{
if ( theType == SMDSAbs_Node )
{
{
if ( theType == SMDSAbs_Node )
{
- SMESH::
long
_array_var anIds = mySubMeshServer->GetElementsId();
+ SMESH::
smIdType
_array_var anIds = mySubMeshServer->GetElementsId();
return getNodesFromElems( anIds, aMesh, theResList );
}
else
{
return getNodesFromElems( anIds, aMesh, theResList );
}
else
{
- SMESH::
long
_array_var anIds =
+ SMESH::
smIdType
_array_var anIds =
mySubMeshServer->GetElementsByType( SMESH::ElementType(theType) );
return getPointers( theType, anIds, aMesh, theResList );
}
mySubMeshServer->GetElementsByType( SMESH::ElementType(theType) );
return getPointers( theType, anIds, aMesh, theResList );
}