X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FStdMeshers%2FStdMeshers_ProjectionUtils.hxx;h=d44e477f0ddd5a4bdc83018bd90ba04ccd86ba08;hb=c150e1e4c40479c83b47cfb732f240c5df3b5d62;hp=31afb072f55f7c5ca029bc2f599f83bc329a12b5;hpb=b1f58b701eb4ec6fb4a14b070041f2c89e44723c;p=modules%2Fsmesh.git diff --git a/src/StdMeshers/StdMeshers_ProjectionUtils.hxx b/src/StdMeshers/StdMeshers_ProjectionUtils.hxx index 31afb072f..d44e477f0 100644 --- a/src/StdMeshers/StdMeshers_ProjectionUtils.hxx +++ b/src/StdMeshers/StdMeshers_ProjectionUtils.hxx @@ -1,4 +1,4 @@ -// Copyright (C) 2007-2014 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 @@ -30,10 +30,19 @@ #include "SMESH_StdMeshers.hxx" +#include "StdMeshers_FaceSide.hxx" +#include "SMDS_MeshElement.hxx" + +#include +#include #include +#include +#include #include -#include #include +#include +#include +#include #include #include @@ -43,8 +52,6 @@ class SMESH_Algo; class SMESH_Hypothesis; class SMESH_Mesh; class SMESH_subMesh; -class TopTools_IndexedDataMapOfShapeListOfShape; -class TopTools_IndexedMapOfShape; class TopoDS_Shape; /*! @@ -55,6 +62,10 @@ struct StdMeshers_ShapeShapeBiDirectionMap { TopTools_DataMapOfShapeShape _map1to2, _map2to1; + enum EAssocType { + UNDEF, INIT_VERTEX, PROPAGATION, PARTNER, CLOSE_VERTEX, COMMON_VERTEX, FEW_EF }; + EAssocType _assocType; + // convention: s1 - target, s2 - source bool Bind( const TopoDS_Shape& s1, const TopoDS_Shape& s2 ) { _map1to2.Bind( s1, s2 ); return _map2to1.Bind( s2, s1 ); } @@ -68,6 +79,8 @@ struct StdMeshers_ShapeShapeBiDirectionMap // passes incorrect isShape2 return (isShape2 ? _map2to1 : _map1to2)( s ); } + StdMeshers_ShapeShapeBiDirectionMap() : _assocType( UNDEF ) {} + void SetAssocType( EAssocType type ) { if ( _assocType == UNDEF ) _assocType = type; } }; /*! @@ -77,7 +90,81 @@ namespace StdMeshers_ProjectionUtils { typedef StdMeshers_ShapeShapeBiDirectionMap TShapeShapeMap; typedef TopTools_IndexedDataMapOfShapeListOfShape TAncestorMap; - typedef std::map TNodeNodeMap; + typedef std::map TNodeNodeMap; + + + /*! + * \brief Finds transformation between two sets of 2D points using + * a least square approximation + */ + class TrsfFinder2D + { + gp_GTrsf2d _trsf; + gp_XY _srcOrig; + public: + TrsfFinder2D(): _srcOrig(0,0) {} + + void Set( const gp_GTrsf2d& t ) { _trsf = t; } // it's an alternative to Solve() + + bool Solve( const std::vector< gp_XY >& srcPnts, + const std::vector< gp_XY >& tgtPnts ); + + gp_XY Transform( const gp_Pnt2d& srcUV ) const; + + bool IsIdentity() const { return ( _trsf.Form() == gp_Identity ); } + }; + /*! + * \brief Finds transformation between two sets of 3D points using + * a least square approximation + */ + class TrsfFinder3D + { + gp_GTrsf _trsf; + gp_XYZ _srcOrig; + public: + TrsfFinder3D(): _srcOrig(0,0,0) {} + + void Set( const gp_GTrsf& t ) { _trsf = t; } // it's an alternative to Solve() + + bool Solve( const std::vector< gp_XYZ > & srcPnts, + const std::vector< gp_XYZ > & tgtPnts ); + + gp_XYZ Transform( const gp_Pnt& srcP ) const; + + gp_XYZ TransformVec( const gp_Vec& v ) const; + + bool IsIdentity() const { return ( _trsf.Form() == gp_Identity ); } + + bool Invert(); + }; + + /*! + * \brief Morph mesh on the target FACE to lie within FACE boundary w/o distortion + */ + class Morph + { + std::vector< const SMDS_MeshNode* > _bndSrcNodes; + Handle(BRepMesh_DataStructureOfDelaun) _triaDS; + SMESH_subMesh* _srcSubMesh; + bool _moveAll; + gp_XY _scale; + public: + + Morph(const TSideVector& srcWires); + + bool Perform(SMESH_MesherHelper& tgtHelper, + const TSideVector& tgtWires, + Handle(ShapeAnalysis_Surface) tgtSurface, + const TNodeNodeMap& src2tgtNodes, + const bool moveAll); + + // return source boundary nodes. 0-th node is zero + const std::vector< const SMDS_MeshNode* >& GetBndNodes() const { return _bndSrcNodes; } + + // return UV of the i-th source boundary node + gp_XY GetBndUV(const int iNode) const; + }; /*! * \brief Looks for association of all sub-shapes of two shapes @@ -97,20 +184,22 @@ namespace StdMeshers_ProjectionUtils /*! * \brief Find association of edges of faces - * \param face1 - face 1 - * \param VV1 - vertices of face 1 - * \param face2 - face 2 - * \param VV2 - vertices of face 2 associated with oned of face 1 - * \param edges1 - out list of edges of face 1 - * \param edges2 - out list of edges of face 2 - * \retval int - nb of edges in an outer wire in a success case, else zero + * \param face1 - face 1 + * \param VV1 - vertices of face 1 + * \param face2 - face 2 + * \param VV2 - vertices of face 2 associated with oned of face 1 + * \param edges1 - out list of edges of face 1 + * \param edges2 - out list of edges of face 2 + * \param isClosenessAssoc - is association starting by VERTEX closeness + * \retval int - nb of edges in an outer wire in a success case, else zero */ int FindFaceAssociation(const TopoDS_Face& face1, TopoDS_Vertex VV1[2], const TopoDS_Face& face2, TopoDS_Vertex VV2[2], std::list< TopoDS_Edge > & edges1, - std::list< TopoDS_Edge > & edges2); + std::list< TopoDS_Edge > & edges2, + const bool isClosenessAssoc=false); /*! * \brief Insert vertex association defined by a hypothesis into a map