Salome HOME
projects
/
modules
/
smesh.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix Body Fitting regression on smesh/imps_11/M3
[modules/smesh.git]
/
src
/
StdMeshers
/
StdMeshers_QuadFromMedialAxis_1D2D.hxx
diff --git
a/src/StdMeshers/StdMeshers_QuadFromMedialAxis_1D2D.hxx
b/src/StdMeshers/StdMeshers_QuadFromMedialAxis_1D2D.hxx
index df8a84a4c484c02f13ca4ec18894d44d2ae506f6..9c7dba9c7fe4300993405cd43c00ad99ea0379d5 100644
(file)
--- a/
src/StdMeshers/StdMeshers_QuadFromMedialAxis_1D2D.hxx
+++ b/
src/StdMeshers/StdMeshers_QuadFromMedialAxis_1D2D.hxx
@@
-1,4
+1,4
@@
-// Copyright (C) 2007-201
5
CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-201
9
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
@@
-37,7
+37,7
@@
class STDMESHERS_EXPORT StdMeshers_QuadFromMedialAxis_1D2D: public StdMeshers_Quadrangle_2D
{
public:
class STDMESHERS_EXPORT StdMeshers_QuadFromMedialAxis_1D2D: public StdMeshers_Quadrangle_2D
{
public:
- StdMeshers_QuadFromMedialAxis_1D2D(int hypId,
int studyId,
SMESH_Gen* gen);
+ StdMeshers_QuadFromMedialAxis_1D2D(int hypId, SMESH_Gen* gen);
virtual ~StdMeshers_QuadFromMedialAxis_1D2D();
virtual bool CheckHypothesis(SMESH_Mesh& aMesh,
virtual ~StdMeshers_QuadFromMedialAxis_1D2D();
virtual bool CheckHypothesis(SMESH_Mesh& aMesh,
@@
-51,15
+51,23
@@
class STDMESHERS_EXPORT StdMeshers_QuadFromMedialAxis_1D2D: public StdMeshers_Qu
const TopoDS_Shape & aShape,
MapShapeNbElems& aResMap);
const TopoDS_Shape & aShape,
MapShapeNbElems& aResMap);
- private:
+ virtual void SetEventListener(SMESH_subMesh* subMesh);
- bool computeQuads( SMESH_MesherHelper& theHelper,
- const TopoDS_Face& theFace,
- const std::vector<TopoDS_Edge> theSinuEdges[2],
- const std::vector<TopoDS_Edge> theShortEdges[2]);
+ virtual bool IsApplicableToShape(const TopoDS_Shape & shape, bool toCheckAll) const
+ {
+ return IsApplicable( shape, toCheckAll );
+ }
+ static bool IsApplicable(const TopoDS_Shape & aShape, bool toCheckAll);
class Algo1D;
class Algo1D;
- Algo1D* _regular1D;
+
+ private:
+
+ bool computeQuads( SMESH_MesherHelper& theHelper,
+ FaceQuadStruct::Ptr theQuad);
+
+ Algo1D* _regular1D;
+ const SMESHDS_Hypothesis* _hyp2D;
};
#endif
};
#endif