X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FSMDS%2FSMDS_MeshNode.cxx;h=587aee90a86284144296f898755b476f326607d5;hb=be89ffa62346a3882b41c8f3a07846651e8b1b4b;hp=20bce63695892d324ac8962a3daa3706a4ffa370;hpb=888669652e8ebdff0161e485913c1d3b93e4b5dc;p=modules%2Fsmesh.git diff --git a/src/SMDS/SMDS_MeshNode.cxx b/src/SMDS/SMDS_MeshNode.cxx index 20bce6369..587aee90a 100644 --- a/src/SMDS/SMDS_MeshNode.cxx +++ b/src/SMDS/SMDS_MeshNode.cxx @@ -17,13 +17,18 @@ // 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 "SMDS_MeshNode.hxx" #include "SMDS_SpacePosition.hxx" #include "SMDS_IteratorOfElements.hxx" +using namespace std; + //======================================================================= //function : SMDS_MeshNode //purpose : @@ -42,7 +47,14 @@ SMDS_MeshNode::SMDS_MeshNode(double x, double y, double z): void SMDS_MeshNode::RemoveInverseElement(const SMDS_MeshElement * parent) { - myInverseElements.erase(parent); + NCollection_List::Iterator it(myInverseElements); + while (it.More()) { + const SMDS_MeshElement* elem = it.Value(); + if (elem == parent) + myInverseElements.Remove(it); + else + it.Next(); + } } //======================================================================= @@ -61,7 +73,7 @@ void SMDS_MeshNode::Print(ostream & OS) const //purpose : //======================================================================= -void SMDS_MeshNode::SetPosition(SMDS_Position * aPos) +void SMDS_MeshNode::SetPosition(const SMDS_PositionPtr& aPos) { myPosition = aPos; } @@ -71,94 +83,100 @@ void SMDS_MeshNode::SetPosition(SMDS_Position * aPos) //purpose : //======================================================================= -SMDS_Position *SMDS_MeshNode::GetPosition() +const SMDS_PositionPtr& SMDS_MeshNode::GetPosition() const { return myPosition; } -const SMDS_Position *SMDS_MeshNode::GetPosition() const +//======================================================================= +/*! + * \brief Iterator on list of elements + */ +//======================================================================= + +class SMDS_MeshNode_MyInvIterator:public SMDS_ElemIterator { - return myPosition; + NCollection_List::Iterator myIterator; + SMDSAbs_ElementType myType; + public: + SMDS_MeshNode_MyInvIterator(const NCollection_List& s, + SMDSAbs_ElementType type): + myIterator(s), myType(type) + {} + + bool more() + { + if ( myType != SMDSAbs_All ) { + while ( myIterator.More() && myIterator.Value()->GetType() != myType) + myIterator.Next(); + } + return myIterator.More() != Standard_False; + } + + const SMDS_MeshElement* next() + { + const SMDS_MeshElement* current=myIterator.Value(); + myIterator.Next(); + return current; + } +}; + +SMDS_ElemIteratorPtr SMDS_MeshNode:: + GetInverseElementIterator(SMDSAbs_ElementType type) const +{ + return SMDS_ElemIteratorPtr(new SMDS_MeshNode_MyInvIterator(myInverseElements,type)); } -/** -*/ -SMDS_Iterator * SMDS_MeshNode:: - GetInverseElementIterator() const + +// Same as GetInverseElementIterator but the create iterator only return +// wanted type elements. +class SMDS_MeshNode_MyIterator:public SMDS_ElemIterator { - class SMDS_InverseElementIterator:public SMDS_Iterator - { - const set& mySet; - set::iterator myIterator; - public: - SMDS_InverseElementIterator(const set& s):mySet(s) - { - myIterator=mySet.begin(); - } - - bool more() - { - return myIterator!=mySet.end(); - } - - const SMDS_MeshElement* next() - { - const SMDS_MeshElement* current=*myIterator; - myIterator++; - return current; - } - }; - return new SMDS_InverseElementIterator(myInverseElements); -} - -SMDS_Iterator * SMDS_MeshNode:: + NCollection_List mySet; + NCollection_List::Iterator myIterator; + public: + SMDS_MeshNode_MyIterator(SMDSAbs_ElementType type, + const NCollection_List& s) + { + const SMDS_MeshElement * e; + bool toInsert; + NCollection_List::Iterator it(s); + for(; it.More(); it.Next()) + { + e=it.Value(); + switch(type) + { + case SMDSAbs_Edge: toInsert=true; break; + case SMDSAbs_Face: toInsert=(e->GetType()!=SMDSAbs_Edge); break; + case SMDSAbs_Volume: toInsert=(e->GetType()==SMDSAbs_Volume); break; + } + if(toInsert) mySet.Append(e); + } + myIterator.Init(mySet); + } + + bool more() + { + return myIterator.More() != Standard_False; + } + + const SMDS_MeshElement* next() + { + const SMDS_MeshElement* current=myIterator.Value(); + myIterator.Next(); + return current; + } +}; + +SMDS_ElemIteratorPtr SMDS_MeshNode:: elementsIterator(SMDSAbs_ElementType type) const { - // Same as GetInverseElementIterator but the create iterator only return - // wanted type elements. - class MyIterator:public SMDS_Iterator - { - set mySet; - set::iterator myIterator; - public: - MyIterator(SMDSAbs_ElementType type, - const set& s) - { - const SMDS_MeshElement * e; - bool toInsert; - set::iterator it=s.begin(); - while(it!=s.end()) - { - e=*it; - switch(type) - { - case SMDSAbs_Edge: toInsert=true; break; - case SMDSAbs_Face: toInsert=(e->GetType()!=SMDSAbs_Edge); break; - case SMDSAbs_Volume: toInsert=(e->GetType()==SMDSAbs_Volume); break; - } - if(toInsert) mySet.insert(e); - it++; - } - myIterator=mySet.begin(); - } - - bool more() - { - return myIterator!=mySet.end(); - } - - const SMDS_MeshElement* next() - { - const SMDS_MeshElement* current=*myIterator; - myIterator++; - return current; - } - }; - - if(type==SMDSAbs_Node) - return SMDS_MeshElement::elementsIterator(SMDSAbs_Node); - else - return new SMDS_IteratorOfElements(this,type, - new MyIterator(type, myInverseElements)); + if(type==SMDSAbs_Node) + return SMDS_MeshElement::elementsIterator(SMDSAbs_Node); + else + return SMDS_ElemIteratorPtr + (new SMDS_IteratorOfElements + (this,type, + SMDS_ElemIteratorPtr(new SMDS_MeshNode_MyIterator(type, myInverseElements)))); } int SMDS_MeshNode::NbNodes() const @@ -199,7 +217,13 @@ SMDSAbs_ElementType SMDS_MeshNode::GetType() const //======================================================================= void SMDS_MeshNode::AddInverseElement(const SMDS_MeshElement* ME) { - myInverseElements.insert(ME); + NCollection_List::Iterator it(myInverseElements); + for (; it.More(); it.Next()) { + const SMDS_MeshElement* elem = it.Value(); + if (elem == ME) + return; + } + myInverseElements.Append(ME); } //======================================================================= @@ -208,12 +232,30 @@ void SMDS_MeshNode::AddInverseElement(const SMDS_MeshElement* ME) //======================================================================= void SMDS_MeshNode::ClearInverseElements() { - myInverseElements.clear(); + myInverseElements.Clear(); } bool SMDS_MeshNode::emptyInverseElements() { - return myInverseElements.empty(); + return myInverseElements.IsEmpty() != Standard_False; +} + +//================================================================================ +/*! + * \brief Count inverse elements of given type + */ +//================================================================================ + +int SMDS_MeshNode::NbInverseElements(SMDSAbs_ElementType type) const +{ + if ( type == SMDSAbs_All ) + return myInverseElements.Extent(); + int nb = 0; + NCollection_List::Iterator it( myInverseElements ); + for ( ; it.More(); it.Next() ) + if ( it.Value()->GetType() == type ) + nb++; + return nb; } ///////////////////////////////////////////////////////////////////////////////