X-Git-Url: http://git.salome-platform.org/gitweb/?p=modules%2Fsmesh.git;a=blobdiff_plain;f=src%2FStdMeshers%2FStdMeshers_RadialQuadrangle_1D2D.hxx;h=50ca16eb92efa4a17e2f26459e3250f6fdc8db59;hp=2f6eb780ba36d13fb0a0be8ad8ccbe6d7a03048d;hb=8d297d6698f361d4f2dde723050bcfbaea050920;hpb=b0a908c0d20341651771d0249fb10882f54b2aad

diff --git a/src/StdMeshers/StdMeshers_RadialQuadrangle_1D2D.hxx b/src/StdMeshers/StdMeshers_RadialQuadrangle_1D2D.hxx
index 2f6eb780b..50ca16eb9 100644
--- a/src/StdMeshers/StdMeshers_RadialQuadrangle_1D2D.hxx
+++ b/src/StdMeshers/StdMeshers_RadialQuadrangle_1D2D.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
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -17,30 +17,29 @@
 // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
 
-//  SMESH SMESH : implementaion of SMESH idl descriptions
+//  SMESH SMESH : implementation of SMESH idl descriptions
 //  File   : StdMeshers_RadialQuadrangle_1D2D.hxx
 //  Module : SMESH
 //
 #ifndef _SMESH_RadialQuadrangle_1D2D_HXX_
 #define _SMESH_RadialQuadrangle_1D2D_HXX_
 
-#include "SMESH_StdMeshers.hxx"
-
-#include "SMESH_Algo.hxx"
-
-#include <TopoDS_Edge.hxx>
+#include "StdMeshers_Quadrangle_2D.hxx"
 
 #include <vector>
 
 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);
+  StdMeshers_RadialQuadrangle_1D2D(int hypId, SMESH_Gen* gen);
   virtual ~StdMeshers_RadialQuadrangle_1D2D();
 
   virtual bool CheckHypothesis(SMESH_Mesh&                          aMesh,
@@ -59,18 +58,22 @@ public:
    */
   virtual void SubmeshRestored(SMESH_subMesh* subMesh);
   
-protected:
+  virtual bool IsApplicableToShape(const TopoDS_Shape & shape, bool toCheckAll) const
+  {
+    return IsApplicable( shape, toCheckAll );
+  }
+  static bool IsApplicable(const TopoDS_Shape & aShape, bool toCheckAll);
+
+ 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