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
Merge from V5_1_main 14/05/2010
[modules/smesh.git]
/
src
/
StdMeshers
/
StdMeshers_QuadToTriaAdaptor.hxx
diff --git
a/src/StdMeshers/StdMeshers_QuadToTriaAdaptor.hxx
b/src/StdMeshers/StdMeshers_QuadToTriaAdaptor.hxx
index af818549f264005607c7621b80d2eff1d107b3dd..79017c20d2420ae19524c08c52b6cd3592b3b28f 100644
(file)
--- a/
src/StdMeshers/StdMeshers_QuadToTriaAdaptor.hxx
+++ b/
src/StdMeshers/StdMeshers_QuadToTriaAdaptor.hxx
@@
-1,7
+1,4
@@
-// Copyright (C) 2007-2008 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) 2007-2010 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
//
// This library is free software; you can redistribute it and/or
// modify it under the terms of the GNU Lesser General Public
@@
-19,6
+16,7
@@
//
// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
//
//
// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
//
+
// SMESH SMESH : implementaion of SMESH idl descriptions
// File : StdMeshers_QuadToTriaAdaptor.hxx
// Module : SMESH
// SMESH SMESH : implementaion of SMESH idl descriptions
// File : StdMeshers_QuadToTriaAdaptor.hxx
// Module : SMESH
@@
-26,11
+24,18
@@
#ifndef _SMESH_QuadToTriaAdaptor_HXX_
#define _SMESH_QuadToTriaAdaptor_HXX_
#ifndef _SMESH_QuadToTriaAdaptor_HXX_
#define _SMESH_QuadToTriaAdaptor_HXX_
-#include <SMESH_Mesh.hxx>
-#include <SMESH_StdMeshers.hxx>
-#include <SMDS_FaceOfNodes.hxx>
-#include <TColgp_HArray1OfPnt.hxx>
-#include <TColgp_HArray1OfVec.hxx>
+#include "SMESH_StdMeshers.hxx"
+#include "SMDS_FaceOfNodes.hxx"
+
+class SMESH_Mesh;
+class SMDS_MeshElement;
+class SMDS_MeshNode;
+class Handle(TColgp_HArray1OfPnt);
+class Handle(TColgp_HArray1OfVec);
+class TopoDS_Shape;
+class gp_Pnt;
+class gp_Vec;
+
#include <map>
#include <list>
#include <map>
#include <list>
@@
-40,25
+45,24
@@
class STDMESHERS_EXPORT StdMeshers_QuadToTriaAdaptor
{
public:
{
public:
- StdMeshers_QuadToTriaAdaptor();
-
~StdMeshers_QuadToTriaAdaptor();
bool Compute(SMESH_Mesh& aMesh, const TopoDS_Shape& aShape);
bool Compute(SMESH_Mesh& aMesh);
~StdMeshers_QuadToTriaAdaptor();
bool Compute(SMESH_Mesh& aMesh, const TopoDS_Shape& aShape);
bool Compute(SMESH_Mesh& aMesh);
-
std::list<const SMDS_FaceOfNodes*>
GetTriangles(const SMDS_MeshElement* aFace);
+
const std::list<const SMDS_FaceOfNodes*>*
GetTriangles(const SMDS_MeshElement* aFace);
protected:
//bool CheckDegenerate(const SMDS_MeshElement* aFace);
int Preparation(const SMDS_MeshElement* face,
protected:
//bool CheckDegenerate(const SMDS_MeshElement* aFace);
int Preparation(const SMDS_MeshElement* face,
- Handle(TColgp_HArray1OfPnt) PN,
- Handle(TColgp_HArray1OfVec) VN,
+ Handle(TColgp_HArray1OfPnt)
&
PN,
+ Handle(TColgp_HArray1OfVec)
&
VN,
std::vector<const SMDS_MeshNode*>& FNodes,
std::vector<const SMDS_MeshNode*>& FNodes,
- gp_Pnt& PC, gp_Vec& VNorm);
+ gp_Pnt& PC, gp_Vec& VNorm,
+ const SMDS_MeshElement** volumes=0);
bool CheckIntersection(const gp_Pnt& P, const gp_Pnt& PC,
gp_Pnt& Pint, SMESH_Mesh& aMesh,
bool CheckIntersection(const gp_Pnt& P, const gp_Pnt& PC,
gp_Pnt& Pint, SMESH_Mesh& aMesh,
@@
-67,8
+71,13
@@
protected:
bool Compute2ndPart(SMESH_Mesh& aMesh);
bool Compute2ndPart(SMESH_Mesh& aMesh);
- std::map< const SMDS_MeshElement*, std::list<const SMDS_FaceOfNodes*> > myResMap;
- std::map< const SMDS_MeshElement*, const SMDS_MeshElement* > myMapFPyram;
+ typedef std::list<const SMDS_FaceOfNodes* > TTriaList;
+ typedef std::multimap<const SMDS_MeshElement*, TTriaList > TQuad2Trias;
+ typedef std::map<const SMDS_MeshElement*, TTriaList *, TIDCompare> TPyram2Trias;
+
+ TQuad2Trias myResMap;
+ TPyram2Trias myPyram2Trias;
+
std::list< const SMDS_MeshNode* > myDegNodes;
};
std::list< const SMDS_MeshNode* > myDegNodes;
};