X-Git-Url: http://git.salome-platform.org/gitweb/?p=modules%2Fsmesh.git;a=blobdiff_plain;f=src%2FSMDS%2FSMDS_MeshGroup.cxx;h=f61079353f7a78bbd240f86eae85c1e02d572f1a;hp=da85821dae056d732587d6e38a210bc3514802c7;hb=76470331971b8ffbc5f8cfc1a4a71857d508fc28;hpb=4791f5b30ea7a9c1247aa551750dc71cb83b99aa diff --git a/src/SMDS/SMDS_MeshGroup.cxx b/src/SMDS/SMDS_MeshGroup.cxx index da85821da..f61079353 100644 --- a/src/SMDS/SMDS_MeshGroup.cxx +++ b/src/SMDS/SMDS_MeshGroup.cxx @@ -1,40 +1,47 @@ -// SMESH SMDS : implementaion of Salome mesh data structure +// Copyright (C) 2007-2016 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 // -// Copyright (C) 2003 OPEN CASCADE -// -// 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 or email : webmaster@opencascade.org +// 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, or (at your option) any later version. // +// 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 // File : SMDS_MeshGroup.cxx // 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), myTic(0) { } @@ -43,8 +50,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 +61,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 +74,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 +96,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 +112,9 @@ Standard_Boolean SMDS_MeshGroup::RemoveFromParent() void SMDS_MeshGroup::Clear() { - myElements.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(); + ++myTic; } //======================================================================= @@ -134,49 +122,57 @@ Standard_Integer SMDS_MeshGroup::Extent() const //purpose : //======================================================================= -void SMDS_MeshGroup::Add(const Handle(SMDS_MeshElement)& ME) +bool 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 (myElements.empty()) { + myType = theElem->GetType(); } - - if (ME->GetType() != myType) { - Standard_TypeMismatch::Raise("SMDS_MeshGroup::Add"); + else if (theElem->GetType() != myType) { + MESSAGE("SMDS_MeshGroup::Add : Type Mismatch "<GetType()<<"!="<::iterator found = myElements.find(theElem); + if ( found != myElements.end() ) { + myElements.erase(found); + if (myElements.empty()) myType = SMDSAbs_All; + ++myTic; + return true; + } + return false; } //======================================================================= -//function : Type +//function : Contains //purpose : //======================================================================= -SMDSAbs_ElementType SMDS_MeshGroup::Type() const +bool SMDS_MeshGroup::Contains(const SMDS_MeshElement * theElem) const { - return myType; + return myElements.find(theElem) != myElements.end(); } //======================================================================= -//function : Contains +//function : SetType //purpose : //======================================================================= -Standard_Boolean SMDS_MeshGroup::Contains(const Handle(SMDS_MeshElement)& ME) const +void SMDS_MeshGroup::SetType(const SMDSAbs_ElementType theType) { - return myElements.Contains(ME); + if (IsEmpty()) + myType = theType; }