X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FSMESHUtils%2FSMESH_MAT2d.hxx;h=fbaac9eaee7b76bda3479c100fca9c8fd4d52e83;hb=7646a7f54e99134575c14521e60b6fa8c2418201;hp=eff5c10d5e7ef733116483d36b9f1f302b701a29;hpb=67909c435c61c79a648ca9beee02b77c68657e5b;p=modules%2Fsmesh.git diff --git a/src/SMESHUtils/SMESH_MAT2d.hxx b/src/SMESHUtils/SMESH_MAT2d.hxx index eff5c10d5..fbaac9eae 100644 --- a/src/SMESHUtils/SMESH_MAT2d.hxx +++ b/src/SMESHUtils/SMESH_MAT2d.hxx @@ -1,4 +1,4 @@ -// Copyright (C) 2007-2015 CEA/DEN, EDF R&D, OPEN CASCADE +// Copyright (C) 2007-2016 CEA/DEN, EDF R&D, OPEN CASCADE // // Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN, // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS @@ -82,7 +82,8 @@ namespace SMESH_MAT2d std::size_t _iEdge; // MA edge index within the branch double _edgeParam; // normalized param within the MA edge - BranchPoint(): _branch(0), _iEdge(0), _edgeParam(-1) {} + BranchPoint( const Branch* b = 0, std::size_t e = 0, double u = -1 ): + _branch(b), _iEdge(e), _edgeParam(u) {} }; //------------------------------------------------------------------------------------- /*! @@ -119,9 +120,9 @@ namespace SMESH_MAT2d public: // internal: construction - void init( std::vector& maEdges, - const Boundary* boundary, - std::map< const TVDVertex*, BranchEndType > endType); + void init( std::vector& maEdges, + const Boundary* boundary, + std::map< const TVDVertex*, BranchEndType >& endType); void setBranchesToEnds( const std::vector< Branch >& branches); BranchPoint getPoint( const TVDVertex* vertex ) const; void setRemoved( const BranchPoint& proxyPoint ); @@ -180,6 +181,8 @@ namespace SMESH_MAT2d bool getBranchPoint( const std::size_t iEdge, double u, BranchPoint& p ) const; + bool getBranchPoint( const BoundaryPoint& bp, BranchPoint& p ) const; + bool isConcaveSegment( std::size_t iEdge, std::size_t iSeg ) const; bool moveToClosestEdgeEnd( BoundaryPoint& bp ) const;