ForkMaster/smesh
1
0
Fork 0
mirror of https://git.salome-platform.org/gitpub/modules/smesh.git synced 2024-09-22 10:42:52 +05:00
Code Issues Packages Projects Releases Wiki Activity

IPAL52974: Find Element by Point shows nodes that do not belong to current group

Browse Source
This commit is contained in:
eap 2016-03-18 15:42:33 +03:00
parent 4ed74ad3da
commit 3ae5846f24
4 changed files with 42 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/SMESHGUI/SMESHGUI_MeshEditPreview.cxx
View File

@ -404,3 +404,14 @@ vtkUnstructuredGrid* SMESHGUI_MeshEditPreview::GetGrid() const
{
return myGrid;
}
//================================================================================
/*!
* \brief Returns myViewWindow
*/
//================================================================================
SVTK_ViewWindow* SMESHGUI_MeshEditPreview::GetViewWindow() const
{
return myViewWindow;
}

1
src/SMESHGUI/SMESHGUI_MeshEditPreview.h
View File

@ -74,6 +74,7 @@ public:
SALOME_Actor* GetActor() const;
vtkUnstructuredGrid* GetGrid() const;
SVTK_ViewWindow* GetViewWindow() const;
};
#endif // SMESHGUI_MESHEDITPREVIEW_H

30
src/SMESHUtils/SMESH_MeshAlgos.cxx
View File

@ -60,7 +60,8 @@ struct SMESH_NodeSearcherImpl: public SMESH_NodeSearcher
/*!
* \brief Constructor
*/
SMESH_NodeSearcherImpl( const SMDS_Mesh* theMesh )
SMESH_NodeSearcherImpl( const SMDS_Mesh* theMesh = 0,
SMDS_ElemIteratorPtr theElemIt = SMDS_ElemIteratorPtr() )
{
myMesh = ( SMDS_Mesh* ) theMesh;
@ -70,6 +71,14 @@ struct SMESH_NodeSearcherImpl: public SMESH_NodeSearcher
while ( nIt->more() )
nodes.insert( nodes.end(), nIt->next() );
}
else if ( theElemIt )
{
while ( theElemIt->more() )
{
const SMDS_MeshElement* e = theElemIt->next();
nodes.insert( e->begin_nodes(), e->end_nodes() );
}
}
myOctreeNode = new SMESH_OctreeNode(nodes) ;
// get max size of a leaf box
@ -714,8 +723,12 @@ FindElementsByPoint(const gp_Pnt& point,
if ( type == SMDSAbs_Node || type == SMDSAbs_0DElement || type == SMDSAbs_Ball)
{
if ( !_nodeSearcher )
_nodeSearcher = new SMESH_NodeSearcherImpl( _mesh );
{
if ( _meshPartIt )
_nodeSearcher = new SMESH_NodeSearcherImpl( 0, _meshPartIt );
else
_nodeSearcher = new SMESH_NodeSearcherImpl( _mesh );
}
std::vector< const SMDS_MeshNode* > foundNodes;
_nodeSearcher->FindNearPoint( point, tolerance, foundNodes );
@ -1695,6 +1708,17 @@ SMESH_NodeSearcher* SMESH_MeshAlgos::GetNodeSearcher(SMDS_Mesh& mesh)
return new SMESH_NodeSearcherImpl( &mesh );
}
//=======================================================================
/*!
* \brief Return SMESH_NodeSearcher
*/
//=======================================================================
SMESH_NodeSearcher* SMESH_MeshAlgos::GetNodeSearcher(SMDS_ElemIteratorPtr elemIt)
{
return new SMESH_NodeSearcherImpl( 0, elemIt );
}
//=======================================================================
/*!
* \brief Return SMESH_ElementSearcher

3
src/SMESHUtils/SMESH_MeshAlgos.hxx
View File

@ -159,6 +159,9 @@ namespace SMESH_MeshAlgos
SMESHUtils_EXPORT
SMESH_NodeSearcher* GetNodeSearcher( SMDS_Mesh& mesh );
SMESHUtils_EXPORT
SMESH_NodeSearcher* GetNodeSearcher( SMDS_ElemIteratorPtr elemIt );
/*!
* \brief Return SMESH_ElementSearcher. The caller is responsible for deleting it
*/