X-Git-Url: http://git.salome-platform.org/gitweb/?p=modules%2Fsmesh.git;a=blobdiff_plain;f=src%2FSMESH%2FSMESH_Pattern.hxx;h=fbdc83a09e8e8cf5bddeae5478b92d034f682af2;hp=ee87cbfb85d46582e2d9c97de759740a5458ca6b;hb=499f29d24922cec66e41b41a0039a954993bc6df;hpb=0635c9fc80f67d1e5dc0e94ec85f487286a92070 diff --git a/src/SMESH/SMESH_Pattern.hxx b/src/SMESH/SMESH_Pattern.hxx index ee87cbfb8..fbdc83a09 100644 --- a/src/SMESH/SMESH_Pattern.hxx +++ b/src/SMESH/SMESH_Pattern.hxx @@ -1,24 +1,25 @@ -// Copyright (C) 2007-2008 CEA/DEN, EDF R&D, OPEN CASCADE +// Copyright (C) 2007-2022 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 +// Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN, +// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS // -// This library is free software; you can redistribute it and/or -// modify it under the terms of the GNU Lesser General Public -// License as published by the Free Software Foundation; either -// version 2.1 of the License. +// This library is free software; you can redistribute it and/or +// modify it under the terms of the GNU Lesser General Public +// License as published by the Free Software Foundation; either +// version 2.1 of the License, or (at your option) any later version. // -// This library is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -// Lesser General Public License for more details. +// This library is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +// Lesser General Public License for more details. // -// You should have received a copy of the GNU Lesser General Public -// License along with this library; if not, write to the Free Software -// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +// You should have received a copy of the GNU Lesser General Public +// License along with this library; if not, write to the Free Software +// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // -// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // + // File : SMESH_Pattern.hxx // Created : Mon Aug 2 10:30:00 2004 // Author : Edward AGAPOV (eap) @@ -34,7 +35,7 @@ #include #include -#include +#include #include #include #include @@ -47,7 +48,6 @@ class SMDS_MeshNode; class SMESH_Mesh; class SMESHDS_SubMesh; class TopoDS_Shell; -class TopoDS_Vertex; class TopoDS_Face; class TopoDS_Edge; @@ -70,13 +70,16 @@ class SMESH_EXPORT SMESH_Pattern { bool Load (SMESH_Mesh* theMesh, const TopoDS_Face& theFace, - bool theProject = false); + bool theProject = false, + TopoDS_Vertex the1stVertex=TopoDS_Vertex(), + bool theKeepNodes = false ); // Create a pattern from the mesh built on . // ==true makes override nodes positions // on computed by mesher bool Load (SMESH_Mesh* theMesh, - const TopoDS_Shell& theBlock); + const TopoDS_Shell& theBlock, + bool theKeepNodes = false); // Create a pattern from the mesh built on bool Save (std::ostream& theFile); @@ -175,11 +178,11 @@ class SMESH_EXPORT SMESH_Pattern { ERR_LOADF_CANT_PROJECT, // impossible to project nodes // Load(volume) ERR_LOADV_BAD_SHAPE, // volume is not a brick of 6 faces - ERR_LOADV_COMPUTE_PARAMS, // cant compute point parameters + ERR_LOADV_COMPUTE_PARAMS, // can't compute point parameters // Apply(shape) ERR_APPL_NOT_COMPUTED, // mapping failed ERR_APPL_NOT_LOADED, // pattern was not loaded - ERR_APPL_BAD_DIMENTION, // wrong shape dimention + ERR_APPL_BAD_DIMENTION, // wrong shape dimension ERR_APPL_BAD_NB_VERTICES, // keypoints - vertices mismatch // Apply(face) ERR_APPLF_BAD_TOPOLOGY, // bad pattern topology @@ -190,7 +193,9 @@ class SMESH_EXPORT SMESH_Pattern { // Apply(mesh_face) ERR_APPLF_BAD_FACE_GEOM, // bad face geometry // MakeMesh - ERR_MAKEM_NOT_COMPUTED // mapping failed + ERR_MAKEM_NOT_COMPUTED, // mapping failed + //Unexpected error + ERR_UNEXPECTED // Unexpected of the pattern mapping algorithm }; ErrorCode GetErrorCode() const { return myErrorCode; } @@ -213,6 +218,11 @@ class SMESH_EXPORT SMESH_Pattern { { return myElemXYZIDs.empty() || !applied ? myElemPointIDs : myElemXYZIDs; } // Return nodal connectivity of the elements of the pattern + void GetInOutNodes( std::vector< const SMDS_MeshNode* > *& inNodes, + std::vector< const SMDS_MeshNode* > *& outNodes ) + { inNodes = & myInNodes; outNodes = & myOutNodes; } + // Return loaded and just created nodes + void DumpPoints() const; // Debug @@ -231,7 +241,7 @@ private: // private methods struct TPoint { - gp_XYZ myInitXYZ; // loaded postion + gp_XYZ myInitXYZ; // loaded position gp_XY myInitUV; double myInitU; // [0,1] gp_Pnt myXYZ; // position to compute @@ -241,8 +251,7 @@ private: }; friend std::ostream & operator <<(std::ostream & OS, const TPoint& p); - bool setErrorCode( const ErrorCode theErrorCode ) - { myErrorCode = theErrorCode; return myErrorCode == ERR_OK; } + bool setErrorCode( const ErrorCode theErrorCode ); // set ErrorCode and return true if it is Ok bool setShapeToMesh(const TopoDS_Shape& theShape); @@ -251,8 +260,8 @@ private: std::list< TPoint* > & getShapePoints(const TopoDS_Shape& theShape); // Return list of points located on theShape. // A list of edge-points include vertex-points (for 2D pattern only). - // A list of face-points doesnt include edge-points. - // A list of volume-points doesnt include face-points. + // A list of face-points doesn't include edge-points. + // A list of volume-points doesn't include face-points. std::list< TPoint* > & getShapePoints(const int theShapeID); // Return list of points located on the shape @@ -332,6 +341,12 @@ private: void clearMesh(SMESH_Mesh* theMesh) const; // clear mesh elements existing on myShape in theMesh + bool findExistingNodes( SMESH_Mesh* mesh, + const TopoDS_Shape& S, + const std::list< TPoint* > & points, + std::vector< const SMDS_MeshNode* > & nodes); + // fills nodes vector with nodes existing on a given shape + static SMESHDS_SubMesh * getSubmeshWithElements(SMESH_Mesh* theMesh, const TopoDS_Shape& theShape); // return submesh containing elements bound to theShape in theMesh @@ -354,13 +369,17 @@ private: // all functions assure that shapes are indexed so that first go // ordered vertices, then ordered edge, then faces and maybe a shell TopTools_IndexedMapOfOrientedShape myShapeIDMap; - std::map< int, std::list< TPoint* > > myShapeIDToPointsMap; + std::map< int, std::list< TPoint*> > myShapeIDToPointsMap; // for the 2d case: // nb of key-points in each of pattern boundaries std::list< int > myNbKeyPntInBoundary; - + // nodes corresponding to myPoints + bool myToKeepNodes; // to keep these data + std::vector< const SMDS_MeshNode* > myInNodes; // loaded nodes + std::vector< const SMDS_MeshNode* > myOutNodes; // created nodes + // to compute while applying to mesh elements, not to shapes std::vector myXYZ; // XYZ of nodes to create @@ -369,7 +388,7 @@ private: std::vector myElements; // refined elements std::vector myOrderedNodes; - // elements to replace with polygon or polyhedron + // elements to replace with polygon or polyhedron std::vector myPolyElems; // definitions of new poly elements std::list< TElemDef > myPolyElemXYZIDs;