From: eap Date: Tue, 17 Dec 2013 08:16:13 +0000 (+0000) Subject: 0022362: EDF SMESH: Quadrangle (mapping) algorithm: enforced vertices X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=5ee62cf3f5567726e76f73cd48b3f9a859f0330a;p=modules%2Fsmesh.git 0022362: EDF SMESH: Quadrangle (mapping) algorithm: enforced vertices typedef struct uvPtStruct { + inline gp_XY UV() const { return gp_XY( u, v ); } --- diff --git a/src/SMESHUtils/SMESH_TypeDefs.hxx b/src/SMESHUtils/SMESH_TypeDefs.hxx index 2555cc371..6e5bda2a5 100644 --- a/src/SMESHUtils/SMESH_TypeDefs.hxx +++ b/src/SMESHUtils/SMESH_TypeDefs.hxx @@ -29,9 +29,10 @@ #include "SMESH_Utils.hxx" -#include +#include "SMDS_MeshNode.hxx" #include +#include #include #include @@ -42,7 +43,7 @@ typedef std::map, TIDCompare > TElemOfElemListMap; typedef std::map, TIDCompare > TElemOfNodeListMap; -typedef std::map TNodeNodeMap; +typedef std::map TNodeNodeMap; //!< Set of elements sorted by ID, to be used to assure predictability of edition typedef std::set< const SMDS_MeshElement*, TIDCompare > TIDSortedElemSet; @@ -50,8 +51,8 @@ typedef std::set< const SMDS_MeshNode*, TIDCompare > TIDSortedNodeSet; typedef std::pair< const SMDS_MeshNode*, const SMDS_MeshNode* > NLink; -struct faceQuadStruct; // defined in StdMeshers_Quadrangle_2D.hxx -typedef boost::shared_ptr TFaceQuadStructPtr; +struct FaceQuadStruct; // defined in StdMeshers_Quadrangle_2D.hxx +typedef boost::shared_ptr TFaceQuadStructPtr; namespace SMESHUtils @@ -137,6 +138,10 @@ typedef struct uvPtStruct double x, y; // 2d parameter, normalized [0,1] const SMDS_MeshNode * node; + uvPtStruct(): node(NULL) {} + + inline gp_XY UV() const { return gp_XY( u, v ); } + struct NodeAccessor // accessor to iterate on nodes in UVPtStructVec { static const SMDS_MeshNode* value(std::vector< uvPtStruct >::const_iterator it)