X-Git-Url: http://git.salome-platform.org/gitweb/?p=modules%2Fsmesh.git;a=blobdiff_plain;f=src%2FSMESH_I%2FSMESH_Group_i.cxx;h=a2dac404ce7426600a13c05db7fedacbe5b4e726;hp=36ff20a15cf503c5447e98621f8234bb80da4208;hb=341e363240adfbf291dbeeaa6ab989ffe46eb874;hpb=cb136b9fea915007494b27a181a4552bf4f8b307 diff --git a/src/SMESH_I/SMESH_Group_i.cxx b/src/SMESH_I/SMESH_Group_i.cxx index 36ff20a15..a2dac404c 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-2019 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 @@ -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" @@ -55,11 +55,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 +69,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 = "<Extent(); - MESSAGE("get size of a vague group"); return 0; } @@ -240,10 +233,24 @@ CORBA::Boolean SMESH_GroupBase_i::IsEmpty() SMESHDS_GroupBase* aGroupDS = GetGroupDS(); if (aGroupDS) return aGroupDS->IsEmpty(); - MESSAGE("checking IsEmpty of a vague group"); return true; } +//============================================================================= +/* + * Return \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,7 +271,7 @@ void SMESH_Group_i::Clear() aGroupDS->Clear(); return; } - MESSAGE("attempt to clear a vague group"); + Modified(); // notify dependent Filter with FT_BelongToMeshGroup criterion } //============================================================================= @@ -281,7 +288,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; } @@ -303,11 +309,13 @@ CORBA::Long SMESH_Group_i::Add( const SMESH::long_array& theIDs ) 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 ) + Modified(); // notify dependent Filter with FT_BelongToMeshGroup criterion return nbAdd; } MESSAGE("attempt to add elements to a vague group"); @@ -316,7 +324,7 @@ CORBA::Long SMESH_Group_i::Add( const SMESH::long_array& theIDs ) //============================================================================= /*! - * + * */ //============================================================================= @@ -333,11 +341,13 @@ CORBA::Long SMESH_Group_i::Remove( const SMESH::long_array& theIDs ) 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 ) + Modified(); // notify dependent Filter with FT_BelongToMeshGroup criterion return nbDel; } MESSAGE("attempt to remove elements from a vague group"); @@ -346,7 +356,7 @@ CORBA::Long SMESH_Group_i::Remove( const SMESH::long_array& theIDs ) //============================================================================= /*! - * + * */ //============================================================================= @@ -355,6 +365,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 +378,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 +395,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 +410,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 +432,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; } //============================================================================= /*! - * + * */ //============================================================================= @@ -457,13 +473,13 @@ SMESH::long_array* SMESH_GroupBase_i::GetListOfID() { 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(); } @@ -475,8 +491,8 @@ namespace */ //================================================================================ - void getNodesOfElements(SMDS_ElemIteratorPtr elemIt, - set& nodes) + void getNodesOfElements(SMDS_ElemIteratorPtr elemIt, + std::set& nodes) { while ( elemIt->more() ) { @@ -504,7 +520,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(); @@ -547,10 +563,10 @@ SMESH::long_array* SMESH_GroupBase_i::GetNodeIDs() SMESH::long_array_var aRes = new SMESH::long_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(); } @@ -604,7 +620,6 @@ SALOMEDS::Color SMESH_GroupBase_i::GetColor() return aColor; } - MESSAGE("get color of a group"); return SALOMEDS::Color(); } @@ -657,13 +672,12 @@ void SMESH_GroupBase_i::SetColorNumber(CORBA::Long color) aGroupDS->SetColorGroup(color); TPythonDump()<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 ) @@ -693,7 +707,7 @@ 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 */ //============================================================================= @@ -714,7 +728,7 @@ 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() @@ -724,7 +738,7 @@ SMESH::long_array* SMESH_GroupBase_i::GetIDs() //======================================================================= //function : GetTypes -//purpose : Returns types of elements it contains +//purpose : Return types of elements it contains //======================================================================= SMESH::array_of_ElementType* SMESH_GroupBase_i::GetTypes() @@ -740,7 +754,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. //======================================================================= @@ -784,6 +798,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,22 +811,45 @@ 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 } + + SMESH::SMESH_GroupOnFilter_var me = _this(); + + // mark the group valid after edition + GetMeshServant()->GetGen()->HighLightInvalid( me, false ); + + + TPythonDump()<< me <<".SetFilter( "<< theFilter <<" )"; } //================================================================================ /*! - * \brief Returns the filter defining group contents + * \brief Return the filter defining group contents */ //================================================================================ @@ -822,9 +860,37 @@ SMESH::Filter_ptr SMESH_GroupOnFilter_i::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() @@ -844,13 +910,12 @@ 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 */ @@ -868,12 +933,12 @@ SMESH::long_array* SMESH_GroupOnFilter_i::GetMeshInfo() 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< 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 ]; @@ -900,9 +965,18 @@ std::string SMESH_GroupOnFilter_i::FilterToString() const 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; @@ -987,22 +1061,23 @@ 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 } +