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=9828ac9840bb19d8c90492f2cac722cebb4402eb;hp=d51714ae79a7d94929cba87714c2436f2470fd34;hb=b09372829929f8f561495d6c16527134971a1909;hpb=193c49c87753b6ccabb2b5e6dc935aa480d2d43e diff --git a/src/SMESH_I/SMESH_Group_i.cxx b/src/SMESH_I/SMESH_Group_i.cxx index d51714ae7..9828ac984 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-2021 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 = "<GetName() ); return CORBA::string_dup( "NO_NAME" ); } //============================================================================= /*! - * + * */ //============================================================================= @@ -203,7 +199,6 @@ SMESH::ElementType SMESH_GroupBase_i::GetType() } return aType; } - MESSAGE("get type of a vague group"); return SMESH::ALL; } @@ -214,7 +209,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 +217,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 +234,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 */ //============================================================================= @@ -280,8 +273,6 @@ void SMESH_Group_i::Clear() return; } Modified(); // notify dependent Filter with FT_BelongToMeshGroup criterion - - MESSAGE("attempt to clear a vague group"); } //============================================================================= @@ -290,7 +281,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 +289,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,7 +298,7 @@ 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(); @@ -320,9 +310,9 @@ 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 ) @@ -335,11 +325,11 @@ 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(); @@ -352,9 +342,9 @@ 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 ) @@ -367,11 +357,11 @@ 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, @@ -396,7 +386,7 @@ ChangeByPredicate( SMESH::Predicate_i* thePredicate, return aNb; } -CORBA::Long +SMESH::smIdType SMESH_Group_i:: AddByPredicate( SMESH::Predicate_ptr thePredicate ) { @@ -411,7 +401,7 @@ AddByPredicate( SMESH::Predicate_ptr thePredicate ) return 0; } -CORBA::Long +SMESH::smIdType SMESH_Group_i:: RemoveByPredicate( SMESH::Predicate_ptr thePredicate ) { @@ -426,7 +416,7 @@ RemoveByPredicate( SMESH::Predicate_ptr thePredicate ) 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(); @@ -455,7 +445,7 @@ CORBA::Long SMESH_Group_i::AddFrom( SMESH::SMESH_IDSource_ptr theSource ) */ //============================================================================= -CORBA::Long SMESH_GroupBase_i::GetID( CORBA::Long theIndex ) +SMESH::smIdType SMESH_GroupBase_i::GetID( SMESH::smIdType theIndex ) { if ( myPreMeshInfo ) myPreMeshInfo->FullLoadFromFile(); @@ -473,24 +463,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 +492,8 @@ namespace */ //================================================================================ - void getNodesOfElements(SMDS_ElemIteratorPtr elemIt, - set& nodes) + void getNodesOfElements(SMDS_ElemIteratorPtr elemIt, + std::set& nodes) { while ( elemIt->more() ) { @@ -519,7 +509,7 @@ namespace */ //================================================================================ -CORBA::Long SMESH_GroupBase_i::GetNumberOfNodes() +SMESH::smIdType SMESH_GroupBase_i::GetNumberOfNodes() { if ( GetType() == SMESH::NODE ) return Size(); @@ -531,7 +521,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 +553,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 +561,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 +621,6 @@ SALOMEDS::Color SMESH_GroupBase_i::GetColor() return aColor; } - MESSAGE("get color of a group"); return SALOMEDS::Color(); } @@ -662,7 +651,7 @@ void SMESH_GroupBase_i::SetColor(const SALOMEDS::Color& color) * */ //============================================================================= -CORBA::Long SMESH_GroupBase_i::GetColorNumber() +CORBA::Long SMESH_GroupBase_i::GetColorNumber() { SMESHDS_GroupBase* aGroupDS = GetGroupDS(); if (aGroupDS) @@ -684,31 +673,30 @@ void SMESH_GroupBase_i::SetColorNumber(CORBA::Long color) aGroupDS->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 +708,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 +729,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 +755,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 +799,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,12 +838,18 @@ 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 ); + + + TPythonDump()<< me <<".SetFilter( "<< theFilter <<" )"; } //================================================================================ /*! - * \brief Returns the filter defining group contents + * \brief Return the filter defining group contents */ //================================================================================ @@ -867,17 +860,45 @@ 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() +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 +910,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< SMESH::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 ]; @@ -1052,7 +1072,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(); @@ -1060,3 +1080,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 } +