X-Git-Url: http://git.salome-platform.org/gitweb/?p=modules%2Fsmesh.git;a=blobdiff_plain;f=src%2FSMDS%2FSMDS_MeshGroup.cxx;h=0cb481c501c0c38f13c2bd9d966c274625c271fd;hp=da85821dae056d732587d6e38a210bc3514802c7;hb=9efbaa6f5e4947bdcfdd04e5412ae1ece49b02fd;hpb=007c0191337598a9431229b2d3dec7fde25d4c4e diff --git a/src/SMDS/SMDS_MeshGroup.cxx b/src/SMDS/SMDS_MeshGroup.cxx index da85821da..0cb481c50 100644 --- a/src/SMDS/SMDS_MeshGroup.cxx +++ b/src/SMDS/SMDS_MeshGroup.cxx @@ -24,17 +24,23 @@ // Author : Jean-Michel BOULCOURT // Module : SMESH +#ifdef _MSC_VER +#pragma warning(disable:4786) +#endif + +#include "SMDS_MeshGroup.hxx" +#include "utilities.h" + using namespace std; -#include "SMDS_MeshGroup.ixx" -#include "SMDS_ListIteratorOfListOfMeshGroup.hxx" //======================================================================= //function : SMDS_MeshGroup //purpose : //======================================================================= -SMDS_MeshGroup::SMDS_MeshGroup(const Handle(SMDS_Mesh)& aMesh) - :myMesh(aMesh),myType(SMDSAbs_All) +SMDS_MeshGroup::SMDS_MeshGroup(const SMDS_Mesh * theMesh, + const SMDSAbs_ElementType theType) + :myMesh(theMesh),myType(theType), myParent(NULL) { } @@ -43,8 +49,9 @@ SMDS_MeshGroup::SMDS_MeshGroup(const Handle(SMDS_Mesh)& aMesh) //purpose : //======================================================================= -SMDS_MeshGroup::SMDS_MeshGroup(const Handle(SMDS_MeshGroup)& parent) - :myMesh(parent->myMesh),myType(SMDSAbs_All),myParent(parent) +SMDS_MeshGroup::SMDS_MeshGroup(SMDS_MeshGroup * theParent, + const SMDSAbs_ElementType theType) + :myMesh(theParent->myMesh),myType(theType), myParent(theParent) { } @@ -53,13 +60,12 @@ SMDS_MeshGroup::SMDS_MeshGroup(const Handle(SMDS_MeshGroup)& parent) //purpose : //======================================================================= -Handle(SMDS_MeshGroup) SMDS_MeshGroup::AddSubGroup() +const SMDS_MeshGroup *SMDS_MeshGroup::AddSubGroup + (const SMDSAbs_ElementType theType) { - Handle(SMDS_MeshGroup) subgroup = new SMDS_MeshGroup(this); - if (!subgroup.IsNull()) { - myChildren.Append(subgroup); - } - return subgroup; + const SMDS_MeshGroup * subgroup = new SMDS_MeshGroup(this,theType); + myChildren.insert(myChildren.end(),subgroup); + return subgroup; } //======================================================================= @@ -67,21 +73,21 @@ Handle(SMDS_MeshGroup) SMDS_MeshGroup::AddSubGroup() //purpose : //======================================================================= -Standard_Boolean SMDS_MeshGroup::RemoveSubGroup(const Handle(SMDS_MeshGroup)& aGroup) +bool SMDS_MeshGroup::RemoveSubGroup(const SMDS_MeshGroup * theGroup) { - Standard_Boolean found = Standard_False; - - SMDS_ListIteratorOfListOfMeshGroup itgroup(myChildren); - for (;itgroup.More() && !found; itgroup.Next()) { - Handle(SMDS_MeshGroup) subgroup; - subgroup = itgroup.Value(); - if (subgroup == aGroup) { - found = Standard_True; - myChildren.Remove(itgroup); - } - } - - return found; + bool found = false; + list::iterator itgroup; + for(itgroup=myChildren.begin(); itgroup!=myChildren.end(); itgroup++) + { + const SMDS_MeshGroup* subgroup=*itgroup; + if (subgroup == theGroup) + { + found = true; + myChildren.erase(itgroup); + } + } + + return found; } //======================================================================= @@ -89,15 +95,15 @@ Standard_Boolean SMDS_MeshGroup::RemoveSubGroup(const Handle(SMDS_MeshGroup)& aG //purpose : //======================================================================= -Standard_Boolean SMDS_MeshGroup::RemoveFromParent() +bool SMDS_MeshGroup::RemoveFromParent() { - if (myParent.IsNull()) - return Standard_False; - - return (myParent->RemoveSubGroup(this)); - + + if (myParent==NULL) return false; + else + { + return (myParent->RemoveSubGroup(this)); + } } - //======================================================================= //function : Clear //purpose : @@ -105,28 +111,8 @@ Standard_Boolean SMDS_MeshGroup::RemoveFromParent() void SMDS_MeshGroup::Clear() { - myElements.Clear(); - myType = SMDSAbs_All; -} - -//======================================================================= -//function : IsEmpty -//purpose : -//======================================================================= - -Standard_Boolean SMDS_MeshGroup::IsEmpty() const -{ - return myElements.IsEmpty(); -} - -//======================================================================= -//function : Extent -//purpose : -//======================================================================= - -Standard_Integer SMDS_MeshGroup::Extent() const -{ - return myElements.Extent(); + myElements.clear(); + myType = SMDSAbs_All; } //======================================================================= @@ -134,49 +120,44 @@ Standard_Integer SMDS_MeshGroup::Extent() const //purpose : //======================================================================= -void SMDS_MeshGroup::Add(const Handle(SMDS_MeshElement)& ME) +void SMDS_MeshGroup::Add(const SMDS_MeshElement * theElem) { - // the type of the group is determined by the first element added - if (myElements.IsEmpty()) { - myType = ME->GetType(); - } - - if (ME->GetType() != myType) { - Standard_TypeMismatch::Raise("SMDS_MeshGroup::Add"); - } - - myElements.Add(ME); + // the type of the group is determined by the first element added + if (myElements.empty()) myType = theElem->GetType(); + else if (theElem->GetType() != myType) + MESSAGE("SMDS_MeshGroup::Add : Type Mismatch "<GetType()<<"!="<