X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FStdMeshers%2FStdMeshers_QuadToTriaAdaptor.hxx;h=87063ee3f416098685fdbc8d39b81872dc158ed4;hb=986cacacdb49caea7239a784db3a64278d7e65bb;hp=6baa5d730f95b73fc60bc459a7b61dd6a543e17d;hpb=b2a261da2b38716eb8cebc7473ac105df6d251d1;p=modules%2Fsmesh.git

diff --git a/src/StdMeshers/StdMeshers_QuadToTriaAdaptor.hxx b/src/StdMeshers/StdMeshers_QuadToTriaAdaptor.hxx
index 6baa5d730..87063ee3f 100644
--- a/src/StdMeshers/StdMeshers_QuadToTriaAdaptor.hxx
+++ b/src/StdMeshers/StdMeshers_QuadToTriaAdaptor.hxx
@@ -1,23 +1,22 @@
-//  Copyright (C) 2007-2010  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  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
 //  File   : StdMeshers_QuadToTriaAdaptor.hxx
 //  Module : SMESH
 //
@@ -61,9 +60,9 @@ public:
 
   bool Compute(SMESH_Mesh& aMesh);
 
-protected:
+  const TopoDS_Shape& GetShape() const { return myShape; }
 
-  //bool CheckDegenerate(const SMDS_MeshElement* aFace);
+protected:
 
   int Preparation(const SMDS_MeshElement* face,
                   Handle_TColgp_HArray1OfPnt& PN,
@@ -81,23 +80,18 @@ protected:
                       const std::vector<const SMDS_MeshElement*>& pyramids);
 
 
-  void MergePiramids( const SMDS_MeshElement*     PrmI,
-                      const SMDS_MeshElement*     PrmJ,
-                      set<const SMDS_MeshNode*> & nodesToMove);
+  void MergePiramids( const SMDS_MeshElement*          PrmI,
+                      const SMDS_MeshElement*          PrmJ,
+                      std::set<const SMDS_MeshNode*> & nodesToMove);
 
-  void MergeAdjacent(const SMDS_MeshElement*    PrmI,
-                     set<const SMDS_MeshNode*>& nodesToMove);
-  //typedef std::list<const SMDS_MeshFace* >                   TTriaList;
-  //typedef std::multimap<const SMDS_MeshElement*, TTriaList > TQuad2Trias;
+  void MergeAdjacent(const SMDS_MeshElement*         PrmI,
+                     std::set<const SMDS_MeshNode*>& nodesToMove);
 
-  //TQuad2Trias  myResMap;
-  //std::vector<const SMDS_MeshElement*> myPyramids;
 
+  TopoDS_Shape                      myShape;
   std::set<const SMDS_MeshElement*> myRemovedTrias;
-
   std::list< const SMDS_MeshNode* > myDegNodes;
-
-  const SMESH_ElementSearcher* myElemSearcher;
+  const SMESH_ElementSearcher*      myElemSearcher;
 };
 
 #endif