From: eap <eap@opencascade.com>
Date: Thu, 5 Jul 2012 09:40:33 +0000 (+0000)
Subject: 0021676: EDF 2283 NETGENPLUGIN: Improve Netgen 1D-2D-3D to generate pyramids in case... 
X-Git-Tag: V6_6_0a1~276
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=187dac541f9a270582f77243242be47de8398435;p=modules%2Fsmesh.git

0021676: EDF 2283 NETGENPLUGIN: Improve Netgen 1D-2D-3D to generate pyramids in case where input 2D mesh includes quadrangles

+  const TopoDS_Shape& GetShape() const { return myShape; }
---

diff --git a/src/StdMeshers/StdMeshers_QuadToTriaAdaptor.cxx b/src/StdMeshers/StdMeshers_QuadToTriaAdaptor.cxx
index d9907cba9..5764cc6ea 100644
--- a/src/StdMeshers/StdMeshers_QuadToTriaAdaptor.cxx
+++ b/src/StdMeshers/StdMeshers_QuadToTriaAdaptor.cxx
@@ -705,9 +705,9 @@ int StdMeshers_QuadToTriaAdaptor::Preparation(const SMDS_MeshElement*       face
 //purpose  : 
 //=======================================================================
 
-bool StdMeshers_QuadToTriaAdaptor::Compute(SMESH_Mesh&           aMesh,
-                                           const TopoDS_Shape&   aShape,
-                                           SMESH_ProxyMesh* aProxyMesh)
+bool StdMeshers_QuadToTriaAdaptor::Compute(SMESH_Mesh&         aMesh,
+                                           const TopoDS_Shape& aShape,
+                                           SMESH_ProxyMesh*    aProxyMesh)
 {
   SMESH_ProxyMesh::setMesh( aMesh );
 
@@ -715,6 +715,8 @@ bool StdMeshers_QuadToTriaAdaptor::Compute(SMESH_Mesh&           aMesh,
        aShape.ShapeType() != TopAbs_SHELL )
     return false;
 
+  myShape = aShape;
+
   vector<const SMDS_MeshElement*> myPyramids;
 
   SMESHDS_Mesh * meshDS = aMesh.GetMeshDS();
diff --git a/src/StdMeshers/StdMeshers_QuadToTriaAdaptor.hxx b/src/StdMeshers/StdMeshers_QuadToTriaAdaptor.hxx
index 66e498592..87063ee3f 100644
--- a/src/StdMeshers/StdMeshers_QuadToTriaAdaptor.hxx
+++ b/src/StdMeshers/StdMeshers_QuadToTriaAdaptor.hxx
@@ -17,7 +17,6 @@
 // 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,6 +60,8 @@ public:
 
   bool Compute(SMESH_Mesh& aMesh);
 
+  const TopoDS_Shape& GetShape() const { return myShape; }
+
 protected:
 
   int Preparation(const SMDS_MeshElement* face,
@@ -87,11 +88,10 @@ protected:
                      std::set<const SMDS_MeshNode*>& nodesToMove);
 
 
+  TopoDS_Shape                      myShape;
   std::set<const SMDS_MeshElement*> myRemovedTrias;
-
   std::list< const SMDS_MeshNode* > myDegNodes;
-
-  const SMESH_ElementSearcher* myElemSearcher;
+  const SMESH_ElementSearcher*      myElemSearcher;
 };
 
 #endif