-// Copyright (C) 2007-2012 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
// 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
//
#include "SMESH_Group_i.hxx"
-#include "SMDSAbs_ElementType.hxx"
#include "SMESHDS_Group.hxx"
#include "SMESHDS_GroupOnFilter.hxx"
#include "SMESHDS_GroupOnGeom.hxx"
+#include "SMESHDS_Mesh.hxx"
#include "SMESH_Comment.hxx"
#include "SMESH_Filter_i.hxx"
#include "SMESH_Gen_i.hxx"
SMESH_Mesh_i* theMeshServant,
const int theLocalID )
: SALOME::GenericObj_i( thePOA ),
- myMeshServant( theMeshServant ),
- myLocalID( theLocalID ),
+ myPreMeshInfo(NULL),
myNbNodes(-1),
myGroupDSTic(0),
- myPreMeshInfo(NULL)
+ myMeshServant( theMeshServant ),
+ myLocalID( theLocalID )
{
// PAL7962: san -- To ensure correct mapping of servant and correct reference counting in GenericObj_i,
// servant activation is performed by SMESH_Mesh_i::createGroup()
SMESH_Group_i::SMESH_Group_i( PortableServer::POA_ptr thePOA,
SMESH_Mesh_i* theMeshServant,
const int theLocalID )
- : SALOME::GenericObj_i( thePOA ),
- SMESH_GroupBase_i( thePOA, theMeshServant, theLocalID )
+ : SALOME::GenericObj_i( thePOA ),
+ SMESH_GroupBase_i( thePOA, theMeshServant, theLocalID )
{
- //MESSAGE("SMESH_Group_i; this = "<<this );
}
SMESH_GroupOnGeom_i::SMESH_GroupOnGeom_i( PortableServer::POA_ptr thePOA,
SMESH_Mesh_i* theMeshServant,
const int theLocalID )
- : SALOME::GenericObj_i( thePOA ),
- SMESH_GroupBase_i( thePOA, theMeshServant, theLocalID )
+ : SALOME::GenericObj_i( thePOA ),
+ SMESH_GroupBase_i( thePOA, theMeshServant, theLocalID )
{
- //MESSAGE("SMESH_GroupOnGeom_i; this = "<<this );
}
SMESH_GroupOnFilter_i::SMESH_GroupOnFilter_i( PortableServer::POA_ptr thePOA,
: SALOME::GenericObj_i( thePOA ),
SMESH_GroupBase_i( thePOA, theMeshServant, theLocalID )
{
- //MESSAGE("SMESH_GroupOnGeom_i; this = "<<this );
}
//=============================================================================
SMESH_GroupBase_i::~SMESH_GroupBase_i()
{
- MESSAGE("~SMESH_GroupBase_i; this = "<<this );
- if ( myMeshServant )
- myMeshServant->removeGroup(myLocalID);
-
if ( myPreMeshInfo ) delete myPreMeshInfo; myPreMeshInfo = NULL;
}
aGroup->SetName(theName);
// Update group name in a study
- SMESH_Gen_i* aGen = myMeshServant->GetGen();
- aGen->SetName( aGen->ObjectToSObject( aGen->GetCurrentStudy(), _this() ), theName );
-
- // Update Python script
- TPythonDump() << _this() << ".SetName( '" << theName << "' )";
+ SMESH_Gen_i* aGen = myMeshServant->GetGen();
+ SALOMEDS::Study_var aStudy = aGen->GetCurrentStudy();
+ SMESH::SMESH_GroupBase_var aGrp = _this();
+ SALOMEDS::SObject_var anSO = aGen->ObjectToSObject( aStudy, aGrp );
+ if ( !anSO->_is_nil() )
+ {
+ aGen->SetName( anSO, theName );
+
+ // Update Python script
+ TPythonDump() << anSO << ".SetName( '" << theName << "' )";
+ }
}
//=============================================================================
::SMESH_Group* aGroup = GetSmeshGroup();
if (aGroup)
return CORBA::string_dup (aGroup->GetName());
- MESSAGE("get name of a vague group");
return CORBA::string_dup( "NO_NAME" );
}
}
return aType;
}
- MESSAGE("get type of a vague group");
return SMESH::ALL;
}
SMESHDS_GroupBase* aGroupDS = GetGroupDS();
if (aGroupDS)
return aGroupDS->Extent();
- MESSAGE("get size of a vague group");
return 0;
}
SMESHDS_GroupBase* aGroupDS = GetGroupDS();
if (aGroupDS)
return aGroupDS->IsEmpty();
- MESSAGE("checking IsEmpty of a vague group");
return true;
}
+//=============================================================================
+/*
+ * Returns \c true if \c this group depends on the \a other via
+ * FT_BelongToMeshGroup predicate or vice versa
+ */
+//=============================================================================
+
+bool SMESH_GroupBase_i::IsInDependency( SMESH::SMESH_GroupBase_ptr other )
+{
+ if ( NotifyerAndWaiter* nw = SMESH::DownCast< NotifyerAndWaiter* >( other ))
+ return ( nw->ContainModifWaiter( this ) || this->ContainModifWaiter( nw ));
+
+ return false;
+}
+
//=============================================================================
/*!
*
myPreMeshInfo->FullLoadFromFile();
// Update Python script
- TPythonDump() << _this() << ".Clear()";
+ TPythonDump() << SMESH::SMESH_Group_var(_this()) << ".Clear()";
// Clear the group
SMESHDS_Group* aGroupDS = dynamic_cast<SMESHDS_Group*>( GetGroupDS() );
aGroupDS->Clear();
return;
}
- MESSAGE("attempt to clear a vague group");
+ Modified(); // notify dependent Filter with FT_BelongToMeshGroup criterion
}
//=============================================================================
SMESHDS_GroupBase* aGroupDS = GetGroupDS();
if (aGroupDS)
return aGroupDS->Contains(theID);
- MESSAGE("attempt to check contents of a vague group");
return false;
}
myPreMeshInfo->FullLoadFromFile();
// Update Python script
- TPythonDump() << "nbAdd = " << _this() << ".Add( " << theIDs << " )";
+ TPythonDump() << "nbAdd = " << SMESH::SMESH_Group_var(_this()) << ".Add( " << theIDs << " )";
// Add elements to the group
SMESHDS_Group* aGroupDS = dynamic_cast<SMESHDS_Group*>( GetGroupDS() );
if (aGroupDS) {
int nbAdd = 0;
- for (int i = 0; i < theIDs.length(); i++) {
+ for ( CORBA::ULong i = 0; i < theIDs.length(); i++) {
int anID = (int) theIDs[i];
- if (aGroupDS->Add(anID))
+ if ( aGroupDS->Add( anID ))
nbAdd++;
}
+ if ( nbAdd )
+ Modified(); // notify dependent Filter with FT_BelongToMeshGroup criterion
return nbAdd;
}
MESSAGE("attempt to add elements to a vague group");
//=============================================================================
/*!
- *
+ *
*/
//=============================================================================
myPreMeshInfo->FullLoadFromFile();
// Update Python script
- TPythonDump() << "nbDel = " << _this() << ".Remove( " << theIDs << " )";
+ TPythonDump() << "nbDel = " << SMESH::SMESH_Group_var(_this())
+ << ".Remove( " << theIDs << " )";
// Remove elements from the group
SMESHDS_Group* aGroupDS = dynamic_cast<SMESHDS_Group*>( GetGroupDS() );
if (aGroupDS) {
int nbDel = 0;
- for (int i = 0; i < theIDs.length(); i++) {
+ for ( CORBA::ULong i = 0; i < theIDs.length(); i++ ) {
int anID = (int) theIDs[i];
- if (aGroupDS->Remove(anID))
+ if ( aGroupDS->Remove( anID ))
nbDel++;
}
+ if ( nbDel )
+ Modified(); // notify dependent Filter with FT_BelongToMeshGroup criterion
return nbDel;
}
MESSAGE("attempt to remove elements from a vague group");
//=============================================================================
/*!
- *
+ *
*/
//=============================================================================
CORBA::Long
ChangeByPredicate( SMESH::Predicate_i* thePredicate,
SMESHDS_GroupBase* theGroupBase,
+ NotifyerAndWaiter* theGroupImpl,
TFunChangeGroup theFun)
{
CORBA::Long aNb = 0;
for(; i < iEnd; i++)
if((aGroupDS->*theFun)(aSequence[i]))
aNb++;
+ if ( aNb )
+ theGroupImpl->Modified();
return aNb;
}
return aNb;
myPreMeshInfo->FullLoadFromFile();
if(SMESH::Predicate_i* aPredicate = SMESH::GetPredicate(thePredicate)){
- TPythonDump()<<_this()<<".AddByPredicate("<<aPredicate<<")";
- return ChangeByPredicate(aPredicate,GetGroupDS(),&SMESHDS_Group::Add);
+ TPythonDump() << SMESH::SMESH_Group_var(_this())
+ << ".AddByPredicate( " << aPredicate << " )";
+ return ChangeByPredicate( aPredicate, GetGroupDS(), this, &SMESHDS_Group::Add );
}
return 0;
}
myPreMeshInfo->FullLoadFromFile();
if(SMESH::Predicate_i* aPredicate = SMESH::GetPredicate(thePredicate)){
- TPythonDump()<<_this()<<".RemoveByPredicate("<<aPredicate<<")";
- return ChangeByPredicate(aPredicate,GetGroupDS(),&SMESHDS_Group::Remove);
+ TPythonDump() << SMESH::SMESH_Group_var(_this())
+ << ".RemoveByPredicate( " << aPredicate << " )";
+ return ChangeByPredicate(aPredicate,GetGroupDS(),this, &SMESHDS_Group::Remove);
}
return 0;
}
myPreMeshInfo->FullLoadFromFile();
TPythonDump pd;
- long nbAdd = 0;
+ long prevNb = Size();
SMESHDS_Group* aGroupDS = dynamic_cast<SMESHDS_Group*>( GetGroupDS() );
if (aGroupDS) {
- SMESH::long_array_var anIds;
- SMESH::SMESH_GroupBase_var group = SMESH::SMESH_GroupBase::_narrow(theSource);
- SMESH::SMESH_Mesh_var mesh = SMESH::SMESH_Mesh::_narrow(theSource);
- SMESH::SMESH_subMesh_var submesh = SMESH::SMESH_subMesh::_narrow(theSource);
- SMESH::Filter_var filter = SMESH::Filter::_narrow(theSource);
- if ( !group->_is_nil())
- anIds = group->GetType()==GetType() ? theSource->GetIDs() : new SMESH::long_array();
- else if ( !mesh->_is_nil() )
- anIds = mesh->GetElementsByType( GetType() );
- else if ( !submesh->_is_nil())
- anIds = submesh->GetElementsByType( GetType() );
- else if ( !filter->_is_nil() ) {
- filter->SetMesh( GetMeshServant()->_this() );
- anIds = filter->GetElementType()==GetType() ? theSource->GetIDs() : new SMESH::long_array();
- }
- else
- anIds = theSource->GetIDs();
- for ( int i = 0, total = anIds->length(); i < total; i++ ) {
- if ( aGroupDS->Add((int)anIds[i]) ) nbAdd++;
- }
+ if ( SMDS_ElemIteratorPtr elemIt = SMESH_Mesh_i::GetElements( theSource, GetType() ))
+ while ( elemIt->more() )
+ aGroupDS->SMDSGroup().Add( elemIt->next() );
}
// Update Python script
- pd << "nbAdd = " << _this() << ".AddFrom( " << theSource << " )";
+ pd << "nbAdd = " << SMESH::SMESH_Group_var(_this()) << ".AddFrom( " << theSource << " )";
+
+ if ( prevNb != Size() )
+ Modified(); // notify dependent Filter with FT_BelongToMeshGroup criterion
- return nbAdd;
+ return Size() - prevNb;
}
//=============================================================================
/*!
- *
+ *
*/
//=============================================================================
{
int aSize = aGroupDS->Extent();
aRes->length(aSize);
- for (int i = 0; i < aSize; i++)
- aRes[i] = aGroupDS->GetID(i+1);
+ SMDS_ElemIteratorPtr it = aGroupDS->GetElements();
+ for (int i = 0; it->more(); i++)
+ aRes[i] = it->next()->GetID();
if ( 0 < aSize && aSize < 100 ) // for comfortable testing ;)
std::sort( &aRes[0], &aRes[0]+aSize );
}
- MESSAGE("get list of IDs of a vague group");
return aRes._retn();
}
*/
//================================================================================
- void getNodesOfElements(SMDS_ElemIteratorPtr elemIt,
- set<const SMDS_MeshNode* >& nodes)
+ void getNodesOfElements(SMDS_ElemIteratorPtr elemIt,
+ std::set<const SMDS_MeshNode* >& nodes)
{
while ( elemIt->more() )
{
{
if ( myNbNodes < 0 || g->GetTic() != myGroupDSTic )
{
- set<const SMDS_MeshNode* > nodes;
+ std::set<const SMDS_MeshNode* > nodes;
getNodesOfElements( g->GetElements(), nodes );
myNbNodes = nodes.size();
myGroupDSTic = g->GetTic();
SMESH::long_array_var aRes = new SMESH::long_array();
if ( SMESHDS_GroupBase* g = GetGroupDS())
{
- set<const SMDS_MeshNode* > nodes;
+ std::set<const SMDS_MeshNode* > nodes;
getNodesOfElements( g->GetElements(), nodes );
aRes->length( nodes.size() );
- set<const SMDS_MeshNode*>::iterator nIt = nodes.begin(), nEnd = nodes.end();
+ std::set<const SMDS_MeshNode*>::iterator nIt = nodes.begin(), nEnd = nodes.end();
for ( int i = 0; nIt != nEnd; ++nIt, ++i )
aRes[i] = (*nIt)->GetID();
}
{
SMESH::SMESH_Mesh_var aMesh;
if ( myMeshServant )
- aMesh = SMESH::SMESH_Mesh::_narrow( myMeshServant->_this() );
+ aMesh = myMeshServant->_this();
return aMesh._retn();
}
return aColor;
}
- MESSAGE("get color of a group");
return SALOMEDS::Color();
}
if ( oldColor != aQColor )
{
aGroupDS->SetColor(aQColor);
- TPythonDump()<<_this()<<".SetColor( SALOMEDS.Color( "<<color.R<<", "<<color.G<<", "<<color.B<<" ))";
+ TPythonDump()<< SMESH::SMESH_GroupBase_var(_this())
+ << ".SetColor( SALOMEDS.Color( "
+ <<color.R<<", "<<color.G<<", "<<color.B<<" ))";
}
}
}
if (aGroupDS)
{
aGroupDS->SetColorGroup(color);
- TPythonDump()<<_this()<<".SetColorNumber( "<<color<<" )";
+ TPythonDump()<<SMESH::SMESH_GroupBase_var(_this())<<".SetColorNumber( "<<color<<" )";
}
- MESSAGE("set color number of a group");
return ;
}
//=============================================================================
-/*!
- * Returns statistic of mesh elements
- * Result array of number enityties
+/*
+ * Returns number of mesh elements of each \a SMESH::EntityType
+ * Result array of number of elements per \a SMESH::EntityType
* Inherited from SMESH_IDSource
*/
//=============================================================================
+
SMESH::long_array* SMESH_GroupBase_i::GetMeshInfo()
{
if ( myPreMeshInfo )
if ( SMESHDS_GroupBase* g = GetGroupDS())
{
- if ( g->GetType() == SMDSAbs_Node || ( myNbNodes > -1 && g->GetTic() == myGroupDSTic))
+ if ( g->GetType() == SMDSAbs_Node /*|| ( myNbNodes > -1 && g->GetTic() == myGroupDSTic)*/)
aRes[ SMDSEntity_Node ] = GetNumberOfNodes();
if ( g->GetType() != SMDSAbs_Node )
return aRes._retn();
}
+//=============================================================================
+/*
+ * Returns number of mesh elements of each \a ElementType
+ */
+//=============================================================================
+
+SMESH::long_array* SMESH_GroupBase_i::GetNbElementsByType()
+{
+ SMESH::long_array_var aRes = new SMESH::long_array();
+ aRes->length(SMESH::NB_ELEMENT_TYPES);
+ for (int i = 0; i < SMESH::NB_ELEMENT_TYPES; i++)
+ aRes[ i ] = 0;
+
+ if ( myPreMeshInfo )
+ aRes[ GetType() ] = myPreMeshInfo->NbElements( SMDSAbs_ElementType( GetType() ));
+ else
+ aRes[ GetType() ] = Size();
+
+ return aRes._retn();
+}
+
//=======================================================================
//function : GetIDs
//purpose : Returns ids of members
return myPreMeshInfo ? myPreMeshInfo->IsMeshInfoCorrect() : true;
}
+//=======================================================================
+//function : GetVtkUgStream
+//purpose : Return data vtk unstructured grid (not implemented)
+//=======================================================================
+
+SALOMEDS::TMPFile* SMESH_GroupBase_i::GetVtkUgStream()
+{
+ SALOMEDS::TMPFile_var SeqFile;
+ return SeqFile._retn();
+}
+
//================================================================================
/*!
* \brief Retrieves the predicate from the filter
//================================================================================
void SMESH_GroupOnFilter_i::SetFilter(SMESH::Filter_ptr theFilter)
+ throw (SALOME::SALOME_Exception)
{
+ if ( myFilter->_is_equivalent( theFilter ))
+ return;
+
if ( myPreMeshInfo )
myPreMeshInfo->FullLoadFromFile();
myFilter = SMESH::Filter::_duplicate( theFilter );
- if ( SMESHDS_GroupOnFilter* grDS = dynamic_cast< SMESHDS_GroupOnFilter*>( GetGroupDS() ))
- grDS->SetPredicate( GetPredicate( myFilter ));
+ if ( !myFilter->_is_nil() )
+ {
+ myFilter->Register();
- TPythonDump()<< _this() <<".SetFilter( "<<theFilter<<" )";
+ if ( SMESH::Filter_i* f = SMESH::DownCast< SMESH::Filter_i* >( myFilter ))
+ {
+ // make filter notify me about change of either a predicate or a base group
+ f->FindBaseObjects();
+
+ if ( f->ContainModifWaiter( this ) ||
+ this->ContainModifWaiter( f ))
+ {
+ SetFilter( SMESH::Filter::_nil() );
+ THROW_SALOME_CORBA_EXCEPTION( "Cyclic dependency between Groups on Filter",
+ SALOME::BAD_PARAM );
+ }
+ f->AddModifWaiter( this );
+ }
+ myFilter->SetMesh( SMESH::SMESH_Mesh::_nil() ); // to UnRegister() the mesh
+ }
- if ( myFilter )
+ if ( SMESHDS_GroupOnFilter* grDS = dynamic_cast< SMESHDS_GroupOnFilter*>( GetGroupDS() ))
{
- myFilter->Register();
- SMESH::DownCast< SMESH::Filter_i* >( myFilter )->AddWaiter( this );
+ grDS->SetPredicate( GetPredicate( myFilter ));
+ Modified(); // notify dependent Filter with FT_BelongToMeshGroup criterion
}
+
+ TPythonDump()<< SMESH::SMESH_GroupOnFilter_var(_this()) <<".SetFilter( "<<theFilter<<" )";
}
//================================================================================
SMESH::Filter_ptr SMESH_GroupOnFilter_i::GetFilter()
{
SMESH::Filter_var f = myFilter;
- TPythonDump() << f << " = " << _this() << ".GetFilter()";
+ TPythonDump() << f << " = " << SMESH::SMESH_GroupOnFilter_var(_this()) << ".GetFilter()";
return f._retn();
}
+//=======================================================================
+//function : GetIDs
+//purpose : Returns ids of members
+//=======================================================================
+
+SMESH::long_array* SMESH_GroupOnFilter_i::GetListOfID()
+{
+ if ( myPreMeshInfo )
+ myPreMeshInfo->FullLoadFromFile();
+
+ SMESH::long_array_var aRes = new SMESH::long_array();
+ SMESHDS_GroupBase* aGroupDS = GetGroupDS();
+ if ( SMESHDS_GroupOnFilter* grDS = dynamic_cast< SMESHDS_GroupOnFilter*>( GetGroupDS() ))
+ {
+ const SMDS_MeshInfo& meshInfo = aGroupDS->GetMesh()->GetMeshInfo();
+ aRes->length( meshInfo.NbElements( aGroupDS->GetType() ));
+ if ( aRes->length() ) // else aRes[0] -> SIGSEGV
+ aRes->length( grDS->GetElementIds( &aRes[0] ));
+
+ if ( 0 < aRes->length() && aRes->length() < 100 ) // for comfortable testing ;)
+ std::sort( &aRes[0], &aRes[0] + aRes->length() );
+ }
+ return aRes._retn();
+}
+
+//=============================================================================
+/*!
+ * Returns statistic of mesh elements
+ * Result array of number enityties
+ * Inherited from SMESH_IDSource
+ */
+//=============================================================================
+
+SMESH::long_array* SMESH_GroupOnFilter_i::GetMeshInfo()
+{
+ if ( myPreMeshInfo )
+ return myPreMeshInfo->GetMeshInfo();
+
+ SMESH::long_array_var aRes = new SMESH::long_array();
+ aRes->length(SMESH::Entity_Last);
+ for (int i = SMESH::Entity_Node; i < SMESH::Entity_Last; i++)
+ aRes[i] = 0;
+
+ if ( SMESHDS_GroupBase* g = GetGroupDS())
+ {
+ if ( g->GetType() == SMDSAbs_Node /*|| ( myNbNodes > -1 && g->GetTic() == myGroupDSTic)*/)
+ aRes[ SMDSEntity_Node ] = GetNumberOfNodes();
+
+ if ( g->GetType() != SMDSAbs_Node )
+ {
+ std::vector< int > nbElems = static_cast< SMESHDS_GroupOnFilter* >( g )->GetMeshInfo();
+ for ( size_t i = SMESH::Entity_Node; i < SMESH::Entity_Last; i++)
+ if ( i < nbElems.size() )
+ aRes[i] = nbElems[ i ];
+ }
+ }
+
+ return aRes._retn();
+}
+
#define SEPAR '^'
//================================================================================
result << criteria->length() << SEPAR;
for ( unsigned i = 0; i < criteria->length(); ++i )
{
+ SMESH::Filter::Criterion& crit = criteria[ i ];
+
+ if ( SMESH::FunctorType( crit.Type ) == SMESH::FT_BelongToMeshGroup &&
+ crit.ThresholdID.in() && crit.ThresholdID.in()[0] )
+ {
+ CORBA::Object_var obj = SMESH_Gen_i::GetORB()->string_to_object( crit.ThresholdID );
+ if ( SMESH_GroupBase_i * g = SMESH::DownCast< SMESH_GroupBase_i*>( obj ))
+ if ( SMESHDS_GroupBase* gDS = g->GetGroupDS() )
+ crit.ThresholdID = gDS->GetStoreName();
+ }
// write FunctorType as string but not as number to assure correct
// persistence if enum FunctorType is modified by insertion in the middle
- SMESH::Filter::Criterion& crit = criteria[ i ];
result << SMESH::FunctorTypeToString( SMESH::FunctorType( crit.Type )) << SEPAR;
result << SMESH::FunctorTypeToString( SMESH::FunctorType( crit.Compare )) << SEPAR;
result << crit.Threshold << SEPAR;
{
if ( ! myFilter->_is_nil() )
{
- SMESH::DownCast< SMESH::Filter_i* >( myFilter )->RemoveWaiter( this );
+ SMESH::DownCast< SMESH::Filter_i* >( myFilter )->RemoveModifWaiter( this );
myFilter->UnRegister();
}
}
//================================================================================
/*!
- * \brief Method calleds when a predicate of myFilter changes
+ * \brief Method called when a predicate of myFilter changes
*/
//================================================================================
-void SMESH_GroupOnFilter_i::PredicateChanged()
+void SMESH_GroupOnFilter_i::OnBaseObjModified(NotifyerAndWaiter* filter, bool /*removed*/)
{
if ( myPreMeshInfo )
myPreMeshInfo->FullLoadFromFile();
if ( SMESHDS_GroupOnFilter* grDS = dynamic_cast< SMESHDS_GroupOnFilter*>( GetGroupDS() ))
- grDS->SetPredicate( GetPredicate( myFilter ));
+ grDS->SetPredicate( GetPredicate( myFilter )); // group resets its cache
}
