0020973: EDF 1554 GHS3DPLUGIN: Make possible to have a mixed mesh hexa-tetra with...

+  int TotalNbOfTriangles() const { return myNbTriangles; }
+  TopoDS_Shape GetShape() const { return myShape; }

diff --git a/src/StdMeshers/StdMeshers_QuadToTriaAdaptor.hxx b/src/StdMeshers/StdMeshers_QuadToTriaAdaptor.hxx
index 874fdc6a94da089a2c17b3e16d921c88b3f4ce5c..ceccb2542a4e98184bc9bc0af760bbaccb8f738c 100644 (file)
--- a/src/StdMeshers/StdMeshers_QuadToTriaAdaptor.hxx
+++ b/src/StdMeshers/StdMeshers_QuadToTriaAdaptor.hxx
@@ -33,7 +33,6 @@ class SMDS_MeshNode;
 class SMDS_MeshFace;
 class Handle_TColgp_HArray1OfPnt;
 class Handle_TColgp_HArray1OfVec;
-class TopoDS_Shape;
 class gp_Pnt;
 class gp_Vec;
 
@@ -42,6 +41,8 @@ class gp_Vec;
 #include <list>
 #include <vector>
 
+#include <TopoDS_Shape.hxx>
+
 /*!
  * \brief "Transforms" quadrilateral faces into triangular ones by creation of pyramids
  */
@@ -58,6 +59,13 @@ public:
 
   const std::list<const SMDS_MeshFace*>* GetTriangles(const SMDS_MeshElement* aFace);
 
+  /*!
+   * \brief Return sum of generated and already present triangles
+   */
+  int TotalNbOfTriangles() const { return myNbTriangles; }
+
+  TopoDS_Shape GetShape() const { return myShape; }
+
 protected:
 
   //bool CheckDegenerate(const SMDS_MeshElement* aFace);
@@ -77,17 +85,19 @@ protected:
   bool Compute2ndPart(SMESH_Mesh& aMesh);
 
 
-  typedef std::list<const SMDS_MeshFace* >                           TTriaList;
-  typedef std::multimap<const SMDS_MeshElement*, TTriaList >         TQuad2Trias;
-  //typedef std::map<const SMDS_MeshElement*, TTriaList *, TIDCompare> TPyram2Trias;
+  typedef std::list<const SMDS_MeshFace* >                   TTriaList;
+  typedef std::multimap<const SMDS_MeshElement*, TTriaList > TQuad2Trias;
 
   TQuad2Trias  myResMap;
-  //TPyram2Trias myPyram2Trias;
   std::vector<const SMDS_MeshElement*> myPyramids;
 
   std::list< const SMDS_MeshNode* > myDegNodes;
 
   const SMESH_ElementSearcher* myElemSearcher;
+
+  int myNbTriangles;
+
+  TopoDS_Shape myShape;
 };
 
 #endif