X-Git-Url: http://git.salome-platform.org/gitweb/?p=modules%2Fsmesh.git;a=blobdiff_plain;f=src%2FSMESH%2FSMESH_subMesh.cxx;h=4f9955cf3000d6258458fe1ab6b7c139ed86ac6f;hp=05800491ba7ffb27dbff708c1a3f9ba00cea635d;hb=97b0a95536e8d44fecc9fda65393dfd325e450f7;hpb=88141f757b048eaa5aae0be49faaf274448bbcaf diff --git a/src/SMESH/SMESH_subMesh.cxx b/src/SMESH/SMESH_subMesh.cxx index 05800491b..4f9955cf3 100644 --- a/src/SMESH/SMESH_subMesh.cxx +++ b/src/SMESH/SMESH_subMesh.cxx @@ -1,4 +1,4 @@ -// Copyright (C) 2007-2016 CEA/DEN, EDF R&D, OPEN CASCADE +// Copyright (C) 2007-2020 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 @@ -110,6 +110,7 @@ SMESH_subMesh::SMESH_subMesh(int Id, } _computeCost = 0; // how costly is to compute this sub-mesh _realComputeCost = 0; + _allowedSubShapes = nullptr; } //============================================================================= @@ -201,7 +202,7 @@ SMESH_Algo* SMESH_subMesh::GetAlgo() const if ( !_algo ) { SMESH_subMesh* me = const_cast< SMESH_subMesh* >( this ); - me->_algo = _father->GetGen()->GetAlgo( me ); + me->_algo = _father->GetGen()->GetAlgo( me, & me->_algoShape ); } return _algo; } @@ -271,6 +272,42 @@ bool SMESH_subMesh::IsMeshComputed() const return false; } +//================================================================================ +/*! + * \brief Check if any upper level sub-shape is not computed. + * Used to update a sub-mesh icon + */ +//================================================================================ + +bool SMESH_subMesh::IsComputedPartially() const +{ + SMESH_subMeshIteratorPtr smIt = getDependsOnIterator(/*includeSelf=*/true, + /*SolidFirst=*/true); + bool allComputed = true; + TopAbs_ShapeEnum readyType = TopAbs_VERTEX; // max value + while ( smIt->more() && allComputed ) + { + SMESH_subMesh* sm = smIt->next(); + + if ( sm->GetSubShape().ShapeType() > readyType ) + break; // lower dimension -> stop + if ( sm->GetComputeState() != SMESH_subMesh::NOT_READY ) + readyType = sm->GetSubShape().ShapeType(); + + switch ( sm->GetComputeState() ) + { + case SMESH_subMesh::READY_TO_COMPUTE: + case SMESH_subMesh::FAILED_TO_COMPUTE: + allComputed = false;// sm->IsMeshComputed(); + break; + case SMESH_subMesh::NOT_READY: + case SMESH_subMesh::COMPUTE_OK: + continue; + } + } + return !allComputed; +} + //============================================================================= /*! * Return true if all sub-meshes have been meshed @@ -365,7 +402,7 @@ int SMESH_subMesh::computeCost() const */ //============================================================================= -const map < int, SMESH_subMesh * >& SMESH_subMesh::DependsOn() +const std::map < int, SMESH_subMesh * >& SMESH_subMesh::DependsOn() { if ( _dependenceAnalysed || !_father->HasShapeToMesh() ) return _mapDepend; @@ -878,7 +915,10 @@ SMESH_Hypothesis::Hypothesis_Status const SMESH_Hypothesis * prevAlgo = _father->GetHypothesis( this, f, true ); if (prevAlgo && string( algo->GetName()) != prevAlgo->GetName()) - modifiedHyp = true; + { + oldAlgoState = NO_ALGO; // force setting event listener (#16648) + modifiedHyp = true; + } } else setAlgoState(MISSING_HYP); @@ -1293,40 +1333,19 @@ static void cleanSubMesh( SMESH_subMesh * subMesh ) SMESHDS_Mesh * meshDS = subMesh->GetFather()->GetMeshDS(); int nbElems = subMeshDS->NbElements(); if ( nbElems > 0 ) - { - // start from elem with max ID to avoid filling the pool of IDs - bool rev = true; - SMDS_ElemIteratorPtr ite = subMeshDS->GetElements( rev ); - const SMDS_MeshElement * lastElem = ite->next(); - rev = ( lastElem->GetID() == meshDS->MaxElementID() ); - if ( !rev ) - ite = subMeshDS->GetElements( rev ); - else - meshDS->RemoveFreeElement( lastElem, subMeshDS ); - while (ite->more()) { - const SMDS_MeshElement * elt = ite->next(); - meshDS->RemoveFreeElement( elt, subMeshDS ); - } - } + for ( SMDS_ElemIteratorPtr ite = subMeshDS->GetElements(); ite->more(); ) + meshDS->RemoveFreeElement( ite->next(), subMeshDS ); + int nbNodes = subMeshDS->NbNodes(); if ( nbNodes > 0 ) - { - bool rev = true; - SMDS_NodeIteratorPtr itn = subMeshDS->GetNodes( rev ); - const SMDS_MeshNode * lastNode = itn->next(); - rev = ( lastNode->GetID() == meshDS->MaxNodeID() ); - if ( !rev ) - itn = subMeshDS->GetNodes( rev ); - else - meshDS->RemoveNode( lastNode ); - while (itn->more()) { + for ( SMDS_NodeIteratorPtr itn = subMeshDS->GetNodes(); itn->more() ; ) + { const SMDS_MeshNode * node = itn->next(); if ( node->NbInverseElements() == 0 ) meshDS->RemoveFreeNode( node, subMeshDS ); else // for StdMeshers_CompositeSegment_1D: node in one submesh, edge in another - meshDS->RemoveNode(node); + meshDS->RemoveNode( node ); } - } subMeshDS->Clear(); } } @@ -1496,11 +1515,14 @@ bool SMESH_subMesh::ComputeStateEngine(compute_event event) if (_father->HasShapeToMesh() ) { bool subComputed = false, subFailed = false; if (!algo->OnlyUnaryInput()) { - if ( event == COMPUTE /*&& - ( algo->NeedDiscreteBoundary() || algo->SupportSubmeshes() )*/) - shape = getCollection( gen, algo, subComputed, subFailed, algo->SubMeshesToCompute()); - else - subComputed = SubMeshesComputed( & subFailed ); + // --- commented for bos#22320 to compute all sub-shapes at once if possible; + // --- in case COMPUTE_SUBMESH, set of sub-shapes is limited + // --- by calling SetAllowedSubShapes() + // if ( event == COMPUTE ) + // shape = getCollection( gen, algo, subComputed, subFailed, algo->SubMeshesToComput; + // else + // subComputed = SubMeshesComputed( & subFailed ); + shape = getCollection( gen, algo, subComputed, subFailed, algo->SubMeshesToCompute()); } else { subComputed = SubMeshesComputed(); @@ -1628,8 +1650,9 @@ bool SMESH_subMesh::ComputeStateEngine(compute_event event) ((SMESHDS_Hypothesis*)hyps.front())->SaveTo( hypStr.Stream() ); hypStr << " "; } - cout << _algo->GetName() - << " " << _father->GetSubMesh( subS.Current() )->GetId() + cout << _father->GetSubMesh( subS.Current() )->GetId() + << " " << ( ret ? "OK" : "FAIL" ) + << " " << _algo->GetName() << " " << hypStr << endl; } #endif @@ -1704,6 +1727,8 @@ bool SMESH_subMesh::ComputeStateEngine(compute_event event) else updateDependantsState( SUBMESH_COMPUTED ); } + // let algo clear its data gathered while algo->Compute() + algo->CheckHypothesis((*_father), _subShape, hyp_status); } break; case COMPUTE_CANCELED: // nothing to do @@ -1763,6 +1788,8 @@ bool SMESH_subMesh::ComputeStateEngine(compute_event event) break; case COMPUTE: // nothing to do break; + case COMPUTE_SUBMESH: // nothing to do + break; case COMPUTE_CANCELED: // nothing to do break; case CLEAN: @@ -2136,8 +2163,9 @@ TopoDS_Shape SMESH_subMesh::getCollection(SMESH_Gen * theGen, return _subShape; const bool skipAuxHyps = false; - list aUsedHyp = + list usedHyps = theAlgo->GetUsedHypothesis( *_father, _subShape, skipAuxHyps ); // copy + std::list < TopoDS_Shape > assiShapes = theAlgo->GetAssignedShapes(); // put in a compound all shapes with the same hypothesis assigned // and a good ComputeState @@ -2155,6 +2183,8 @@ TopoDS_Shape SMESH_subMesh::getCollection(SMESH_Gen * theGen, const TopoDS_Shape& S = subMesh->_subShape; if ( S.ShapeType() != this->_subShape.ShapeType() ) continue; + if ( _allowedSubShapes && !_allowedSubShapes->IsEmpty() && !_allowedSubShapes->Contains( S )) + continue; if ( subMesh == this ) { aBuilder.Add( aCompound, S ); @@ -2164,7 +2194,9 @@ TopoDS_Shape SMESH_subMesh::getCollection(SMESH_Gen * theGen, { SMESH_Algo* anAlgo = subMesh->GetAlgo(); if (( anAlgo->IsSameName( *theAlgo )) && // same algo - ( anAlgo->GetUsedHypothesis( *_father, S, skipAuxHyps ) == aUsedHyp )) // same hyps + ( anAlgo->GetUsedHypothesis( *_father, S, skipAuxHyps ) == usedHyps ) && // same hyps + ( anAlgo->GetAssignedShapes() == assiShapes ) && // on same sub-shapes + ( _algoShape == subMesh->_algoShape )) { aBuilder.Add( aCompound, S ); if ( !subMesh->SubMeshesComputed() ) @@ -2297,9 +2329,9 @@ void SMESH_subMesh::setEventListener(EventListener* listener, _eventListeners.find( listener ); if ( l_d != _eventListeners.end() ) { EventListenerData* curData = l_d->second; + l_d->second = data; if ( curData && curData != data && curData->IsDeletable() ) delete curData; - l_d->second = data; } else { @@ -2307,6 +2339,7 @@ void SMESH_subMesh::setEventListener(EventListener* listener, if ( listener->GetName() == l_d->first->GetName() ) { EventListenerData* curData = l_d->second; + l_d->second = 0; if ( curData && curData != data && curData->IsDeletable() ) delete curData; if ( l_d->first != listener && l_d->first->IsDeletable() ) @@ -2470,7 +2503,8 @@ void SMESH_subMesh::loadDependentMeshes() { list< OwnListenerData >::iterator d; for ( d = _ownListeners.begin(); d != _ownListeners.end(); ++d ) - if ( _father != d->mySubMesh->_father ) + if ( _father != d->mySubMesh->_father && + _father->FindMesh( d->myMeshID )) d->mySubMesh->_father->Load(); // map< EventListener*, EventListenerData* >::iterator l_d = _eventListeners.begin(); @@ -2569,9 +2603,9 @@ namespace { //================================================================================ /*! - * \brief Return iterator on the submeshes this one depends on - * \param includeSelf - this submesh to be returned also - * \param reverse - if true, complex shape submeshes go first + * \brief Return iterator on the submeshes this one depends on + * \param includeSelf - this submesh to be returned also + * \param reverse - if true, complex shape submeshes go first */ //================================================================================ @@ -2612,8 +2646,13 @@ const std::vector< SMESH_subMesh * > & SMESH_subMesh::GetAncestors() const SMESH_subMesh* me = const_cast< SMESH_subMesh* >( this ); me->_ancestors.reserve( ancShapes.Extent() ); + // assure that all sub-meshes exist + TopoDS_Shape mainShape = _father->GetShapeToMesh(); + if ( !mainShape.IsNull() ) + _father->GetSubMesh( mainShape )->DependsOn(); + TopTools_MapOfShape map; - + for ( TopTools_ListIteratorOfListOfShape it( ancShapes ); it.More(); it.Next() ) if ( SMESH_subMesh* sm = _father->GetSubMeshContaining( it.Value() )) if ( map.Add( it.Value() ))