X-Git-Url: http://git.salome-platform.org/gitweb/?p=modules%2Fsmesh.git;a=blobdiff_plain;f=src%2FSMDS%2FSMDS_MeshGroup.cxx;h=e2f5fbccfa3750effcc0dc1a29fc7f709339be65;hp=67c1df42616525e0e5abb2eb4412faf75ecfef33;hb=19fe2e412fa1cb1fd33d7a2580b2483280db811e;hpb=0635c9fc80f67d1e5dc0e94ec85f487286a92070 diff --git a/src/SMDS/SMDS_MeshGroup.cxx b/src/SMDS/SMDS_MeshGroup.cxx index 67c1df426..e2f5fbccf 100644 --- a/src/SMDS/SMDS_MeshGroup.cxx +++ b/src/SMDS/SMDS_MeshGroup.cxx @@ -1,25 +1,26 @@ -// Copyright (C) 2007-2008 CEA/DEN, EDF R&D, OPEN CASCADE +// 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-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. +// 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. +// 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 +// 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 +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // -// SMESH SMDS : implementaion of Salome mesh data structure + +// SMESH SMDS : implementation of Salome mesh data structure // File : SMDS_MeshGroup.cxx // Author : Jean-Michel BOULCOURT // Module : SMESH @@ -29,143 +30,127 @@ #endif #include "SMDS_MeshGroup.hxx" -#include "utilities.h" -using namespace std; +#include "SMDS_SetIterator.hxx" +#include "ObjectPool.hxx" -//======================================================================= -//function : SMDS_MeshGroup -//purpose : -//======================================================================= +#include -SMDS_MeshGroup::SMDS_MeshGroup(const SMDS_Mesh * theMesh, - const SMDSAbs_ElementType theType) - :myMesh(theMesh),myType(theType), myParent(NULL) -{ -} +#include //======================================================================= //function : SMDS_MeshGroup -//purpose : +//purpose : //======================================================================= -SMDS_MeshGroup::SMDS_MeshGroup(SMDS_MeshGroup * theParent, +SMDS_MeshGroup::SMDS_MeshGroup(const SMDS_Mesh * theMesh, const SMDSAbs_ElementType theType) - :myMesh(theParent->myMesh),myType(theType), myParent(theParent) + : SMDS_ElementHolder( theMesh ), myType( theType ), myTic( 0 ) { } //======================================================================= -//function : AddSubGroup -//purpose : +//function : Clear +//purpose : //======================================================================= -const SMDS_MeshGroup *SMDS_MeshGroup::AddSubGroup - (const SMDSAbs_ElementType theType) +void SMDS_MeshGroup::Clear() { - const SMDS_MeshGroup * subgroup = new SMDS_MeshGroup(this,theType); - 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 * theGroup) +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 == theGroup) - { - 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)); - } + 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 : Clear -//purpose : +//function : Contains +//purpose : //======================================================================= -void SMDS_MeshGroup::Clear() +bool SMDS_MeshGroup::Contains(const SMDS_MeshElement * theElem) const { - myElements.clear(); - myType = SMDSAbs_All; + return myElements.find( theElem ) != myElements.end(); } //======================================================================= -//function : Add +//function : SetType //purpose : //======================================================================= -void SMDS_MeshGroup::Add(const SMDS_MeshElement * theElem) +void SMDS_MeshGroup::SetType(const SMDSAbs_ElementType theType) { - // 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()<<"!="<::iterator found - = myElements.find(theElem); - if ( found != myElements.end() ) { - myElements.erase(found); - if (myElements.empty()) myType = SMDSAbs_All; - return true; - } - return false; + typedef SMDS_SetIterator< const SMDS_MeshElement*, TIterator > TSetIterator; + return boost::make_shared< TSetIterator >( myElements.begin(), myElements.end() ); } //======================================================================= -//function : Contains +//function : Move contents of another group //purpose : //======================================================================= -bool SMDS_MeshGroup::Contains(const SMDS_MeshElement * theElem) const +void SMDS_MeshGroup::operator=( SMDS_MeshGroup && other ) { - return myElements.find(theElem)!=myElements.end(); + myMesh = other.myMesh; + myType = other.myType; + myElements = std::move( other.myElements ); + ++myTic; } //======================================================================= -//function : SetType -//purpose : +//function : tmpClear +//purpose : temporary remove its elements before mesh compacting //======================================================================= -void SMDS_MeshGroup::SetType(const SMDSAbs_ElementType theType) +void SMDS_MeshGroup::tmpClear() { - if (IsEmpty()) - myType = theType; + myElements.clear(); }