X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FSMESH_I%2FSMESH_Group_i.cxx;h=ddc625907d15db26e683a696a317519ef81dec4d;hb=HEAD;hp=6218de9f8ba5485d3cd07b398da23c30a280d9bd;hpb=5ac2bd91a85417fd289aea0907264cb2d155d76d;p=modules%2Fsmesh.git diff --git a/src/SMESH_I/SMESH_Group_i.cxx b/src/SMESH_I/SMESH_Group_i.cxx index 6218de9f8..ddc625907 100644 --- a/src/SMESH_I/SMESH_Group_i.cxx +++ b/src/SMESH_I/SMESH_Group_i.cxx @@ -1,4 +1,4 @@ -// Copyright (C) 2007-2015 CEA/DEN, EDF R&D, OPEN CASCADE +// Copyright (C) 2007-2024 CEA, EDF, OPEN CASCADE // // Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN, // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS @@ -27,10 +27,10 @@ // #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" @@ -43,8 +43,6 @@ #include "utilities.h" -using namespace SMESH; - //============================================================================= /*! * @@ -55,11 +53,11 @@ SMESH_GroupBase_i::SMESH_GroupBase_i( PortableServer::POA_ptr thePOA, 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() @@ -69,19 +67,17 @@ SMESH_GroupBase_i::SMESH_GroupBase_i( PortableServer::POA_ptr thePOA, 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 = "<GetName()); - MESSAGE("get name of a vague group"); + return CORBA::string_dup( aGroup->GetName() ); return CORBA::string_dup( "NO_NAME" ); } //============================================================================= /*! - * + * */ //============================================================================= @@ -203,7 +197,6 @@ SMESH::ElementType SMESH_GroupBase_i::GetType() } return aType; } - MESSAGE("get type of a vague group"); return SMESH::ALL; } @@ -214,7 +207,7 @@ SMESH::ElementType SMESH_GroupBase_i::GetType() */ //============================================================================= -CORBA::Long SMESH_GroupBase_i::Size() +SMESH::smIdType SMESH_GroupBase_i::Size() { if ( myPreMeshInfo ) return GetType() == SMESH::NODE ? myPreMeshInfo->NbNodes() : myPreMeshInfo->NbElements(); @@ -222,7 +215,6 @@ CORBA::Long SMESH_GroupBase_i::Size() SMESHDS_GroupBase* aGroupDS = GetGroupDS(); if (aGroupDS) return aGroupDS->Extent(); - MESSAGE("get size of a vague group"); return 0; } @@ -240,13 +232,12 @@ CORBA::Boolean SMESH_GroupBase_i::IsEmpty() 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 + * Return \c true if \c this group depends on the \a other via * FT_BelongToMeshGroup predicate or vice versa */ //============================================================================= @@ -271,7 +262,7 @@ void SMESH_Group_i::Clear() myPreMeshInfo->FullLoadFromFile(); // Update Python script - TPythonDump() << SMESH::SMESH_Group_var(_this()) << ".Clear()"; + SMESH::TPythonDump() << SMESH::SMESH_Group_var(_this()) << ".Clear()"; // Clear the group SMESHDS_Group* aGroupDS = dynamic_cast( GetGroupDS() ); @@ -280,8 +271,6 @@ void SMESH_Group_i::Clear() return; } Modified(); // notify dependent Filter with FT_BelongToMeshGroup criterion - - MESSAGE("attempt to clear a vague group"); } //============================================================================= @@ -290,7 +279,7 @@ void SMESH_Group_i::Clear() */ //============================================================================= -CORBA::Boolean SMESH_GroupBase_i::Contains( CORBA::Long theID ) +CORBA::Boolean SMESH_GroupBase_i::Contains( SMESH::smIdType theID ) { if ( myPreMeshInfo ) myPreMeshInfo->FullLoadFromFile(); @@ -298,7 +287,6 @@ CORBA::Boolean SMESH_GroupBase_i::Contains( CORBA::Long theID ) SMESHDS_GroupBase* aGroupDS = GetGroupDS(); if (aGroupDS) return aGroupDS->Contains(theID); - MESSAGE("attempt to check contents of a vague group"); return false; } @@ -308,21 +296,21 @@ CORBA::Boolean SMESH_GroupBase_i::Contains( CORBA::Long theID ) */ //============================================================================= -CORBA::Long SMESH_Group_i::Add( const SMESH::long_array& theIDs ) +SMESH::smIdType SMESH_Group_i::Add( const SMESH::smIdType_array& theIDs ) { if ( myPreMeshInfo ) myPreMeshInfo->FullLoadFromFile(); // Update Python script - TPythonDump() << "nbAdd = " << SMESH::SMESH_Group_var(_this()) << ".Add( " << theIDs << " )"; + SMESH::TPythonDump() << "nbAdd = " << SMESH::SMESH_Group_var(_this()) << ".Add( " << theIDs << " )"; // Add elements to the group SMESHDS_Group* aGroupDS = dynamic_cast( 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 ) @@ -335,26 +323,26 @@ CORBA::Long SMESH_Group_i::Add( const SMESH::long_array& theIDs ) //============================================================================= /*! - * + * */ //============================================================================= -CORBA::Long SMESH_Group_i::Remove( const SMESH::long_array& theIDs ) +SMESH::smIdType SMESH_Group_i::Remove( const SMESH::smIdType_array& theIDs ) { if ( myPreMeshInfo ) myPreMeshInfo->FullLoadFromFile(); // Update Python script - TPythonDump() << "nbDel = " << SMESH::SMESH_Group_var(_this()) + SMESH::TPythonDump() << "nbDel = " << SMESH::SMESH_Group_var(_this()) << ".Remove( " << theIDs << " )"; // Remove elements from the group SMESHDS_Group* aGroupDS = dynamic_cast( 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 ) @@ -367,17 +355,17 @@ CORBA::Long SMESH_Group_i::Remove( const SMESH::long_array& theIDs ) //============================================================================= /*! - * + * */ //============================================================================= -typedef bool (SMESHDS_Group::*TFunChangeGroup)(const int); +typedef bool (SMESHDS_Group::*TFunChangeGroup)(const smIdType); CORBA::Long -ChangeByPredicate( SMESH::Predicate_i* thePredicate, - SMESHDS_GroupBase* theGroupBase, - NotifyerAndWaiter* theGroupImpl, - TFunChangeGroup theFun) +ChangeByPredicate( SMESH::Predicate_i* thePredicate, + SMESHDS_GroupBase* theGroupBase, + SMESH::NotifyerAndWaiter* theGroupImpl, + TFunChangeGroup theFun) { CORBA::Long aNb = 0; if(SMESHDS_Group* aGroupDS = dynamic_cast(theGroupBase)){ @@ -396,7 +384,7 @@ ChangeByPredicate( SMESH::Predicate_i* thePredicate, return aNb; } -CORBA::Long +SMESH::smIdType SMESH_Group_i:: AddByPredicate( SMESH::Predicate_ptr thePredicate ) { @@ -404,14 +392,14 @@ AddByPredicate( SMESH::Predicate_ptr thePredicate ) myPreMeshInfo->FullLoadFromFile(); if(SMESH::Predicate_i* aPredicate = SMESH::GetPredicate(thePredicate)){ - TPythonDump() << SMESH::SMESH_Group_var(_this()) - << ".AddByPredicate( " << aPredicate << " )"; + SMESH::TPythonDump() << SMESH::SMESH_Group_var(_this()) + << ".AddByPredicate( " << aPredicate << " )"; return ChangeByPredicate( aPredicate, GetGroupDS(), this, &SMESHDS_Group::Add ); } return 0; } -CORBA::Long +SMESH::smIdType SMESH_Group_i:: RemoveByPredicate( SMESH::Predicate_ptr thePredicate ) { @@ -419,19 +407,19 @@ RemoveByPredicate( SMESH::Predicate_ptr thePredicate ) myPreMeshInfo->FullLoadFromFile(); if(SMESH::Predicate_i* aPredicate = SMESH::GetPredicate(thePredicate)){ - TPythonDump() << SMESH::SMESH_Group_var(_this()) - << ".RemoveByPredicate( " << aPredicate << " )"; + SMESH::TPythonDump() << SMESH::SMESH_Group_var(_this()) + << ".RemoveByPredicate( " << aPredicate << " )"; return ChangeByPredicate(aPredicate,GetGroupDS(),this, &SMESHDS_Group::Remove); } return 0; } -CORBA::Long SMESH_Group_i::AddFrom( SMESH::SMESH_IDSource_ptr theSource ) +SMESH::smIdType SMESH_Group_i::AddFrom( SMESH::SMESH_IDSource_ptr theSource ) { if ( myPreMeshInfo ) myPreMeshInfo->FullLoadFromFile(); - TPythonDump pd; + SMESH::TPythonDump pd; long prevNb = Size(); SMESHDS_Group* aGroupDS = dynamic_cast( GetGroupDS() ); if (aGroupDS) { @@ -451,11 +439,11 @@ CORBA::Long SMESH_Group_i::AddFrom( SMESH::SMESH_IDSource_ptr theSource ) //============================================================================= /*! - * + * Return ID of theIndex-th group item */ //============================================================================= -CORBA::Long SMESH_GroupBase_i::GetID( CORBA::Long theIndex ) +SMESH::smIdType SMESH_GroupBase_i::GetID( SMESH::smIdType theIndex ) { if ( myPreMeshInfo ) myPreMeshInfo->FullLoadFromFile(); @@ -473,24 +461,24 @@ CORBA::Long SMESH_GroupBase_i::GetID( CORBA::Long theIndex ) */ //============================================================================= -SMESH::long_array* SMESH_GroupBase_i::GetListOfID() +SMESH::smIdType_array* SMESH_GroupBase_i::GetListOfID() { if ( myPreMeshInfo ) myPreMeshInfo->FullLoadFromFile(); - SMESH::long_array_var aRes = new SMESH::long_array(); + SMESH::smIdType_array_var aRes = new SMESH::smIdType_array(); SMESHDS_GroupBase* aGroupDS = GetGroupDS(); if (aGroupDS) { - int aSize = aGroupDS->Extent(); + smIdType 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 (::smIdType 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(); } @@ -502,8 +490,8 @@ namespace */ //================================================================================ - void getNodesOfElements(SMDS_ElemIteratorPtr elemIt, - set& nodes) + void getNodesOfElements(SMDS_ElemIteratorPtr elemIt, + std::set& nodes) { while ( elemIt->more() ) { @@ -519,7 +507,7 @@ namespace */ //================================================================================ -CORBA::Long SMESH_GroupBase_i::GetNumberOfNodes() +SMESH::smIdType SMESH_GroupBase_i::GetNumberOfNodes() { if ( GetType() == SMESH::NODE ) return Size(); @@ -531,7 +519,7 @@ CORBA::Long SMESH_GroupBase_i::GetNumberOfNodes() { if ( myNbNodes < 0 || g->GetTic() != myGroupDSTic ) { - set nodes; + std::set nodes; getNodesOfElements( g->GetElements(), nodes ); myNbNodes = nodes.size(); myGroupDSTic = g->GetTic(); @@ -563,7 +551,7 @@ CORBA::Boolean SMESH_GroupBase_i::IsNodeInfoAvailable() */ //================================================================================ -SMESH::long_array* SMESH_GroupBase_i::GetNodeIDs() +SMESH::smIdType_array* SMESH_GroupBase_i::GetNodeIDs() { if ( GetType() == SMESH::NODE ) return GetListOfID(); @@ -571,13 +559,13 @@ SMESH::long_array* SMESH_GroupBase_i::GetNodeIDs() if ( myPreMeshInfo ) myPreMeshInfo->FullLoadFromFile(); - SMESH::long_array_var aRes = new SMESH::long_array(); + SMESH::smIdType_array_var aRes = new SMESH::smIdType_array(); if ( SMESHDS_GroupBase* g = GetGroupDS()) { - set nodes; + std::set nodes; getNodesOfElements( g->GetElements(), nodes ); aRes->length( nodes.size() ); - set::iterator nIt = nodes.begin(), nEnd = nodes.end(); + std::set::iterator nIt = nodes.begin(), nEnd = nodes.end(); for ( int i = 0; nIt != nEnd; ++nIt, ++i ) aRes[i] = (*nIt)->GetID(); } @@ -631,7 +619,6 @@ SALOMEDS::Color SMESH_GroupBase_i::GetColor() return aColor; } - MESSAGE("get color of a group"); return SALOMEDS::Color(); } @@ -650,9 +637,9 @@ void SMESH_GroupBase_i::SetColor(const SALOMEDS::Color& color) if ( oldColor != aQColor ) { aGroupDS->SetColor(aQColor); - TPythonDump()<< SMESH::SMESH_GroupBase_var(_this()) - << ".SetColor( SALOMEDS.Color( " - <SetColorGroup(color); - TPythonDump()<GetMeshInfo(); - SMESH::long_array_var aRes = new SMESH::long_array(); + SMESH::smIdType_array_var aRes = new SMESH::smIdType_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)) + if ( g->GetType() == SMDSAbs_Node /*|| ( myNbNodes > -1 && g->GetTic() == myGroupDSTic)*/) aRes[ SMDSEntity_Node ] = GetNumberOfNodes(); if ( g->GetType() != SMDSAbs_Node ) @@ -720,13 +706,13 @@ SMESH::long_array* SMESH_GroupBase_i::GetMeshInfo() //============================================================================= /* - * Returns number of mesh elements of each \a ElementType + * Return number of mesh elements of each \a ElementType */ //============================================================================= -SMESH::long_array* SMESH_GroupBase_i::GetNbElementsByType() +SMESH::smIdType_array* SMESH_GroupBase_i::GetNbElementsByType() { - SMESH::long_array_var aRes = new SMESH::long_array(); + SMESH::smIdType_array_var aRes = new SMESH::smIdType_array(); aRes->length(SMESH::NB_ELEMENT_TYPES); for (int i = 0; i < SMESH::NB_ELEMENT_TYPES; i++) aRes[ i ] = 0; @@ -741,17 +727,17 @@ SMESH::long_array* SMESH_GroupBase_i::GetNbElementsByType() //======================================================================= //function : GetIDs -//purpose : Returns ids of members +//purpose : Return ids of members //======================================================================= -SMESH::long_array* SMESH_GroupBase_i::GetIDs() +SMESH::smIdType_array* SMESH_GroupBase_i::GetIDs() { return GetListOfID(); } //======================================================================= //function : GetTypes -//purpose : Returns types of elements it contains +//purpose : Return types of elements it contains //======================================================================= SMESH::array_of_ElementType* SMESH_GroupBase_i::GetTypes() @@ -767,7 +753,7 @@ SMESH::array_of_ElementType* SMESH_GroupBase_i::GetTypes() //======================================================================= //function : IsMeshInfoCorrect -//purpose : * Returns false if GetMeshInfo() returns incorrect information that may +//purpose : * Return false if GetMeshInfo() returns incorrect information that may // * happen if mesh data is not yet fully loaded from the file of study. //======================================================================= @@ -811,7 +797,6 @@ SMESH_PredicatePtr SMESH_GroupOnFilter_i::GetPredicate( SMESH::Filter_ptr filter //================================================================================ void SMESH_GroupOnFilter_i::SetFilter(SMESH::Filter_ptr theFilter) - throw (SALOME::SALOME_Exception) { if ( myFilter->_is_equivalent( theFilter )) return; @@ -851,33 +836,67 @@ void SMESH_GroupOnFilter_i::SetFilter(SMESH::Filter_ptr theFilter) Modified(); // notify dependent Filter with FT_BelongToMeshGroup criterion } - TPythonDump()<< SMESH::SMESH_GroupOnFilter_var(_this()) <<".SetFilter( "<GetGen()->HighLightInvalid( me, false ); + + + SMESH::TPythonDump()<< me <<".SetFilter( "<< theFilter <<" )"; } //================================================================================ /*! - * \brief Returns the filter defining group contents + * \brief Return the filter defining group contents */ //================================================================================ SMESH::Filter_ptr SMESH_GroupOnFilter_i::GetFilter() { SMESH::Filter_var f = myFilter; - TPythonDump() << f << " = " << SMESH::SMESH_GroupOnFilter_var(_this()) << ".GetFilter()"; + SMESH::TPythonDump() << f << " = " << SMESH::SMESH_GroupOnFilter_var(_this()) << ".GetFilter()"; return f._retn(); } +//================================================================================ +/*! + * @return true if group contents is computed + */ +//================================================================================ + +CORBA::Boolean SMESH_GroupOnFilter_i::IsUpToDate() +{ + if ( myPreMeshInfo ) + return false; + + if ( SMESHDS_GroupOnFilter* grDS = dynamic_cast< SMESHDS_GroupOnFilter*>( GetGroupDS() )) + return grDS->IsUpToDate(); + + return false; +} + +//======================================================================= +//function : IsMeshInfoCorrect +//purpose : Return false in two cases: 1) if mesh not loaded and GetMeshInfo() returns +// incorrect information 2) mesh loaded but group contents is not computed +//======================================================================= + +bool SMESH_GroupOnFilter_i::IsMeshInfoCorrect() +{ + return myPreMeshInfo ? myPreMeshInfo->IsMeshInfoCorrect() : IsUpToDate(); +} + //======================================================================= //function : GetIDs -//purpose : Returns ids of members +//purpose : Return ids of members //======================================================================= -SMESH::long_array* SMESH_GroupOnFilter_i::GetListOfID() +SMESH::smIdType_array* SMESH_GroupOnFilter_i::GetListOfID() { if ( myPreMeshInfo ) myPreMeshInfo->FullLoadFromFile(); - SMESH::long_array_var aRes = new SMESH::long_array(); + SMESH::smIdType_array_var aRes = new SMESH::smIdType_array(); SMESHDS_GroupBase* aGroupDS = GetGroupDS(); if ( SMESHDS_GroupOnFilter* grDS = dynamic_cast< SMESHDS_GroupOnFilter*>( GetGroupDS() )) { @@ -889,36 +908,35 @@ SMESH::long_array* SMESH_GroupOnFilter_i::GetListOfID() if ( 0 < aRes->length() && aRes->length() < 100 ) // for comfortable testing ;) std::sort( &aRes[0], &aRes[0] + aRes->length() ); } - MESSAGE("get list of IDs of a vague group"); return aRes._retn(); } //============================================================================= /*! - * Returns statistic of mesh elements + * Return statistic of mesh elements * Result array of number enityties * Inherited from SMESH_IDSource */ //============================================================================= -SMESH::long_array* SMESH_GroupOnFilter_i::GetMeshInfo() +SMESH::smIdType_array* SMESH_GroupOnFilter_i::GetMeshInfo() { if ( myPreMeshInfo ) return myPreMeshInfo->GetMeshInfo(); - SMESH::long_array_var aRes = new SMESH::long_array(); + SMESH::smIdType_array_var aRes = new SMESH::smIdType_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)) + if ( g->GetType() == SMDSAbs_Node /*|| ( myNbNodes > -1 && g->GetTic() == myGroupDSTic)*/) aRes[ SMDSEntity_Node ] = GetNumberOfNodes(); if ( g->GetType() != SMDSAbs_Node ) { - vector< int > nbElems = static_cast< SMESHDS_GroupOnFilter* >( g )->GetMeshInfo(); + std::vector< smIdType > 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 ]; @@ -947,7 +965,8 @@ std::string SMESH_GroupOnFilter_i::FilterToString() const { SMESH::Filter::Criterion& crit = criteria[ i ]; - if ( SMESH::FunctorType( crit.Type ) == SMESH::FT_BelongToMeshGroup ) + 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 )) @@ -1018,7 +1037,7 @@ SMESH::Filter_ptr SMESH_GroupOnFilter_i::StringToFilter(const std::string& thePe } // create a filter - TPythonDump pd; + SMESH::TPythonDump pd; SMESH::FilterManager_i* aFilterMgr = new SMESH::FilterManager_i(); filter = aFilterMgr->CreateFilter(); filter->SetCriteria( criteria.inout() ); @@ -1051,7 +1070,7 @@ SMESH_GroupOnFilter_i::~SMESH_GroupOnFilter_i() */ //================================================================================ -void SMESH_GroupOnFilter_i::OnBaseObjModified(NotifyerAndWaiter* filter, bool /*removed*/) +void SMESH_GroupOnFilter_i::OnBaseObjModified(NotifyerAndWaiter* /*filter*/, bool /*removed*/) { if ( myPreMeshInfo ) myPreMeshInfo->FullLoadFromFile(); @@ -1059,3 +1078,4 @@ void SMESH_GroupOnFilter_i::OnBaseObjModified(NotifyerAndWaiter* filter, bool /* if ( SMESHDS_GroupOnFilter* grDS = dynamic_cast< SMESHDS_GroupOnFilter*>( GetGroupDS() )) grDS->SetPredicate( GetPredicate( myFilter )); // group resets its cache } +