X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FSMDS%2FSMDS_VolumeOfNodes.cxx;h=eb5101e7a96ca1322b38cbaa2e4fb80c35462a37;hb=df4c7b63f2d766f684ed78925a2d1b296ffc882b;hp=25c0bf567dee9412ea162930edff5233dbc6a181;hpb=e4737e85f0da6d3f90fd08f6be1c2825195fe16f;p=modules%2Fsmesh.git diff --git a/src/SMDS/SMDS_VolumeOfNodes.cxx b/src/SMDS/SMDS_VolumeOfNodes.cxx index 25c0bf567..eb5101e7a 100644 --- a/src/SMDS/SMDS_VolumeOfNodes.cxx +++ b/src/SMDS/SMDS_VolumeOfNodes.cxx @@ -1,28 +1,38 @@ +// Copyright (C) 2007-2008 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 +// +// This library is free software; you can redistribute it and/or +// modify it under the terms of the GNU Lesser General Public +// License as published by the Free Software Foundation; either +// version 2.1 of the License. +// +// This library is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +// Lesser General Public License for more details. +// +// You should have received a copy of the GNU Lesser General Public +// 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.salome-platform.org/ or email : webmaster.salome@opencascade.com +// // SMESH SMDS : implementaion of Salome mesh data structure // -// Copyright (C) 2003 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN, -// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS -// -// This library is free software; you can redistribute it and/or -// modify it under the terms of the GNU Lesser General Public -// License as published by the Free Software Foundation; either -// version 2.1 of the License. -// -// This library is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -// Lesser General Public License for more details. -// -// You should have received a copy of the GNU Lesser General Public -// 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 +#ifdef _MSC_VER +#pragma warning(disable:4786) +#endif #include "SMDS_VolumeOfNodes.hxx" #include "SMDS_MeshNode.hxx" +#include "SMDS_SetIterator.hxx" +#include "SMDS_VolumeTool.hxx" #include "utilities.h" +#include + using namespace std; /////////////////////////////////////////////////////////////////////////////// @@ -39,7 +49,8 @@ SMDS_VolumeOfNodes::SMDS_VolumeOfNodes( const SMDS_MeshNode * node7, const SMDS_MeshNode * node8) { - myNodes.resize(8); + myNbNodes = 8; + myNodes = new const SMDS_MeshNode* [myNbNodes]; myNodes[0]=node1; myNodes[1]=node2; myNodes[2]=node3; @@ -56,7 +67,8 @@ SMDS_VolumeOfNodes::SMDS_VolumeOfNodes( const SMDS_MeshNode * node3, const SMDS_MeshNode * node4) { - myNodes.resize(4); + myNbNodes = 4; + myNodes = new const SMDS_MeshNode* [myNbNodes]; myNodes[0]=node1; myNodes[1]=node2; myNodes[2]=node3; @@ -70,7 +82,8 @@ SMDS_VolumeOfNodes::SMDS_VolumeOfNodes( const SMDS_MeshNode * node4, const SMDS_MeshNode * node5) { - myNodes.resize(5); + myNbNodes = 5; + myNodes = new const SMDS_MeshNode* [myNbNodes]; myNodes[0]=node1; myNodes[1]=node2; myNodes[2]=node3; @@ -86,7 +99,8 @@ SMDS_VolumeOfNodes::SMDS_VolumeOfNodes( const SMDS_MeshNode * node5, const SMDS_MeshNode * node6) { - myNodes.resize(6); + myNbNodes = 6; + myNodes = new const SMDS_MeshNode* [myNbNodes]; myNodes[0]=node1; myNodes[1]=node2; myNodes[2]=node3; @@ -94,18 +108,30 @@ SMDS_VolumeOfNodes::SMDS_VolumeOfNodes( myNodes[4]=node5; myNodes[5]=node6; } + bool SMDS_VolumeOfNodes::ChangeNodes(const SMDS_MeshNode* nodes[], const int nbNodes) { if (nbNodes < 4 || nbNodes > 8 || nbNodes == 7) return false; - myNodes.resize( nbNodes ); + delete [] myNodes; + myNbNodes = nbNodes; + myNodes = new const SMDS_MeshNode* [myNbNodes]; for ( int i = 0; i < nbNodes; i++ ) myNodes[ i ] = nodes [ i ]; return true; } + +SMDS_VolumeOfNodes::~SMDS_VolumeOfNodes() +{ + if (myNodes != NULL) { + delete [] myNodes; + myNodes = NULL; + } +} + //======================================================================= //function : Print //purpose : @@ -115,7 +141,7 @@ void SMDS_VolumeOfNodes::Print(ostream & OS) const { OS << "volume <" << GetID() << "> : "; int i; - for (i = 0; i < NbNodes(); ++i) OS << myNodes[i] << ","; + for (i = 0; i < NbNodes()-1; ++i) OS << myNodes[i] << ","; OS << myNodes[NbNodes()-1]<< ") " << endl; } @@ -134,7 +160,7 @@ int SMDS_VolumeOfNodes::NbFaces() const int SMDS_VolumeOfNodes::NbNodes() const { - return myNodes.size(); + return myNbNodes; } int SMDS_VolumeOfNodes::NbEdges() const @@ -150,35 +176,56 @@ int SMDS_VolumeOfNodes::NbEdges() const return 0; } -class SMDS_VolumeOfNodes_MyIterator:public SMDS_ElemIterator +/// =================================================================== +/*! + * \brief Iterator on node of volume + */ +/// =================================================================== + +class SMDS_VolumeOfNodes_MyIterator:public SMDS_NodeArrayElemIterator { - const vector& mySet; - int index; public: - SMDS_VolumeOfNodes_MyIterator(const vector& s): - mySet(s),index(0) {} + SMDS_VolumeOfNodes_MyIterator(const SMDS_MeshNode* const* s, int l): + SMDS_NodeArrayElemIterator( s, & s[ l ]) {} +}; - bool more() - { - return index myElems; + int myIndex; +public: + _MySubIterator(const SMDS_VolumeOfNodes* vol, SMDSAbs_ElementType type):myIndex(0) { + SMDS_VolumeTool vTool(vol); + if (type == SMDSAbs_Face) + vTool.GetAllExistingFaces( myElems ); + else + vTool.GetAllExistingFaces( myElems ); } + /// Return true if and only if there are other object in this iterator + virtual bool more() { return myIndex < myElems.size(); } + + /// Return the current object and step to the next one + virtual const SMDS_MeshElement* next() { return myElems[ myIndex++ ]; } }; -SMDS_ElemIteratorPtr SMDS_VolumeOfNodes:: - elementsIterator(SMDSAbs_ElementType type) const +SMDS_ElemIteratorPtr SMDS_VolumeOfNodes::elementsIterator(SMDSAbs_ElementType type) const { switch(type) { case SMDSAbs_Volume: return SMDS_MeshElement::elementsIterator(SMDSAbs_Volume); case SMDSAbs_Node: - return SMDS_ElemIteratorPtr(new SMDS_VolumeOfNodes_MyIterator(myNodes)); + return SMDS_ElemIteratorPtr(new SMDS_VolumeOfNodes_MyIterator(myNodes,myNbNodes)); + case SMDSAbs_Face: + return SMDS_ElemIteratorPtr(new _MySubIterator(this,SMDSAbs_Face)); + case SMDSAbs_Edge: + return SMDS_ElemIteratorPtr(new _MySubIterator(this,SMDSAbs_Edge)); default: MESSAGE("ERROR : Iterator not implemented"); return SMDS_ElemIteratorPtr((SMDS_ElemIterator*)NULL); @@ -189,3 +236,13 @@ SMDSAbs_ElementType SMDS_VolumeOfNodes::GetType() const { return SMDSAbs_Volume; } + +/*! + * \brief Return node by its index + * \param ind - node index + * \retval const SMDS_MeshNode* - the node + */ +const SMDS_MeshNode* SMDS_VolumeOfNodes::GetNode(const int ind) const +{ + return myNodes[ ind ]; +}