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
PR: synchro V6_main tag mergeto_V7_main_11Feb13
[modules/smesh.git]
/
src
/
StdMeshers
/
StdMeshers_Quadrangle_2D.hxx
diff --git
a/src/StdMeshers/StdMeshers_Quadrangle_2D.hxx
b/src/StdMeshers/StdMeshers_Quadrangle_2D.hxx
index 08f7802b43fbcae4f9b77548ed7cb2f1963178be..6ffe0e68f325c36f2fc0a003d87d7d9076105dcb 100644
(file)
--- a/
src/StdMeshers/StdMeshers_Quadrangle_2D.hxx
+++ b/
src/StdMeshers/StdMeshers_Quadrangle_2D.hxx
@@
-23,36
+23,37
@@
// Moved here from SMESH_Quadrangle_2D.hxx
// Author : Paul RASCLE, EDF
// Module : SMESH
// Moved here from SMESH_Quadrangle_2D.hxx
// Author : Paul RASCLE, EDF
// Module : SMESH
-// $Header$
#ifndef _SMESH_QUADRANGLE_2D_HXX_
#define _SMESH_QUADRANGLE_2D_HXX_
#ifndef _SMESH_QUADRANGLE_2D_HXX_
#define _SMESH_QUADRANGLE_2D_HXX_
+#include "SMESH_Algo.hxx"
+#include "SMESH_ProxyMesh.hxx"
#include "SMESH_StdMeshers.hxx"
#include "SMESH_StdMeshers.hxx"
-
#include "StdMeshers_QuadrangleParams.hxx"
#include "StdMeshers_QuadrangleParams.hxx"
-#include "SMESH_2D_Algo.hxx"
-#include "Utils_SALOME_Exception.hxx"
+#include <TopoDS_Face.hxx>
+class SMDS_MeshNode;
class SMESH_Mesh;
class SMESH_MesherHelper;
class SMESH_Mesh;
class SMESH_MesherHelper;
+class SMESH_ProxyMesh;
class StdMeshers_FaceSide;
class StdMeshers_FaceSide;
-class SMDS_MeshNode;
-class TopoDS_Face;
struct uvPtStruct;
struct uvPtStruct;
-enum TSideID {
BOTTOM_SIDE=0, RIGHT_SIDE, TOP_SIDE, LEFT_SIDE, NB
_SIDES };
+enum TSideID {
QUAD_BOTTOM_SIDE=0, QUAD_RIGHT_SIDE, QUAD_TOP_SIDE, QUAD_LEFT_SIDE, NB_QUAD
_SIDES };
typedef uvPtStruct UVPtStruct;
typedef struct faceQuadStruct
{
std::vector< StdMeshers_FaceSide*> side;
typedef uvPtStruct UVPtStruct;
typedef struct faceQuadStruct
{
std::vector< StdMeshers_FaceSide*> side;
- bool isEdgeOut[4]; // true, if an
edge has more nodes, than the opposit
e
+ bool isEdgeOut[4]; // true, if an
EDGE has more nodes, than an opposite on
e
UVPtStruct* uv_grid;
TopoDS_Face face;
~faceQuadStruct();
UVPtStruct* uv_grid;
TopoDS_Face face;
~faceQuadStruct();
+ void shift( size_t nb, bool keepUnitOri );
+ typedef boost::shared_ptr<faceQuadStruct> Ptr;
} FaceQuadStruct;
class STDMESHERS_EXPORT StdMeshers_Quadrangle_2D: public SMESH_2D_Algo
} FaceQuadStruct;
class STDMESHERS_EXPORT StdMeshers_Quadrangle_2D: public SMESH_2D_Algo
@@
-71,12
+72,12
@@
public:
virtual bool Evaluate(SMESH_Mesh & aMesh, const TopoDS_Shape & aShape,
MapShapeNbElems& aResMap);
virtual bool Evaluate(SMESH_Mesh & aMesh, const TopoDS_Shape & aShape,
MapShapeNbElems& aResMap);
- FaceQuadStruct
*
CheckAnd2Dcompute(SMESH_Mesh& aMesh,
- const TopoDS_Shape& aShape,
- const bool CreateQuadratic);
+ FaceQuadStruct
::Ptr
CheckAnd2Dcompute(SMESH_Mesh& aMesh,
+
const TopoDS_Shape& aShape,
+
const bool CreateQuadratic);
- FaceQuadStruct
*
CheckNbEdges(SMESH_Mesh& aMesh,
- const TopoDS_Shape& aShape);
+ FaceQuadStruct
::Ptr
CheckNbEdges(SMESH_Mesh& aMesh,
+
const TopoDS_Shape& aShape);
protected:
protected:
@@
-86,9
+87,9
@@
protected:
std::vector<int>& aNbNodes,
bool& IsQuadratic);
std::vector<int>& aNbNodes,
bool& IsQuadratic);
- bool SetNormalizedGrid(SMESH_Mesh& aMesh,
- const TopoDS_Shape& aShape,
- FaceQuadStruct
*
& quad);
+ bool SetNormalizedGrid(SMESH_Mesh&
aMesh,
+ const TopoDS_Shape&
aShape,
+ FaceQuadStruct
::Ptr
& quad);
void SplitQuad(SMESHDS_Mesh *theMeshDS,
const int theFaceID,
void SplitQuad(SMESHDS_Mesh *theMeshDS,
const int theFaceID,
@@
-97,23
+98,23
@@
protected:
const SMDS_MeshNode* theNode3,
const SMDS_MeshNode* theNode4);
const SMDS_MeshNode* theNode3,
const SMDS_MeshNode* theNode4);
- bool ComputeQuadPref(SMESH_Mesh& aMesh,
+ bool ComputeQuadPref(SMESH_Mesh&
aMesh,
const TopoDS_Shape& aShape,
const TopoDS_Shape& aShape,
- FaceQuadStruct
*
quad);
+ FaceQuadStruct
::Ptr
quad);
- bool EvaluateQuadPref(SMESH_Mesh& aMesh,
+ bool EvaluateQuadPref(SMESH_Mesh&
aMesh,
const TopoDS_Shape& aShape,
const TopoDS_Shape& aShape,
- std::vector<int>& aNbNodes,
- MapShapeNbElems& aResMap,
- bool
I
sQuadratic);
+ std::vector<int>&
aNbNodes,
+ MapShapeNbElems&
aResMap,
+ bool
i
sQuadratic);
- bool ComputeReduced (SMESH_Mesh& aMesh,
+ bool ComputeReduced (SMESH_Mesh&
aMesh,
const TopoDS_Shape& aShape,
const TopoDS_Shape& aShape,
- FaceQuadStruct
*
quad);
+ FaceQuadStruct
::Ptr
quad);
- void UpdateDegenUV(FaceQuadStruct
*
quad);
+ void UpdateDegenUV(FaceQuadStruct
::Ptr
quad);
- void Smooth (FaceQuadStruct
*
quad);
+ void Smooth (FaceQuadStruct
::Ptr
quad);
// true if QuadranglePreference hypothesis is assigned that forces
// true if QuadranglePreference hypothesis is assigned that forces
@@
-124,13
+125,17
@@
protected:
bool myTrianglePreference;
bool myTrianglePreference;
- int myTriaVertexID;
+ int
myTriaVertexID;
-
StdMeshers_QuadType myQuadType
;
+
bool myNeedSmooth
;
- S
MESH_MesherHelper* myHelper; // tool for working with quadratic elements
+ S
tdMeshers_QuadType myQuadType;
- bool myNeedSmooth;
+ SMESH_MesherHelper* myHelper; // tool for working with quadratic elements
+
+ SMESH_ProxyMesh::Ptr myProxyMesh;
+
+ FaceQuadStruct::Ptr myQuadStruct;
};
#endif
};
#endif