From 68683b462f8cdd2e24260a31211aadd65a37bea9 Mon Sep 17 00:00:00 2001
From: eap <eap@opencascade.com>
Date: Thu, 16 May 2013 16:23:11 +0000
Subject: [PATCH 1/1] 0022100: EDF 2413 SMESH: Take into account TRIA7

+  int NbBiQuadTriangles() const throw(SALOME_Exception);
---
 src/SMESH/SMESH_Mesh.cxx | 12 ++++++++++++
 src/SMESH/SMESH_Mesh.hxx | 16 ++--------------
 2 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/src/SMESH/SMESH_Mesh.cxx b/src/SMESH/SMESH_Mesh.cxx
index a7e10a243..b43a41961 100644
--- a/src/SMESH/SMESH_Mesh.cxx
+++ b/src/SMESH/SMESH_Mesh.cxx
@@ -1502,6 +1502,18 @@ int SMESH_Mesh::NbTriangles(SMDSAbs_ElementOrder order) const throw(SALOME_Excep
   return _myMeshDS->GetMeshInfo().NbTriangles(order);
 }
 
+//================================================================================
+/*!
+ * \brief Return number of biquadratic triangles in the mesh
+ */
+//================================================================================
+
+int SMESH_Mesh::NbBiQuadTriangles() const throw(SALOME_Exception)
+{
+  Unexpect aCatch(SalomeException);
+  return _myMeshDS->GetMeshInfo().NbBiQuadTriangles();
+}
+
 //================================================================================
 /*!
  * \brief Return the number nodes faces in the mesh
diff --git a/src/SMESH/SMESH_Mesh.hxx b/src/SMESH/SMESH_Mesh.hxx
index 3d5678eb1..06c4e7802 100644
--- a/src/SMESH/SMESH_Mesh.hxx
+++ b/src/SMESH/SMESH_Mesh.hxx
@@ -252,39 +252,27 @@ public:
                   bool theAutoGroups = true) throw(SALOME_Exception);
   
   int NbNodes() const throw(SALOME_Exception);
-  
   int Nb0DElements() const throw(SALOME_Exception);
+  int NbBalls() const throw(SALOME_Exception);
   
   int NbEdges(SMDSAbs_ElementOrder order = ORDER_ANY) const throw(SALOME_Exception);
   
   int NbFaces(SMDSAbs_ElementOrder order = ORDER_ANY) const throw(SALOME_Exception);
-  
   int NbTriangles(SMDSAbs_ElementOrder order = ORDER_ANY) const throw(SALOME_Exception);
-  
   int NbQuadrangles(SMDSAbs_ElementOrder order = ORDER_ANY) const throw(SALOME_Exception);
-
   int NbBiQuadQuadrangles() const throw(SALOME_Exception);
-  
+  int NbBiQuadTriangles() const throw(SALOME_Exception);
   int NbPolygons() const throw(SALOME_Exception);
   
   int NbVolumes(SMDSAbs_ElementOrder order = ORDER_ANY) const throw(SALOME_Exception);
-  
   int NbTetras(SMDSAbs_ElementOrder order = ORDER_ANY) const throw(SALOME_Exception);
-  
   int NbHexas(SMDSAbs_ElementOrder order = ORDER_ANY) const throw(SALOME_Exception);
-  
   int NbTriQuadraticHexas() const throw(SALOME_Exception);
-  
   int NbPyramids(SMDSAbs_ElementOrder order = ORDER_ANY) const throw(SALOME_Exception);
-
   int NbPrisms(SMDSAbs_ElementOrder order = ORDER_ANY) const throw(SALOME_Exception);
-  
   int NbHexagonalPrisms() const throw(SALOME_Exception);
-  
   int NbPolyhedrons() const throw(SALOME_Exception);
   
-  int NbBalls() const throw(SALOME_Exception);
-  
   int NbSubMesh() const throw(SALOME_Exception);
   
   int NbGroup() const { return _mapGroup.size(); }
-- 
2.30.2