X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FStdMeshers%2FStdMeshers_QuadToTriaAdaptor.hxx;h=180bb25670ea1b206429e4c17917375c088a2e9c;hb=61915a66ed38e9452e0e4a911ec79261b862c29d;hp=ceccb2542a4e98184bc9bc0af760bbaccb8f738c;hpb=d8f644ca3d4ce62f2ef41d4aacb52f5bb1221df3;p=modules%2Fsmesh.git

diff --git a/src/StdMeshers/StdMeshers_QuadToTriaAdaptor.hxx b/src/StdMeshers/StdMeshers_QuadToTriaAdaptor.hxx
index ceccb2542..180bb2567 100644
--- a/src/StdMeshers/StdMeshers_QuadToTriaAdaptor.hxx
+++ b/src/StdMeshers/StdMeshers_QuadToTriaAdaptor.hxx
@@ -1,20 +1,20 @@
-//  Copyright (C) 2007-2010  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2011  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
-//  License as published by the Free Software Foundation; either
-//  version 2.1 of the License.
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License.
 //
-//  This library is distributed in the hope that it will be useful,
-//  but WITHOUT ANY WARRANTY; without even the implied warranty of
-//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-//  Lesser General Public License for more details.
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
 //
-//  You should have received a copy of the GNU Lesser General Public
-//  License along with this library; if not, write to the Free Software
-//  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
 //
-//  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
@@ -26,6 +26,8 @@
 
 #include "SMESH_StdMeshers.hxx"
 
+#include "SMESH_ProxyMesh.hxx"
+
 class SMESH_Mesh;
 class SMESH_ElementSearcher;
 class SMDS_MeshElement;
@@ -37,7 +39,7 @@ class gp_Pnt;
 class gp_Vec;
 
 
-#include <map>
+#include <set>
 #include <list>
 #include <vector>
 
@@ -46,30 +48,21 @@ class gp_Vec;
 /*!
  * \brief "Transforms" quadrilateral faces into triangular ones by creation of pyramids
  */
-class STDMESHERS_EXPORT StdMeshers_QuadToTriaAdaptor
+class STDMESHERS_EXPORT StdMeshers_QuadToTriaAdaptor : public SMESH_ProxyMesh
 {
 public:
   StdMeshers_QuadToTriaAdaptor();
 
   ~StdMeshers_QuadToTriaAdaptor();
 
-  bool Compute(SMESH_Mesh& aMesh, const TopoDS_Shape& aShape);
+  bool Compute(SMESH_Mesh&         aMesh,
+               const TopoDS_Shape& aShape,
+               SMESH_ProxyMesh*    aProxyMesh=0);
 
   bool Compute(SMESH_Mesh& aMesh);
 
-  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);
-
   int Preparation(const SMDS_MeshElement* face,
                   Handle_TColgp_HArray1OfPnt& PN,
                   Handle_TColgp_HArray1OfVec& VN,
@@ -82,22 +75,23 @@ protected:
                          const TopoDS_Shape& aShape,
                          const SMDS_MeshElement* NotCheckedFace);
 
-  bool Compute2ndPart(SMESH_Mesh& aMesh);
+  bool Compute2ndPart(SMESH_Mesh&                                 aMesh,
+                      const std::vector<const SMDS_MeshElement*>& pyramids);
 
 
-  typedef std::list<const SMDS_MeshFace* >                   TTriaList;
-  typedef std::multimap<const SMDS_MeshElement*, TTriaList > TQuad2Trias;
+  void MergePiramids( const SMDS_MeshElement*          PrmI,
+                      const SMDS_MeshElement*          PrmJ,
+                      std::set<const SMDS_MeshNode*> & nodesToMove);
 
-  TQuad2Trias  myResMap;
-  std::vector<const SMDS_MeshElement*> myPyramids;
+  void MergeAdjacent(const SMDS_MeshElement*         PrmI,
+                     std::set<const SMDS_MeshNode*>& nodesToMove);
 
-  std::list< const SMDS_MeshNode* > myDegNodes;
 
-  const SMESH_ElementSearcher* myElemSearcher;
+  std::set<const SMDS_MeshElement*> myRemovedTrias;
 
-  int myNbTriangles;
+  std::list< const SMDS_MeshNode* > myDegNodes;
 
-  TopoDS_Shape myShape;
+  const SMESH_ElementSearcher* myElemSearcher;
 };
 
 #endif