X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FStdMeshers%2FStdMeshers_Penta_3D.hxx;h=90eab4c7433ab9ceafdd68f69ef14e32ae3f8111;hb=b81d8007215b49c711cab0c9e3577bf9fb4be9f5;hp=aac472ec0594b7ad0d128e96382b460bfb3fef27;hpb=ed456586bfb1411c5bff73b221658766689a6253;p=modules%2Fsmesh.git

diff --git a/src/StdMeshers/StdMeshers_Penta_3D.hxx b/src/StdMeshers/StdMeshers_Penta_3D.hxx
index aac472ec0..90eab4c74 100644
--- a/src/StdMeshers/StdMeshers_Penta_3D.hxx
+++ b/src/StdMeshers/StdMeshers_Penta_3D.hxx
@@ -17,7 +17,7 @@
 //  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.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org 
+// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
 //
 //
@@ -27,23 +27,29 @@
 #ifndef StdMeshers_Penta_3D_HeaderFile
 #define StdMeshers_Penta_3D_HeaderFile
 
-#include <map>
+#include "SMESH_StdMeshers.hxx"
 
-typedef std::map < int, int > StdMeshers_DataMapOfIntegerInteger;
+#include <map>
 
 ////////////////////////////////////////////////////////////////////////
 //
 //  class StdMeshers_SMESHBlock
 //
+////////////////////////////////////////////////////////////////////////
 #include <gp_Pnt.hxx>
 #include <gp_XYZ.hxx>
 #include <TopoDS_Vertex.hxx>
 #include <TopoDS_Shell.hxx>
 #include <TopTools_IndexedMapOfOrientedShape.hxx>
+#include <TColStd_MapOfInteger.hxx>
 
 #include "SMESH_Block.hxx"
+#include "SMESH_ComputeError.hxx"
+#include "SMESH_MesherHelper.hxx"
 
-class StdMeshers_SMESHBlock {
+typedef std::map< double, std::vector<const SMDS_MeshNode*> > StdMeshers_IJNodeMap;
+
+class STDMESHERS_EXPORT StdMeshers_SMESHBlock {
  
 public:
   //
@@ -62,6 +68,10 @@ public:
 			 const TopoDS_Shape& theShape,
 			 gp_XYZ& theXYZ);
   
+  void ComputeParameters(const double& theU,
+			 const TopoDS_Shape& theShape,
+			 gp_XYZ& theXYZ);
+  
   void Point(const gp_XYZ& theParams, 
 	     gp_Pnt& thePnt);
   
@@ -72,26 +82,34 @@ public:
   int ShapeID(const TopoDS_Shape& theShape); 
   
   const TopoDS_Shape& Shape(const int theID);
-  
-  
+
+  SMESH_Block & Block() { return myTBlock; }
+
+  bool IsForwadEdge(const int theEdgeID);
+
   int  ErrorStatus() const;
 
+  SMESH_ComputeErrorPtr GetError() const;
+
 
 protected:
   TopoDS_Shell                       myShell;
   TopTools_IndexedMapOfOrientedShape myShapeIDMap;
   SMESH_Block                        myTBlock;
   TopoDS_Shape                       myEmptyShape;
+  vector<int>                        myIsEdgeForward;
   //
   int myErrorStatus;
 };
+
 ////////////////////////////////////////////////////////////////////////
 //
 //  class StdMeshers_TNode
 //
+////////////////////////////////////////////////////////////////////////
 #include "SMDS_MeshNode.hxx"
 
-class StdMeshers_TNode {
+class STDMESHERS_EXPORT StdMeshers_TNode {
 
 public:
   
@@ -145,19 +163,26 @@ private:
 //
 //  class StdMeshers_Penta_3D
 //
+////////////////////////////////////////////////////////////////////////
 #include "SMESH_Mesh.hxx"
 #include <TopoDS_Shape.hxx>
 //
-class StdMeshers_Penta_3D {
+class STDMESHERS_EXPORT StdMeshers_Penta_3D {
 //
   public: // methods
     StdMeshers_Penta_3D();
     
-    //~StdMeshers_Penta_3D();
+    ~StdMeshers_Penta_3D();
     
     bool Compute(SMESH_Mesh& , const TopoDS_Shape& );
     
     int ErrorStatus() const {
+      if (myErrorStatus->IsOK())
+        return 0;
+      return myErrorStatus->myName;
+    }
+
+    SMESH_ComputeErrorPtr GetComputeError() const {
       return myErrorStatus;
     }
    
@@ -168,7 +193,18 @@ class StdMeshers_Penta_3D {
     double Tolerance() const {
       return myTol3D;
     }
-    
+
+    bool LoadIJNodes(StdMeshers_IJNodeMap & theIJNodes,
+                     const TopoDS_Face&     theFace,
+                     const TopoDS_Edge&     theBaseEdge,
+                     SMESHDS_Mesh*          theMesh);
+    // Load nodes bound to theFace into column (vectors) and rows
+    // of theIJNodes.
+    // The value of theIJNodes map is a vector of ordered nodes so
+    // that the 0-the one lies on theBaseEdge.
+    // The key of theIJNodes map is a normalized parameter of each
+    // 0-the node on theBaseEdge.
+
 
   protected: // methods
     
@@ -178,12 +214,18 @@ class StdMeshers_Penta_3D {
 
     void MakeNodes();
 
+    double SetHorizEdgeXYZ(const gp_XYZ&                  aBNXYZ,
+                           const int                      aFaceID,
+                           vector<const SMDS_MeshNode*>*& aCol1,
+                           vector<const SMDS_MeshNode*>*& aCol2);
+
     void ShapeSupportID(const bool theIsUpperLayer,
 			const SMESH_Block::TShapeID theBNSSID,
 			SMESH_Block::TShapeID& theSSID);
 
     void FindNodeOnShape(const TopoDS_Shape& aS,
 			 const gp_XYZ& aParams,
+                         const int z,
 			 StdMeshers_TNode& aTN);
 
     void CreateNode(const bool theIsUpperLayer,
@@ -209,17 +251,22 @@ class StdMeshers_Penta_3D {
     }
     
   protected: // fields
-    TopoDS_Shape myShape;
-    StdMeshers_SMESHBlock myBlock;
-    void *       myMesh;
-    int          myErrorStatus;
+    TopoDS_Shape              myShape;
+    StdMeshers_SMESHBlock     myBlock;
+    void *                    myMesh;
+    SMESH_ComputeErrorPtr     myErrorStatus;
     //
     vector <StdMeshers_TNode> myTNodes;
-    int myISize;
-    int myJSize;
-    double   myTol3D;        // Tolerance value     
-    StdMeshers_DataMapOfIntegerInteger myConnectingMap;
+    int                       myISize;
+    int                       myJSize;
+    double                    myTol3D;        // Tolerance value     
+    std::map < int, int >     myConnectingMap;
+    //
+    vector<StdMeshers_IJNodeMap> myWallNodesMaps; // nodes on a face
+    vector<gp_XYZ>            myShapeXYZ; // point on each sub-shape
 
+    bool myCreateQuadratic;
+    SMESH_MesherHelper* myTool; // tool building quadratic elements
 };
 
 #endif