X-Git-Url: http://git.salome-platform.org/gitweb/?p=modules%2Fsmesh.git;a=blobdiff_plain;f=src%2FSMESHDS%2FSMESHDS_GroupOnFilter.hxx;h=eaa67397b02353ca17b5652615cd8567a14c30f2;hp=9200744d29935f13818fd27ce776554c027ed456;hb=674c0d8b9d98776136d216ec8f1bad56acac5bf5;hpb=9a54694a0ab1e5cbc558a35c4606ceea4f7af2ef diff --git a/src/SMESHDS/SMESHDS_GroupOnFilter.hxx b/src/SMESHDS/SMESHDS_GroupOnFilter.hxx index 9200744d2..eaa67397b 100644 --- a/src/SMESHDS/SMESHDS_GroupOnFilter.hxx +++ b/src/SMESHDS/SMESHDS_GroupOnFilter.hxx @@ -1,4 +1,4 @@ -// Copyright (C) 2007-2012 CEA/DEN, EDF R&D, OPEN CASCADE +// Copyright (C) 2007-2015 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 @@ -6,7 +6,7 @@ // 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. +// 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 @@ -49,7 +49,7 @@ class SMESHDS_EXPORT SMESHDS_GroupOnFilter: public SMESHDS_GroupBase std::vector< int > GetMeshInfo() const; template< typename IDTYPE > - int GetElementIds( IDTYPE* ids ) const + int GetElementIds( IDTYPE* ids ) const { return getElementIds( (void*)ids, sizeof(IDTYPE)); } @@ -76,8 +76,16 @@ class SMESHDS_EXPORT SMESHDS_GroupOnFilter: public SMESHDS_GroupBase const SMDS_MeshElement* setNbElemToSkip( SMDS_ElemIteratorPtr& elIt ); int getElementIds( void* ids, size_t idSize ) const; + // We use two ways of optimaization: + // 1) The case of little free memory. Remember nb of KO elements (myNbElemToSkip) + // to skip before the first OK element. As well remember total nb of OK + // elements (myMeshInfo) to stop iteration as all OK elements are found. + // 2) The case of enough free memory. Remember all OK elements (myElements). + SMESH_PredicatePtr myPredicate; std::vector< int > myMeshInfo; + std::vector< const SMDS_MeshElement*> myElements; + bool myElementsOK; size_t myMeshModifTime; // when myMeshInfo was updated int myPredicateTic; size_t myNbElemToSkip;