X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FSMESH_I%2FSMESH_Group_i.cxx;h=6218de9f8ba5485d3cd07b398da23c30a280d9bd;hb=bb10a2d7a23f18c97afc646a35031908c98bd82e;hp=36ff20a15cf503c5447e98621f8234bb80da4208;hpb=45b7e5c3e156b516962f86d15df69b12d8060363;p=modules%2Fsmesh.git diff --git a/src/SMESH_I/SMESH_Group_i.cxx b/src/SMESH_I/SMESH_Group_i.cxx index 36ff20a15..6218de9f8 100644 --- a/src/SMESH_I/SMESH_Group_i.cxx +++ b/src/SMESH_I/SMESH_Group_i.cxx @@ -1,4 +1,4 @@ -// Copyright (C) 2007-2014 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 @@ -244,6 +244,21 @@ CORBA::Boolean SMESH_GroupBase_i::IsEmpty() 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; +} + //============================================================================= /*! * @@ -264,6 +279,8 @@ void SMESH_Group_i::Clear() aGroupDS->Clear(); return; } + Modified(); // notify dependent Filter with FT_BelongToMeshGroup criterion + MESSAGE("attempt to clear a vague group"); } @@ -308,6 +325,8 @@ CORBA::Long SMESH_Group_i::Add( const SMESH::long_array& theIDs ) 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"); @@ -338,6 +357,8 @@ CORBA::Long SMESH_Group_i::Remove( const SMESH::long_array& theIDs ) 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"); @@ -355,6 +376,7 @@ typedef bool (SMESHDS_Group::*TFunChangeGroup)(const int); CORBA::Long ChangeByPredicate( SMESH::Predicate_i* thePredicate, SMESHDS_GroupBase* theGroupBase, + NotifyerAndWaiter* theGroupImpl, TFunChangeGroup theFun) { CORBA::Long aNb = 0; @@ -367,6 +389,8 @@ ChangeByPredicate( SMESH::Predicate_i* thePredicate, for(; i < iEnd; i++) if((aGroupDS->*theFun)(aSequence[i])) aNb++; + if ( aNb ) + theGroupImpl->Modified(); return aNb; } return aNb; @@ -382,7 +406,7 @@ AddByPredicate( SMESH::Predicate_ptr thePredicate ) if(SMESH::Predicate_i* aPredicate = SMESH::GetPredicate(thePredicate)){ TPythonDump() << SMESH::SMESH_Group_var(_this()) << ".AddByPredicate( " << aPredicate << " )"; - return ChangeByPredicate( aPredicate, GetGroupDS(), &SMESHDS_Group::Add ); + return ChangeByPredicate( aPredicate, GetGroupDS(), this, &SMESHDS_Group::Add ); } return 0; } @@ -397,7 +421,7 @@ RemoveByPredicate( SMESH::Predicate_ptr thePredicate ) if(SMESH::Predicate_i* aPredicate = SMESH::GetPredicate(thePredicate)){ TPythonDump() << SMESH::SMESH_Group_var(_this()) << ".RemoveByPredicate( " << aPredicate << " )"; - return ChangeByPredicate(aPredicate,GetGroupDS(),&SMESHDS_Group::Remove); + return ChangeByPredicate(aPredicate,GetGroupDS(),this, &SMESHDS_Group::Remove); } return 0; } @@ -419,12 +443,15 @@ CORBA::Long SMESH_Group_i::AddFrom( SMESH::SMESH_IDSource_ptr theSource ) // Update Python script pd << "nbAdd = " << SMESH::SMESH_Group_var(_this()) << ".AddFrom( " << theSource << " )"; - return prevNb - Size(); + if ( prevNb != Size() ) + Modified(); // notify dependent Filter with FT_BelongToMeshGroup criterion + + return Size() - prevNb; } //============================================================================= /*! - * + * */ //============================================================================= @@ -784,6 +811,7 @@ 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; @@ -796,17 +824,34 @@ void SMESH_GroupOnFilter_i::SetFilter(SMESH::Filter_ptr theFilter) 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()<< SMESH::SMESH_GroupOnFilter_var(_this()) <<".SetFilter( "<( 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->SetMesh( SMESH::SMESH_Mesh::_nil() ); // to UnRegister() the mesh - 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( "<length() << SEPAR; for ( unsigned i = 0; i < criteria->length(); ++i ) { + SMESH::Filter::Criterion& crit = criteria[ i ]; + + if ( SMESH::FunctorType( crit.Type ) == SMESH::FT_BelongToMeshGroup ) + { + 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; @@ -987,22 +1040,22 @@ SMESH_GroupOnFilter_i::~SMESH_GroupOnFilter_i() { 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 }