X-Git-Url: http://git.salome-platform.org/gitweb/?p=modules%2Fsmesh.git;a=blobdiff_plain;f=src%2FSMDS%2FSMDS_MeshGroup.cxx;h=c41409c70e00e4702b347834f34c838d1cd0dae9;hp=25e942abb32b7e0bc075d64988a6811a68034e3c;hb=cc85955178440fffe36eef234d759e3c3590248f;hpb=13b8c20dfc9f5bedf2dd4699ac1e05a8d4227791 diff --git a/src/SMDS/SMDS_MeshGroup.cxx b/src/SMDS/SMDS_MeshGroup.cxx index 25e942abb..c41409c70 100644 --- a/src/SMDS/SMDS_MeshGroup.cxx +++ b/src/SMDS/SMDS_MeshGroup.cxx @@ -1,173 +1,157 @@ -// SMESH SMDS : implementaion of Salome mesh data structure +// Copyright (C) 2007-2016 CEA/DEN, EDF R&D, OPEN CASCADE // -// 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 +// 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, 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 : implementation of Salome mesh data structure // File : SMDS_MeshGroup.cxx // Author : Jean-Michel BOULCOURT // Module : SMESH +// +#ifdef _MSC_VER +#pragma warning(disable:4786) +#endif -using namespace std; #include "SMDS_MeshGroup.hxx" -#include "utilities.h" -//======================================================================= -//function : SMDS_MeshGroup -//purpose : -//======================================================================= -SMDS_MeshGroup::SMDS_MeshGroup(const SMDS_Mesh * aMesh) - :myMesh(aMesh),myType(SMDSAbs_All), myParent(NULL) -{ -} +#include "SMDS_SetIterator.hxx" +#include "ObjectPool.hxx" + +#include + +#include //======================================================================= //function : SMDS_MeshGroup -//purpose : +//purpose : //======================================================================= -SMDS_MeshGroup::SMDS_MeshGroup(SMDS_MeshGroup * parent) - :myMesh(parent->myMesh),myType(SMDSAbs_All), myParent(parent) +SMDS_MeshGroup::SMDS_MeshGroup(const SMDS_Mesh * theMesh, + const SMDSAbs_ElementType theType) + : SMDS_ElementHolder( theMesh ), myType( theType ), myTic( 0 ) { } //======================================================================= -//function : AddSubGroup -//purpose : +//function : Clear +//purpose : //======================================================================= -const SMDS_MeshGroup *SMDS_MeshGroup::AddSubGroup() +void SMDS_MeshGroup::Clear() { - const SMDS_MeshGroup * subgroup = new SMDS_MeshGroup(this); - myChildren.insert(myChildren.end(),subgroup); - return subgroup; + clearVector( myElements ); + myType = SMDSAbs_All; + ++myTic; } //======================================================================= -//function : RemoveSubGroup +//function : Add //purpose : //======================================================================= -bool SMDS_MeshGroup::RemoveSubGroup(const SMDS_MeshGroup * aGroup) +bool SMDS_MeshGroup::Add(const SMDS_MeshElement * theElem) { - bool found = false; - list::iterator itgroup; - for(itgroup=myChildren.begin(); itgroup!=myChildren.end(); itgroup++) - { - const SMDS_MeshGroup* subgroup=*itgroup; - if (subgroup == aGroup) - { - found = true; - myChildren.erase(itgroup); - } - } - - return found; -} + // 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()<<"!="<RemoveSubGroup(this)); - } -} -//======================================================================= -//function : Clear -//purpose : -//======================================================================= + ++myTic; -void SMDS_MeshGroup::Clear() -{ - myElements.clear(); - myType = SMDSAbs_All; + return added; } //======================================================================= -//function : IsEmpty -//purpose : +//function : Remove +//purpose : //======================================================================= -bool SMDS_MeshGroup::IsEmpty() const +bool SMDS_MeshGroup::Remove( const SMDS_MeshElement * theElem ) { - return myElements.empty(); + TElementSet::iterator found = myElements.find(theElem); + if ( found != myElements.end() ) { + myElements.erase( found ); + if ( myElements.empty() ) myType = SMDSAbs_All; + ++myTic; + return true; + } + return false; } //======================================================================= -//function : Extent -//purpose : +//function : Contains +//purpose : //======================================================================= -int SMDS_MeshGroup::Extent() const +bool SMDS_MeshGroup::Contains(const SMDS_MeshElement * theElem) const { - return myElements.size(); + return myElements.find( theElem ) != myElements.end(); } //======================================================================= -//function : Add +//function : SetType //purpose : //======================================================================= -void SMDS_MeshGroup::Add(const SMDS_MeshElement * ME) +void SMDS_MeshGroup::SetType(const SMDSAbs_ElementType theType) { - // the type of the group is determined by the first element added - if (myElements.empty()) myType = ME->GetType(); - else if (ME->GetType() != myType) - MESSAGE("SMDS_MeshGroup::Add : Type Mismatch"); - - myElements.insert(ME); + if (IsEmpty()) + myType = theType; } //======================================================================= -//function : Remove +//function : GetElements //purpose : //======================================================================= -void SMDS_MeshGroup::Remove(const SMDS_MeshElement * ME) +SMDS_ElemIteratorPtr SMDS_MeshGroup::GetElements() const { - myElements.erase(ME); - if (myElements.empty()) myType = SMDSAbs_All; + typedef SMDS_SetIterator< const SMDS_MeshElement*, TIterator > TSetIterator; + return boost::make_shared< TSetIterator >( myElements.begin(), myElements.end() ); } //======================================================================= -//function : Type +//function : Move contents of another group //purpose : //======================================================================= -SMDSAbs_ElementType SMDS_MeshGroup::Type() const +void SMDS_MeshGroup::operator=( SMDS_MeshGroup && other ) { - return myType; + myMesh = other.myMesh; + myType = other.myType; + myElements = std::move( other.myElements ); + ++myTic; } //======================================================================= -//function : Contains -//purpose : +//function : tmpClear +//purpose : temporary remove its elements before mesh compacting //======================================================================= -bool SMDS_MeshGroup::Contains(const SMDS_MeshElement * ME) const +void SMDS_MeshGroup::tmpClear() { - return myElements.find(ME)!=myElements.end(); + myElements.clear(); }