X-Git-Url: http://git.salome-platform.org/gitweb/?p=modules%2Fsmesh.git;a=blobdiff_plain;f=src%2FStdMeshers%2FStdMeshers_RadialQuadrangle_1D2D.hxx;h=7270cba40d28c67a3d7340c6c30c7a7709052eaa;hp=9275b85f9f103ef279f29648e21595750cb8c576;hb=1cea00918546e5ab79c0d74d49d7820d431f3c85;hpb=251f8c052dd12dd29922210dc901b295fe999a0e diff --git a/src/StdMeshers/StdMeshers_RadialQuadrangle_1D2D.hxx b/src/StdMeshers/StdMeshers_RadialQuadrangle_1D2D.hxx index 9275b85f9..7270cba40 100644 --- a/src/StdMeshers/StdMeshers_RadialQuadrangle_1D2D.hxx +++ b/src/StdMeshers/StdMeshers_RadialQuadrangle_1D2D.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 // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public @@ -24,20 +24,19 @@ #ifndef _SMESH_RadialQuadrangle_1D2D_HXX_ #define _SMESH_RadialQuadrangle_1D2D_HXX_ -#include "SMESH_StdMeshers.hxx" - -#include "SMESH_Algo.hxx" - -#include +#include "StdMeshers_Quadrangle_2D.hxx" #include class StdMeshers_NumberOfLayers; class StdMeshers_LayerDistribution; -class SMESH_MesherHelper; -class gp_Pnt; -class STDMESHERS_EXPORT StdMeshers_RadialQuadrangle_1D2D: public SMESH_2D_Algo +/*! + * \brief Algorithm generating quadrangles on a full or a part of an elliptic face. + * Elements around an ellipse center are triangles. + */ + +class STDMESHERS_EXPORT StdMeshers_RadialQuadrangle_1D2D: public StdMeshers_Quadrangle_2D { public: StdMeshers_RadialQuadrangle_1D2D(int hypId, int studyId, SMESH_Gen* gen); @@ -63,16 +62,14 @@ public: protected: - bool computeLayerPositions(const gp_Pnt& p1, - const gp_Pnt& p2, - const TopoDS_Edge& linEdge=TopoDS_Edge(), - bool* linEdgeComputed = 0); + int computeLayerPositions(StdMeshers_FaceSidePtr linSide, + std::vector< double >& positions, + int* nbEdgesComputed = 0, + bool useHalf = false); const StdMeshers_NumberOfLayers* myNbLayerHypo; const StdMeshers_LayerDistribution* myDistributionHypo; - SMESH_MesherHelper* myHelper; - std::vector< double > myLayerPositions; }; #endif