Merge from V6_5_BR 05/06/2012

[modules/smesh.git] / src / SMESHDS / SMESHDS_GroupOnFilter.cxx

diff --git a/src/SMESHDS/SMESHDS_GroupOnFilter.cxx b/src/SMESHDS/SMESHDS_GroupOnFilter.cxx
index 8307b279ac6b64cd47ea39b3b66f3709ed23db3b..32bd8c7f3485553f1dcb7cc7e7bfd4bba304db29 100644 (file)
--- a/src/SMESHDS/SMESHDS_GroupOnFilter.cxx
+++ b/src/SMESHDS/SMESHDS_GroupOnFilter.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  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
@@ -135,6 +135,17 @@ int SMESHDS_GroupOnFilter::GetTic() const
   return GetMesh()->GetMTime() * myPredicateTic;
 }
 
+//================================================================================
+/*!
+ * \brief Return false if update() is needed
+ */
+//================================================================================
+
+bool SMESHDS_GroupOnFilter::IsUpToDate() const
+{
+  return !( myMeshModifTime < GetMesh()->GetMTime() );
+}
+
 //================================================================================
 /*!
  * \brief Updates myElements if necessary
@@ -143,12 +154,13 @@ int SMESHDS_GroupOnFilter::GetTic() const
 
 void SMESHDS_GroupOnFilter::update() const
 {
-  if ( myMeshModifTime < GetMesh()->GetMTime() )
+  if ( !IsUpToDate() )
   {
     SMESHDS_GroupOnFilter* me = const_cast<SMESHDS_GroupOnFilter*>( this );
     me->myElements.clear();
     if ( myPredicate )
     {
+      myPredicate->SetMesh( GetMesh() ); // hope myPredicate updates self here if necessary
       me->myElements.reserve( GetMesh()->GetMeshInfo().NbElements(GetType()));
       SMDS_ElemIteratorPtr elIt = GetMesh()->elementsIterator(GetType());
       while ( elIt->more() )
@@ -157,7 +169,8 @@ void SMESHDS_GroupOnFilter::update() const
         if ( myPredicate->IsSatisfy( e->GetID() ))
           me->myElements.push_back( e );
       }
-      me->myElements.resize( myElements.size() );
+      vector< const SMDS_MeshElement*> elems( me->myElements.begin(), me->myElements.end() );
+      me->myElements.swap( elems );
     }
     me->setChanged( false );
   }