From 631ad5cae215a7f35f781dbf2d92b6454d50ac3a Mon Sep 17 00:00:00 2001 From: eap Date: Tue, 21 Sep 2010 07:48:09 +0000 Subject: [PATCH] Correct name of an argument static int GetOrderedEdges (const TopoDS_Face& theFace, TopoDS_Vertex theFirstVertex, std::list< TopoDS_Edge >& theEdges, - std::list< int > & theNbVertexInWires, + std::list< int > & theNbEdgesInWires, const bool theShapeAnalysisAlgo=false); --- src/SMESH/SMESH_Block.cxx | 10 +++++----- src/SMESH/SMESH_Block.hxx | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/SMESH/SMESH_Block.cxx b/src/SMESH/SMESH_Block.cxx index b26cfbd9a..6d20d6be8 100644 --- a/src/SMESH/SMESH_Block.cxx +++ b/src/SMESH/SMESH_Block.cxx @@ -960,7 +960,7 @@ int SMESH_Block::GetShapeIDByParams ( const gp_XYZ& theCoord ) * \param theFirstVertex - the vertex of the outer wire to set first in the returned * list ( theFirstVertex may be NULL ) * \param theEdges - all ordered edges of theFace (outer edges goes first). - * \param theNbVertexInWires - nb of vertices (== nb of edges) in each wire + * \param theNbEdgesInWires - nb of edges (== nb of vertices in closed wire) in each wire * \param theShapeAnalysisAlgo - if true, ShapeAnalysis::OuterWire() is used to find * the outer wire else BRepTools::OuterWire() is used. * \retval int - nb of wires @@ -974,7 +974,7 @@ int SMESH_Block::GetShapeIDByParams ( const gp_XYZ& theCoord ) int SMESH_Block::GetOrderedEdges (const TopoDS_Face& theFace, TopoDS_Vertex theFirstVertex, list< TopoDS_Edge >& theEdges, - list< int > & theNbVertexInWires, + list< int > & theNbEdgesInWires, const bool theShapeAnalysisAlgo) { // put wires in a list, so that an outer wire comes first @@ -991,7 +991,7 @@ int SMESH_Block::GetOrderedEdges (const TopoDS_Face& theFace, } // loop on edges of wires - theNbVertexInWires.clear(); + theNbEdgesInWires.clear(); list::iterator wlIt = aWireList.begin(); for ( ; wlIt != aWireList.end(); wlIt++ ) { @@ -1009,7 +1009,7 @@ int SMESH_Block::GetOrderedEdges (const TopoDS_Face& theFace, for ( TopoDS_Iterator e( *wlIt ); e.More(); e.Next(), ++iE ) theEdges.push_back( TopoDS::Edge( e.Value() )); } - theNbVertexInWires.push_back( iE ); + theNbEdgesInWires.push_back( iE ); iE = 0; if ( wlIt == aWireList.begin() && theEdges.size() > 1 ) { // the outer wire // orient closed edges @@ -1047,7 +1047,7 @@ int SMESH_Block::GetOrderedEdges (const TopoDS_Face& theFace, theEdges.splice(theEdges.end(), theEdges, theEdges.begin(), ++theEdges.begin()); TopExp::Vertices( theEdges.front(), vv[0], vv[1], true ); - if ( iE++ > theNbVertexInWires.back() ) { + if ( iE++ > theNbEdgesInWires.back() ) { #ifdef _DEBUG_ gp_Pnt p = BRep_Tool::Pnt( theFirstVertex ); MESSAGE ( " : Warning : vertex "<< theFirstVertex.TShape().operator->() diff --git a/src/SMESH/SMESH_Block.hxx b/src/SMESH/SMESH_Block.hxx index f3d951069..4851c0eaf 100644 --- a/src/SMESH/SMESH_Block.hxx +++ b/src/SMESH/SMESH_Block.hxx @@ -277,7 +277,7 @@ public: static int GetOrderedEdges (const TopoDS_Face& theFace, TopoDS_Vertex theFirstVertex, std::list< TopoDS_Edge >& theEdges, - std::list< int > & theNbVertexInWires, + std::list< int > & theNbEdgesInWires, const bool theShapeAnalysisAlgo=false); // Return nb wires and a list of oredered edges. // It is used to assign indices to subshapes.