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=6951886fdf8aba8c019518a28c2efa84c2b8be1c;hb=19fe2e412fa1cb1fd33d7a2580b2483280db811e;hpb=c6248ade999eaffe5bbddbcaea61487811aa4e0c diff --git a/src/SMDS/SMDS_MeshGroup.cxx b/src/SMDS/SMDS_MeshGroup.cxx index 6951886fd..e2f5fbccf 100644 --- a/src/SMDS/SMDS_MeshGroup.cxx +++ b/src/SMDS/SMDS_MeshGroup.cxx @@ -1,162 +1,156 @@ -using namespace std; -// File: SMDS_MeshGroup.cxx -// Created: Mon Jun 3 12:15:55 2002 -// Author: Jean-Michel BOULCOURT -// - - -#include "SMDS_MeshGroup.ixx" -#include "SMDS_ListIteratorOfListOfMeshGroup.hxx" +// 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 +// +// 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 + +#include "SMDS_MeshGroup.hxx" + +#include "SMDS_SetIterator.hxx" +#include "ObjectPool.hxx" + +#include + +#include //======================================================================= //function : SMDS_MeshGroup -//purpose : +//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) + : SMDS_ElementHolder( theMesh ), myType( theType ), myTic( 0 ) { } //======================================================================= -//function : SMDS_MeshGroup -//purpose : +//function : Clear +//purpose : //======================================================================= -SMDS_MeshGroup::SMDS_MeshGroup(const Handle(SMDS_MeshGroup)& parent) - :myMesh(parent->myMesh),myType(SMDSAbs_All),myParent(parent) +void SMDS_MeshGroup::Clear() { + clearVector( myElements ); + myType = SMDSAbs_All; + ++myTic; } //======================================================================= -//function : AddSubGroup +//function : Add //purpose : //======================================================================= -Handle(SMDS_MeshGroup) SMDS_MeshGroup::AddSubGroup() +bool SMDS_MeshGroup::Add(const SMDS_MeshElement * theElem) { - Handle(SMDS_MeshGroup) subgroup = new SMDS_MeshGroup(this); - if (!subgroup.IsNull()) { - myChildren.Append(subgroup); + // the type of the group is determined by the first element added + if ( myElements.empty() ) { + myType = theElem->GetType(); } - return subgroup; -} - -//======================================================================= -//function : RemoveSubGroup -//purpose : -//======================================================================= - -Standard_Boolean SMDS_MeshGroup::RemoveSubGroup(const Handle(SMDS_MeshGroup)& aGroup) -{ - 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); - } + else if ( theElem->GetType() != myType ) { + MESSAGE("SMDS_MeshGroup::Add : Type Mismatch "<GetType()<<"!="<RemoveSubGroup(this)); + myElements.insert( theElem ); + ++myTic; + return true; } //======================================================================= -//function : Clear -//purpose : -//======================================================================= - -void SMDS_MeshGroup::Clear() -{ - myElements.Clear(); - myType = SMDSAbs_All; -} - -//======================================================================= -//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(); }