Increment version: 8.5.0

[modules/smesh.git] / src / SMESH_I / SMESH_Measurements_i.cxx

diff --git a/src/SMESH_I/SMESH_Measurements_i.cxx b/src/SMESH_I/SMESH_Measurements_i.cxx
index d5ddc864c8e0ec2548b430486e299fe5edf80b02..2fcac5a7f9122551b4efb276f0f3c77fd0daf3a0 100644 (file)
--- a/src/SMESH_I/SMESH_Measurements_i.cxx
+++ b/src/SMESH_I/SMESH_Measurements_i.cxx
@@ -28,16 +28,15 @@
 
 #include "SMESH_Measurements_i.hxx"
 
-#include "SMESH_Gen_i.hxx"
-#include "SMESH_Filter_i.hxx"
-#include "SMESH_PythonDump.hxx"
-
+#include "SMDS_ElemIterator.hxx"
 #include "SMDS_Mesh.hxx"
-#include "SMDS_MeshNode.hxx"
 #include "SMDS_MeshElement.hxx"
-#include "SMDS_ElemIterator.hxx"
-
+#include "SMDS_MeshNode.hxx"
 #include "SMESHDS_Mesh.hxx"
+#include "SMESH_Filter_i.hxx"
+#include "SMESH_Gen_i.hxx"
+#include "SMESH_MeshAlgos.hxx"
+#include "SMESH_PythonDump.hxx"
 
 
 using namespace SMESH;
@@ -256,16 +255,13 @@ static void enlargeBoundingBox(const SMESH::SMESH_IDSource_ptr theObject,
       enlargeBoundingBox( aMesh->FindNode( aElementsId[i] ), theMeasure);
     else
     {
-      const SMDS_MeshElement* elem = aMesh->FindElement( aElementsId[i] );
-      if (!elem)
-        continue;
-      SMDS_ElemIteratorPtr aNodeIter = elem->nodesIterator();
-      while( aNodeIter->more() )
-        enlargeBoundingBox( dynamic_cast<const SMDS_MeshNode*>( aNodeIter->next() ), theMeasure);
+      if ( const SMDS_MeshElement* elem = aMesh->FindElement( aElementsId[i] ))
+        for (SMDS_NodeIteratorPtr aNodeIter = elem->nodeIterator(); aNodeIter->more(); )
+          enlargeBoundingBox( aNodeIter->next(), theMeasure);
     }
   }
 }
-                               
+
 //=======================================================================
 // name    : BoundingBox
 // Purpose : compute common bounding box of entities
@@ -308,3 +304,45 @@ double Measurements_i::Volume(SMESH::SMESH_IDSource_ptr theSource)
 {
   return getNumericalValue( theSource, SMESH::Controls::NumericalFunctorPtr(new SMESH::Controls::Volume()) );
 }
+
+//=======================================================================
+//function : GravityCenter
+//purpose  : return gravity center of the source: average coordinates of all nodes
+//=======================================================================
+
+SMESH::PointStruct Measurements_i::GravityCenter(SMESH::SMESH_IDSource_ptr theSource)
+{
+  SMESH::PointStruct grCenter = { 0.,0.,0. };
+  const SMESHDS_Mesh* mesh = getMesh( theSource );
+  if ( !mesh )
+    return grCenter;
+
+  // unmark all nodes; visited nodes will be marked
+  SMESH_MeshAlgos::MarkElems( mesh->nodesIterator(), /*isMarked=*/false );
+
+  gp_XYZ sumCoord( 0,0,0 );
+  int nodeCount = 0;
+
+  SMDS_ElemIteratorPtr eIt = SMESH_Mesh_i::GetElements( theSource, SMESH::ALL );
+  while ( eIt->more() )
+  {
+    const SMDS_MeshElement*   elem = eIt->next();
+    for ( SMDS_NodeIteratorPtr nIt = elem->nodeIterator(); nIt->more(); )
+    {
+      const SMDS_MeshNode* n = nIt->next();
+      if ( !n->isMarked() )
+      {
+        sumCoord += SMESH_NodeXYZ( n );
+        ++nodeCount;
+        n->setIsMarked( true );
+      }
+    }
+  }
+  sumCoord /= nodeCount;
+
+  grCenter.x = sumCoord.X();
+  grCenter.y = sumCoord.Y();
+  grCenter.z = sumCoord.Z();
+
+  return grCenter;
+}