mirror of
https://git.salome-platform.org/gitpub/modules/smesh.git
synced 2025-02-10 21:53:06 +05:00
Corrected for PAL13626.
New method GetShapeIDForElem() is added. Mehtod GetShapeID() is changed.
This commit is contained in:
parent
80c143d3ef
commit
6a2b47a7b0
@ -49,6 +49,7 @@
|
|||||||
//#include "SMDS_ElemIterator.hxx"
|
//#include "SMDS_ElemIterator.hxx"
|
||||||
#include "SMDS_VolumeTool.hxx"
|
#include "SMDS_VolumeTool.hxx"
|
||||||
#include "SMESH_MesherHelper.hxx"
|
#include "SMESH_MesherHelper.hxx"
|
||||||
|
#include "SMESH_MeshEditor.hxx"
|
||||||
|
|
||||||
// OCCT Includes
|
// OCCT Includes
|
||||||
#include <OSD_Path.hxx>
|
#include <OSD_Path.hxx>
|
||||||
@ -1857,9 +1858,7 @@ SMESH::long_array* SMESH_Mesh_i::GetNodeInverseElements(const CORBA::Long id)
|
|||||||
//=============================================================================
|
//=============================================================================
|
||||||
/*!
|
/*!
|
||||||
* If given element is node returns IDs of shape from position
|
* If given element is node returns IDs of shape from position
|
||||||
* else - return ID of result shape after ::FindShape()
|
* If there is not node for given ID - returns -1
|
||||||
* from SMESH_MeshEditor
|
|
||||||
* If there is not element for given ID - returns -1
|
|
||||||
*/
|
*/
|
||||||
//=============================================================================
|
//=============================================================================
|
||||||
|
|
||||||
@ -1879,12 +1878,35 @@ CORBA::Long SMESH_Mesh_i::GetShapeID(const CORBA::Long id)
|
|||||||
return pos->GetShapeId();
|
return pos->GetShapeId();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
return -1;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
//=============================================================================
|
||||||
|
/*!
|
||||||
|
* For given element returns ID of result shape after
|
||||||
|
* ::FindShape() from SMESH_MeshEditor
|
||||||
|
* If there is not element for given ID - returns -1
|
||||||
|
*/
|
||||||
|
//=============================================================================
|
||||||
|
|
||||||
|
CORBA::Long SMESH_Mesh_i::GetShapeIDForElem(const CORBA::Long id)
|
||||||
|
{
|
||||||
|
SMESHDS_Mesh* aSMESHDS_Mesh = _impl->GetMeshDS();
|
||||||
|
if ( aSMESHDS_Mesh == NULL )
|
||||||
|
return -1;
|
||||||
|
|
||||||
// try to find element
|
// try to find element
|
||||||
const SMDS_MeshElement* elem = aSMESHDS_Mesh->FindElement(id);
|
const SMDS_MeshElement* elem = aSMESHDS_Mesh->FindElement(id);
|
||||||
if(!elem)
|
if(!elem)
|
||||||
return -1;
|
return -1;
|
||||||
|
|
||||||
// need implementation???????????????????????????????????????????????
|
//SMESH::SMESH_MeshEditor_var aMeshEditor = SMESH_Mesh_i::GetMeshEditor();
|
||||||
|
::SMESH_MeshEditor aMeshEditor(_impl);
|
||||||
|
int index = aMeshEditor.FindShape( elem );
|
||||||
|
if(index>0)
|
||||||
|
return index;
|
||||||
|
|
||||||
return -1;
|
return -1;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -321,12 +321,17 @@ public:
|
|||||||
|
|
||||||
/*!
|
/*!
|
||||||
* If given element is node returns IDs of shape from position
|
* If given element is node returns IDs of shape from position
|
||||||
* else - return ID of result shape after ::FindShape()
|
* If there is not node for given ID - returns -1
|
||||||
* from SMESH_MeshEditor
|
|
||||||
* If there is not element for given ID - returns -1
|
|
||||||
*/
|
*/
|
||||||
CORBA::Long GetShapeID(const CORBA::Long id);
|
CORBA::Long GetShapeID(const CORBA::Long id);
|
||||||
|
|
||||||
|
/*!
|
||||||
|
* For given element returns ID of result shape after
|
||||||
|
* ::FindShape() from SMESH_MeshEditor
|
||||||
|
* If there is not element for given ID - returns -1
|
||||||
|
*/
|
||||||
|
CORBA::Long GetShapeIDForElem(const CORBA::Long id);
|
||||||
|
|
||||||
/*!
|
/*!
|
||||||
* Returns number of nodes for given element
|
* Returns number of nodes for given element
|
||||||
* If there is not element for given ID - returns -1
|
* If there is not element for given ID - returns -1
|
||||||
|
Loading…
Reference in New Issue
Block a user