X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FSMDS%2FSMDS_MeshGroup.cxx;h=f5ab538a5f8bf945848ec3a26aab9f93f1e18c64;hb=1fb3ff621ac19da15742a5e8b9253b594977d14a;hp=da85821dae056d732587d6e38a210bc3514802c7;hpb=007c0191337598a9431229b2d3dec7fde25d4c4e;p=modules%2Fsmesh.git diff --git a/src/SMDS/SMDS_MeshGroup.cxx b/src/SMDS/SMDS_MeshGroup.cxx index da85821da..f5ab538a5 100644 --- a/src/SMDS/SMDS_MeshGroup.cxx +++ b/src/SMDS/SMDS_MeshGroup.cxx @@ -1,182 +1,157 @@ -// SMESH SMDS : implementaion of Salome mesh data structure +// Copyright (C) 2007-2019 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.ixx" -#include "SMDS_ListIteratorOfListOfMeshGroup.hxx" +#include "SMDS_MeshGroup.hxx" -//======================================================================= -//function : SMDS_MeshGroup -//purpose : -//======================================================================= +#include "SMDS_SetIterator.hxx" +#include "ObjectPool.hxx" -SMDS_MeshGroup::SMDS_MeshGroup(const Handle(SMDS_Mesh)& aMesh) - :myMesh(aMesh),myType(SMDSAbs_All) -{ -} +#include + +#include //======================================================================= //function : SMDS_MeshGroup -//purpose : +//purpose : //======================================================================= -SMDS_MeshGroup::SMDS_MeshGroup(const Handle(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 : //======================================================================= -Handle(SMDS_MeshGroup) SMDS_MeshGroup::AddSubGroup() +void SMDS_MeshGroup::Clear() { - Handle(SMDS_MeshGroup) subgroup = new SMDS_MeshGroup(this); - if (!subgroup.IsNull()) { - myChildren.Append(subgroup); - } - return subgroup; + clearVector( myElements ); + myType = SMDSAbs_All; + ++myTic; } //======================================================================= -//function : RemoveSubGroup +//function : Add //purpose : //======================================================================= -Standard_Boolean SMDS_MeshGroup::RemoveSubGroup(const Handle(SMDS_MeshGroup)& aGroup) +bool SMDS_MeshGroup::Add(const SMDS_MeshElement * theElem) { - 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); - } + // 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)); + bool added = myElements.insert( theElem ).second; -} + ++myTic; -//======================================================================= -//function : Clear -//purpose : -//======================================================================= - -void SMDS_MeshGroup::Clear() -{ - myElements.Clear(); - myType = SMDSAbs_All; + return added; } //======================================================================= -//function : IsEmpty -//purpose : +//function : Remove +//purpose : //======================================================================= -Standard_Boolean SMDS_MeshGroup::IsEmpty() const +bool SMDS_MeshGroup::Remove( const SMDS_MeshElement * theElem ) { - return myElements.IsEmpty(); + 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 : //======================================================================= -Standard_Integer SMDS_MeshGroup::Extent() const +bool SMDS_MeshGroup::Contains(const SMDS_MeshElement * theElem) const { - return myElements.Extent(); + return myElements.find( theElem ) != myElements.end(); } //======================================================================= -//function : Add +//function : SetType //purpose : //======================================================================= -void SMDS_MeshGroup::Add(const Handle(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.IsEmpty()) { - myType = ME->GetType(); - } - - if (ME->GetType() != myType) { - Standard_TypeMismatch::Raise("SMDS_MeshGroup::Add"); - } - - myElements.Add(ME); + if (IsEmpty()) + myType = theType; } - //======================================================================= -//function : Remove +//function : GetElements //purpose : //======================================================================= -void SMDS_MeshGroup::Remove(const Handle(SMDS_MeshElement)& ME) +SMDS_ElemIteratorPtr SMDS_MeshGroup::GetElements() const { - myElements.Remove(ME); - if (myElements.IsEmpty()) - 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 //======================================================================= -Standard_Boolean SMDS_MeshGroup::Contains(const Handle(SMDS_MeshElement)& ME) const +void SMDS_MeshGroup::tmpClear() { - return myElements.Contains(ME); + myElements.clear(); }