X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;ds=inline;f=src%2FSMDS%2FSMDS_VolumeOfNodes.cxx;h=af3c64cf5c2ee25342407b826dd76e6b9ff6e267;hb=7fa9d586e1381ea93492814be9023a9a3d7166bb;hp=c7b308e919cbcf73fe5d9cb0c20d344c5d6a47c9;hpb=4ea4ccf36f3c18ecde6f63d51d3e8876a2a27344;p=modules%2Fsmesh.git diff --git a/src/SMDS/SMDS_VolumeOfNodes.cxx b/src/SMDS/SMDS_VolumeOfNodes.cxx index c7b308e91..af3c64cf5 100644 --- a/src/SMDS/SMDS_VolumeOfNodes.cxx +++ b/src/SMDS/SMDS_VolumeOfNodes.cxx @@ -17,27 +17,38 @@ // 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 +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com + +#ifdef _MSC_VER +#pragma warning(disable:4786) +#endif -#include "utilities.h" #include "SMDS_VolumeOfNodes.hxx" #include "SMDS_MeshNode.hxx" +#include "SMDS_SetIterator.hxx" +#include "SMDS_VolumeTool.hxx" +#include "utilities.h" + +#include + +using namespace std; /////////////////////////////////////////////////////////////////////////////// /// Create an hexahedron. node 1,2,3,4 and 5,6,7,8 are quadrangle and /// 5,1 and 7,3 are an edges. /////////////////////////////////////////////////////////////////////////////// SMDS_VolumeOfNodes::SMDS_VolumeOfNodes( - SMDS_MeshNode * node1, - SMDS_MeshNode * node2, - SMDS_MeshNode * node3, - SMDS_MeshNode * node4, - SMDS_MeshNode * node5, - SMDS_MeshNode * node6, - SMDS_MeshNode * node7, - SMDS_MeshNode * node8) + const SMDS_MeshNode * node1, + const SMDS_MeshNode * node2, + const SMDS_MeshNode * node3, + const SMDS_MeshNode * node4, + const SMDS_MeshNode * node5, + const SMDS_MeshNode * node6, + 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; @@ -49,12 +60,13 @@ SMDS_VolumeOfNodes::SMDS_VolumeOfNodes( } SMDS_VolumeOfNodes::SMDS_VolumeOfNodes( - SMDS_MeshNode * node1, - SMDS_MeshNode * node2, - SMDS_MeshNode * node3, - SMDS_MeshNode * node4) + const SMDS_MeshNode * node1, + const SMDS_MeshNode * node2, + 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; @@ -62,13 +74,14 @@ SMDS_VolumeOfNodes::SMDS_VolumeOfNodes( } SMDS_VolumeOfNodes::SMDS_VolumeOfNodes( - SMDS_MeshNode * node1, - SMDS_MeshNode * node2, - SMDS_MeshNode * node3, - SMDS_MeshNode * node4, - SMDS_MeshNode * node5) + const SMDS_MeshNode * node1, + const SMDS_MeshNode * node2, + const SMDS_MeshNode * node3, + 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; @@ -77,14 +90,15 @@ SMDS_VolumeOfNodes::SMDS_VolumeOfNodes( } SMDS_VolumeOfNodes::SMDS_VolumeOfNodes( - SMDS_MeshNode * node1, - SMDS_MeshNode * node2, - SMDS_MeshNode * node3, - SMDS_MeshNode * node4, - SMDS_MeshNode * node5, - SMDS_MeshNode * node6) + const SMDS_MeshNode * node1, + const SMDS_MeshNode * node2, + const SMDS_MeshNode * node3, + const SMDS_MeshNode * node4, + 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; @@ -92,6 +106,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; + + 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 : @@ -101,8 +139,8 @@ void SMDS_VolumeOfNodes::Print(ostream & OS) const { OS << "volume <" << GetID() << "> : "; int i; - for (i = 0; i < 7; ++i) OS << myNodes[i] << ","; - OS << myNodes[7]<< ") " << endl; + for (i = 0; i < NbNodes(); ++i) OS << myNodes[i] << ","; + OS << myNodes[NbNodes()-1]<< ") " << endl; } int SMDS_VolumeOfNodes::NbFaces() const @@ -115,11 +153,12 @@ int SMDS_VolumeOfNodes::NbFaces() const case 8: return 6; default: MESSAGE("invalid number of nodes"); } + return 0; } int SMDS_VolumeOfNodes::NbNodes() const { - return myNodes.size(); + return myNbNodes; } int SMDS_VolumeOfNodes::NbEdges() const @@ -132,39 +171,78 @@ int SMDS_VolumeOfNodes::NbEdges() const case 8: return 12; default: MESSAGE("invalid number of nodes"); } + return 0; } -SMDS_Iterator * SMDS_VolumeOfNodes:: - elementsIterator(SMDSAbs_ElementType type) const +/// =================================================================== +/*! + * \brief Iterator on node of volume + */ +/// =================================================================== + +class SMDS_VolumeOfNodes_MyIterator:public SMDS_NodeArrayElemIterator { - class MyIterator:public SMDS_Iterator - { - const vector& mySet; - int index; - public: - MyIterator(const vector& s):mySet(s),index(0) - {} - - 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 +{ + switch(type) + { + case SMDSAbs_Volume: + return SMDS_MeshElement::elementsIterator(SMDSAbs_Volume); + case SMDSAbs_Node: + 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); + } } 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 + * + * Index is wrapped if it is out of a valid range + */ +const SMDS_MeshNode* SMDS_VolumeOfNodes::GetNode(const int ind) const +{ + return myNodes[ WrappedIndex( ind )]; +}