0022100: EDF 2413 SMESH: Take into account TRIA7

[modules/smesh.git] / src / SMESH / SMESH_MesherHelper.hxx

diff --git a/src/SMESH/SMESH_MesherHelper.hxx b/src/SMESH/SMESH_MesherHelper.hxx
index 90ded720e367ad934e9833494a967436d6d8ffbf..3ac5547cb9500b5f145dc92b372a8232fc331912 100644 (file)
--- a/src/SMESH/SMESH_MesherHelper.hxx
+++ b/src/SMESH/SMESH_MesherHelper.hxx
@@ -585,6 +585,19 @@ public:
                                       const SMDS_MeshNode* n34,
                                       const SMDS_MeshNode* n41,
                                       bool                 force3d);
+  /*!
+   * \brief Return existing or create a new central node for a 
+   *       quadratic triangle given its 6 nodes.
+   *  \param force3d - true means node creation in between the given nodes,
+   *                   else node position is found on a geometrical face if any.
+   */
+  const SMDS_MeshNode* GetCentralNode(const SMDS_MeshNode* n1,
+                                      const SMDS_MeshNode* n2,
+                                      const SMDS_MeshNode* n3,
+                                      const SMDS_MeshNode* n12,
+                                      const SMDS_MeshNode* n23,
+                                      const SMDS_MeshNode* n31,
+                                      bool                 force3d);
   /*!
    * \brief Return index and type of the shape (EDGE or FACE only) to set a medium node on
    */
@@ -646,13 +659,13 @@ public:
     TBiQuad(const SMDS_MeshNode* n1,
             const SMDS_MeshNode* n2, 
             const SMDS_MeshNode* n3,
-            const SMDS_MeshNode* n4)
+            const SMDS_MeshNode* n4=0)
     {
       TIDSortedNodeSet s;
       s.insert(n1);
       s.insert(n2);
       s.insert(n3);
-      s.insert(n4);
+      if ( n4 ) s.insert(n4);
       TIDSortedNodeSet::iterator n = s.begin();
       first = (*n++)->GetID();
       second.first = (*n++)->GetID();
@@ -661,8 +674,8 @@ public:
   };
 
   // maps used during creation of quadratic elements
-  TLinkNodeMap                        myTLinkNodeMap;       // medium nodes on links
-  std::map< TBiQuad, SMDS_MeshNode* > myMapWithCentralNode; // central nodes of faces
+  TLinkNodeMap                              myTLinkNodeMap;       // medium nodes on links
+  std::map< TBiQuad, const SMDS_MeshNode* > myMapWithCentralNode; // central nodes of faces
 
   std::set< int > myDegenShapeIds;
   std::set< int > mySeamShapeIds;