-// Copyright (C) 2007-2020 CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2021 CEA/DEN, EDF R&D, OPEN CASCADE
//
// Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
// File : SMESH_Measurements_i.cxx
// Author : Pavel TELKOV, Open CASCADE S.A.S. (pavel.telkov@opencascade.com)
-#ifdef WIN32
-#define NOMINMAX
-#endif
-
#include "SMESH_Measurements_i.hxx"
#include "SMDS_ElemIterator.hxx"
#include <cmath>
-using namespace SMESH;
+//using namespace SMESH;
/**
* this local function to avoid uninitialized fields
// name : Measurements_i
// Purpose : Constructor
//=======================================================================
-Measurements_i::Measurements_i()
+SMESH::Measurements_i::Measurements_i()
: SALOME::GenericObj_i( SMESH_Gen_i::GetPOA() )
{
//Base class Salome_GenericObject do it inmplicitly by overriding PortableServer::POA_ptr _default_POA() method
// name : ~Measurements_i
// Purpose : Destructor
//=======================================================================
-Measurements_i::~Measurements_i()
+SMESH::Measurements_i::~Measurements_i()
{
//TPythonDump()<<this<<".UnRegister()";
}
if (!CORBA::is_nil( theSource ))
{
SMESH::SMESH_Mesh_var mesh = theSource->GetMesh();
- SMESH_Mesh_i* anImplPtr = DownCast<SMESH_Mesh_i*>( mesh );
+ SMESH_Mesh_i* anImplPtr = SMESH::DownCast<SMESH_Mesh_i*>( mesh );
if (anImplPtr)
return anImplPtr->GetImpl().GetMeshDS();
}
if ( aMesh ) {
theFunctor->SetMesh( aMesh );
- SMESH::long_array_var anElementsId = theSource->GetIDs();
+ SMESH::smIdType_array_var anElementsId = theSource->GetIDs();
for ( CORBA::ULong i = 0; i < anElementsId->length(); i++) {
value += theFunctor->GetValue( anElementsId[i] );
}
// name : MinDistance
// Purpose : minimal distance between two given entities
//=======================================================================
-SMESH::Measure Measurements_i::MinDistance
+SMESH::Measure SMESH::Measurements_i::MinDistance
(SMESH::SMESH_IDSource_ptr theSource1,
SMESH::SMESH_IDSource_ptr theSource2)
{
bool isNode1 = isNodeType(types1);
bool isNode2 = isOrigin || isNodeType(types2);
- SMESH::long_array_var aElementsId1 = theSource1->GetIDs();
- SMESH::long_array_var aElementsId2;
+ SMESH::smIdType_array_var aElementsId1 = theSource1->GetIDs();
+ SMESH::smIdType_array_var aElementsId2;
// compute distance between two entities
/* NOTE: currently only node-to-node case is implemented
if ( !aMesh )
return;
- if ( DownCast<SMESH_Mesh_i*>( theObject )) // theObject is mesh
+ if (SMESH::DownCast<SMESH_Mesh_i*>( theObject )) // theObject is mesh
{
for (SMDS_NodeIteratorPtr aNodeIter = aMesh->nodesIterator(); aNodeIter->more(); )
enlargeBoundingBox( aNodeIter->next(), theMeasure);
else
{
SMESH::array_of_ElementType_var types = theObject->GetTypes();
- SMESH::long_array_var aElementsId = theObject->GetIDs();
+ SMESH::smIdType_array_var aElementsId = theObject->GetIDs();
// here we assume that type of all IDs defined by first type in array
const bool isNode = isNodeType( types );
for(int i = 0, n = aElementsId->length(); i < n; i++)
// name : BoundingBox
// Purpose : compute common bounding box of entities
//=======================================================================
-SMESH::Measure Measurements_i::BoundingBox (const SMESH::ListOfIDSources& theSources)
+SMESH::Measure SMESH::Measurements_i::BoundingBox (const SMESH::ListOfIDSources& theSources)
{
SMESH::Measure aMeasure;
initMeasure(aMeasure);
// name : Length
// Purpose : sum of length of 1D elements of the source
//=======================================================================
-double Measurements_i::Length(SMESH::SMESH_IDSource_ptr theSource)
+double SMESH::Measurements_i::Length(SMESH::SMESH_IDSource_ptr theSource)
{
return getNumericalValue( theSource, SMESH::Controls::NumericalFunctorPtr(new SMESH::Controls::Length()) );
}
// name : Area
// Purpose : sum of area of 2D elements of the source
//=======================================================================
-double Measurements_i::Area(SMESH::SMESH_IDSource_ptr theSource)
+double SMESH::Measurements_i::Area(SMESH::SMESH_IDSource_ptr theSource)
{
return getNumericalValue( theSource, SMESH::Controls::NumericalFunctorPtr(new SMESH::Controls::Area()) );
}
// name : Volume
// Purpose : sum of volume of 3D elements of the source
//=======================================================================
-double Measurements_i::Volume(SMESH::SMESH_IDSource_ptr theSource)
+double SMESH::Measurements_i::Volume(SMESH::SMESH_IDSource_ptr theSource)
{
return getNumericalValue( theSource, SMESH::Controls::NumericalFunctorPtr(new SMESH::Controls::Volume()) );
}
//purpose : return gravity center of the source: average coordinates of all nodes
//=======================================================================
-SMESH::PointStruct Measurements_i::GravityCenter(SMESH::SMESH_IDSource_ptr theSource)
+SMESH::PointStruct SMESH::Measurements_i::GravityCenter(SMESH::SMESH_IDSource_ptr theSource)
{
SMESH::PointStruct grCenter = { 0.,0.,0. };
const SMESHDS_Mesh* mesh = getMesh( theSource );
//purpose : Return angle in radians defined by 3 points <(p1,p2,p3)
//=======================================================================
-CORBA::Double Measurements_i::Angle(const SMESH::PointStruct& p1,
- const SMESH::PointStruct& p2,
- const SMESH::PointStruct& p3 )
+CORBA::Double SMESH::Measurements_i::Angle(const SMESH::PointStruct& p1,
+ const SMESH::PointStruct& p2,
+ const SMESH::PointStruct& p3 )
{
gp_Vec v1( p1.x - p2.x, p1.y - p2.y, p1.z - p2.z );
gp_Vec v2( p3.x - p2.x, p3.y - p2.y, p3.z - p2.z );