ForkMaster/smesh
1
0
Fork 0
mirror of https://git.salome-platform.org/gitpub/modules/smesh.git synced 2024-12-29 10:50:34 +05:00
Code Issues Packages Projects Releases Wiki Activity

Fix for id shitf +2147483647

Browse Source
This commit is contained in:
eap 2021-03-03 18:34:42 +03:00
parent 9216aa146e
commit 44811efade
3 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/SMDS/SMDS_ElementFactory.cxx
View File

@ -39,8 +39,6 @@ namespace
const int theDefaultShapeDim = 3; const int theDefaultShapeDim = 3;
const smIdType idShift = 2147483647;
// classes allowing to modify parameters of SMDS_Position stored in SMDS_ElementFactory // classes allowing to modify parameters of SMDS_Position stored in SMDS_ElementFactory
struct _EdgePosition : public SMDS_EdgePosition struct _EdgePosition : public SMDS_EdgePosition
@ -230,7 +228,7 @@ const SMDS_MeshElement* SMDS_ElementFactory::FindElement( const smIdType ID ) co
smIdType SMDS_ElementFactory::FromVtkToSmds( vtkIdType VTKID ) smIdType SMDS_ElementFactory::FromVtkToSmds( vtkIdType VTKID )
{ {
vtkIdType vtkID = VTKID - idShift; vtkIdType vtkID = VTKID;
if ( vtkID >= 0 && vtkID < (vtkIdType)mySmdsIDs.size() ) if ( vtkID >= 0 && vtkID < (vtkIdType)mySmdsIDs.size() )
return mySmdsIDs[vtkID] + 1; return mySmdsIDs[vtkID] + 1;
return vtkID + 1 + idShift; return vtkID + 1 + idShift;
@ -251,7 +249,7 @@ void SMDS_ElementFactory::Free( const SMDS_MeshElement* e )
if ( !myVtkIDs.empty() ) if ( !myVtkIDs.empty() )
{ {
size_t id = e->GetID() - 1 - idShift; size_t id = e->GetID() - 1 - idShift;
size_t vtkID = e->GetVtkID() - idShift; size_t vtkID = e->GetVtkID();
if ( id < myVtkIDs.size() ) if ( id < myVtkIDs.size() )
myVtkIDs[ id ] = -1; myVtkIDs[ id ] = -1;
if ( vtkID < mySmdsIDs.size() ) if ( vtkID < mySmdsIDs.size() )

6
src/SMDS/SMDS_ElementFactory.hxx
View File

@ -53,6 +53,10 @@ struct _ChunkCompare {
typedef boost::ptr_vector<SMDS_ElementChunk> TChunkVector; typedef boost::ptr_vector<SMDS_ElementChunk> TChunkVector;
typedef std::set<SMDS_ElementChunk*,_ChunkCompare> TChunkPtrSet; typedef std::set<SMDS_ElementChunk*,_ChunkCompare> TChunkPtrSet;
const smIdType idShift = 2147483647;
//------------------------------------------------------------------------------------ //------------------------------------------------------------------------------------
/*! /*!
* \brief Allocate SMDS_MeshElement's (SMDS_MeshCell's or SMDS_MeshNode's ) * \brief Allocate SMDS_MeshElement's (SMDS_MeshCell's or SMDS_MeshNode's )
@ -565,7 +569,7 @@ SMDS_ElementFactory::GetShapeIterator( int shapeID,
size_t nbElemsToReturn, size_t nbElemsToReturn,
const SMDS_MeshElement* sm1stElem ) const SMDS_MeshElement* sm1stElem )
{ {
smIdType iChunk = sm1stElem ? (( sm1stElem->GetID() - 1 ) / ChunkSize()) : 0; smIdType iChunk = sm1stElem ? (( sm1stElem->GetID() - 1 - idShift) / ChunkSize()) : 0;
typedef _ChunkIterator< ElemIterator, TSubIDRangeSet > TChuckIterator; typedef _ChunkIterator< ElemIterator, TSubIDRangeSet > TChuckIterator;
return boost::make_shared< TChuckIterator >( myChunks, return boost::make_shared< TChuckIterator >( myChunks,
& SMDS_ElementChunk::GetSubIDRangesMinMax, & SMDS_ElementChunk::GetSubIDRangesMinMax,

2
src/SMDS/SMDS_Mesh.cxx
View File

@ -1000,7 +1000,7 @@ const SMDS_MeshNode * SMDS_Mesh::FindNode(smIdType ID) const
/////////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////////
const SMDS_MeshNode * SMDS_Mesh::FindNodeVtk(vtkIdType vtkId) const const SMDS_MeshNode * SMDS_Mesh::FindNodeVtk(vtkIdType vtkId) const
{ {
return myNodeFactory->FindNode( vtkId + 1 ); return myNodeFactory->FindNode( FromVtkToSmds( vtkId ));
} }
const SMDS_MeshElement * SMDS_Mesh::FindElementVtk(vtkIdType IDelem) const const SMDS_MeshElement * SMDS_Mesh::FindElementVtk(vtkIdType IDelem) const