X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FSMESH%2FSMESH_Gen.cxx;h=6635311805968590d0925c6ec593dc4f387f2483;hb=fdab1d32d5c6a0e4e3e8548e717f725156ac88a2;hp=8fadef162a25872a02eecbf736d6c2c076b0ccc7;hpb=27c5228fcfe39a6405378da49ac700ee2adca6cc;p=modules%2Fsmesh.git diff --git a/src/SMESH/SMESH_Gen.cxx b/src/SMESH/SMESH_Gen.cxx index 8fadef162..663531180 100644 --- a/src/SMESH/SMESH_Gen.cxx +++ b/src/SMESH/SMESH_Gen.cxx @@ -1,4 +1,4 @@ -// Copyright (C) 2007-2015 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 @@ -20,7 +20,7 @@ // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // -// SMESH SMESH : implementaion of SMESH idl descriptions +// SMESH SMESH : implementation of SMESH idl descriptions // File : SMESH_Gen.cxx // Author : Paul RASCLE, EDF // Module : SMESH @@ -35,6 +35,7 @@ #include "SMDS_MeshNode.hxx" #include "SMESHDS_Document.hxx" #include "SMESH_HypoFilter.hxx" +#include "SMESH_Mesh.hxx" #include "SMESH_MesherHelper.hxx" #include "SMESH_subMesh.hxx" @@ -51,10 +52,53 @@ #include #endif +#include + using namespace std; -//#include +// Environment variable separator +#ifdef WIN32 + #define env_sep ';' +#else + #define env_sep ':' +#endif +namespace +{ + // a structure used to nullify SMESH_Gen field of SMESH_Hypothesis, + // which is needed for SMESH_Hypothesis not deleted before ~SMESH_Gen() + struct _Hyp : public SMESH_Hypothesis + { + void NullifyGen() + { + _gen = 0; + } + }; + + //================================================================================ + /*! + * \brief Fill a map of shapes with all sub-shape of a sub-mesh + */ + //================================================================================ + + TopTools_IndexedMapOfShape * fillAllowed( SMESH_subMesh* sm, + const bool toFill, + TopTools_IndexedMapOfShape * allowedSub ) + { + if ( !toFill || !allowedSub ) + { + return nullptr; + } + if ( allowedSub->IsEmpty() ) + { + allowedSub->ReSize( sm->DependsOn().size() + 1 ); + allowedSub->Add( sm->GetSubShape() ); + for ( const auto & key_sm : sm->DependsOn() ) + allowedSub->Add( key_sm.second->GetSubShape() ); + } + return allowedSub; + } +} //============================================================================= /*! @@ -64,14 +108,12 @@ using namespace std; SMESH_Gen::SMESH_Gen() { - MESSAGE("SMESH_Gen::SMESH_Gen"); + _studyContext = new StudyContextStruct; + _studyContext->myDocument = new SMESHDS_Document(); _localId = 0; _hypId = 0; _segmentation = _nbSegments = 10; - SMDS_Mesh::_meshList.clear(); - MESSAGE(SMDS_Mesh::_meshList.size()); _compute_canceled = false; - //vtkDebugLeaks::SetExitError(0); } //============================================================================= @@ -82,13 +124,14 @@ SMESH_Gen::SMESH_Gen() SMESH_Gen::~SMESH_Gen() { - MESSAGE("SMESH_Gen::~SMESH_Gen"); - std::map < int, StudyContextStruct * >::iterator i_sc = _mapStudyContext.begin(); - for ( ; i_sc != _mapStudyContext.end(); ++i_sc ) + std::map < int, SMESH_Hypothesis * >::iterator i_hyp = _studyContext->mapHypothesis.begin(); + for ( ; i_hyp != _studyContext->mapHypothesis.end(); ++i_hyp ) { - delete i_sc->second->myDocument; - delete i_sc->second; - } + if ( _Hyp* h = static_cast< _Hyp*>( i_hyp->second )) + h->NullifyGen(); + } + delete _studyContext->myDocument; + delete _studyContext; } //============================================================================= @@ -98,22 +141,17 @@ SMESH_Gen::~SMESH_Gen() */ //============================================================================= -SMESH_Mesh* SMESH_Gen::CreateMesh(int theStudyId, bool theIsEmbeddedMode) +SMESH_Mesh* SMESH_Gen::CreateMesh(bool theIsEmbeddedMode) throw(SALOME_Exception) { Unexpect aCatch(SalomeException); - MESSAGE("SMESH_Gen::CreateMesh"); - - // Get studyContext, create it if it does'nt exist, with a SMESHDS_Document - StudyContextStruct *aStudyContext = GetStudyContext(theStudyId); // create a new SMESH_mesh object SMESH_Mesh *aMesh = new SMESH_Mesh(_localId++, - theStudyId, this, theIsEmbeddedMode, - aStudyContext->myDocument); - aStudyContext->mapMesh[_localId-1] = aMesh; + _studyContext->myDocument); + _studyContext->mapMesh[_localId-1] = aMesh; return aMesh; } @@ -124,19 +162,22 @@ SMESH_Mesh* SMESH_Gen::CreateMesh(int theStudyId, bool theIsEmbeddedMode) */ //============================================================================= -bool SMESH_Gen::Compute(SMESH_Mesh & aMesh, - const TopoDS_Shape & aShape, - const bool aShapeOnly /*=false*/, - const bool anUpward /*=false*/, - const ::MeshDimension aDim /*=::MeshDim_3D*/, - TSetOfInt* aShapesId /*=0*/) +bool SMESH_Gen::Compute(SMESH_Mesh & aMesh, + const TopoDS_Shape & aShape, + const int aFlags /*= COMPACT_MESH*/, + const ::MeshDimension aDim /*=::MeshDim_3D*/, + TSetOfInt* aShapesId /*=0*/, + TopTools_IndexedMapOfShape* anAllowedSubShapes/*=0*/) { - MESSAGE("SMESH_Gen::Compute"); MEMOSTAT; + const bool aShapeOnly = aFlags & SHAPE_ONLY; + const bool anUpward = aFlags & UPWARD; + const bool aCompactMesh = aFlags & COMPACT_MESH; + bool ret = true; - SMESH_subMesh *sm = aMesh.GetSubMesh(aShape); + SMESH_subMesh *sm, *shapeSM = aMesh.GetSubMesh(aShape); const bool includeSelf = true; const bool complexShapeFirst = true; @@ -145,10 +186,16 @@ bool SMESH_Gen::Compute(SMESH_Mesh & aMesh, SMESH_subMeshIteratorPtr smIt; // Fix of Issue 22150. Due to !BLSURF->OnlyUnaryInput(), BLSURF computes edges - // that must be computed by Projection 1D-2D when Projection asks to compute + // that must be computed by Projection 1D-2D while the Projection asks to compute // one face only. SMESH_subMesh::compute_event computeEvent = aShapeOnly ? SMESH_subMesh::COMPUTE_SUBMESH : SMESH_subMesh::COMPUTE; + if ( !aMesh.HasShapeToMesh() ) + computeEvent = SMESH_subMesh::COMPUTE_NOGEOM; // if several algos and no geometry + + TopTools_IndexedMapOfShape *allowedSubShapes = anAllowedSubShapes, allowedSub; + if ( aShapeOnly && !allowedSubShapes ) + allowedSubShapes = &allowedSub; if ( anUpward ) // is called from the below code in this method { @@ -156,7 +203,7 @@ bool SMESH_Gen::Compute(SMESH_Mesh & aMesh, // Mesh all the sub-shapes starting from vertices // =============================================== - smIt = sm->getDependsOnIterator(includeSelf, !complexShapeFirst); + smIt = shapeSM->getDependsOnIterator(includeSelf, !complexShapeFirst); while ( smIt->more() ) { SMESH_subMesh* smToCompute = smIt->next(); @@ -180,9 +227,11 @@ bool SMESH_Gen::Compute(SMESH_Mesh & aMesh, { if (_compute_canceled) return false; + smToCompute->SetAllowedSubShapes( fillAllowed( shapeSM, aShapeOnly, allowedSubShapes )); setCurrentSubMesh( smToCompute ); smToCompute->ComputeStateEngine( computeEvent ); - setCurrentSubMesh( NULL ); + setCurrentSubMesh( nullptr ); + smToCompute->SetAllowedSubShapes( nullptr ); } // we check all the sub-meshes here and detect if any of them failed to compute @@ -215,7 +264,7 @@ bool SMESH_Gen::Compute(SMESH_Mesh & aMesh, TopoDS_Shape algoShape; int prevShapeDim = -1, aShapeDim; - smIt = sm->getDependsOnIterator(includeSelf, complexShapeFirst); + smIt = shapeSM->getDependsOnIterator(includeSelf, complexShapeFirst); while ( smIt->more() ) { SMESH_subMesh* smToCompute = smIt->next(); @@ -267,9 +316,11 @@ bool SMESH_Gen::Compute(SMESH_Mesh & aMesh, { if (_compute_canceled) return false; + smToCompute->SetAllowedSubShapes( fillAllowed( shapeSM, aShapeOnly, allowedSubShapes )); setCurrentSubMesh( smToCompute ); smToCompute->ComputeStateEngine( computeEvent ); - setCurrentSubMesh( NULL ); + setCurrentSubMesh( nullptr ); + smToCompute->SetAllowedSubShapes( nullptr ); if ( aShapesId ) aShapesId->insert( smToCompute->GetId() ); } @@ -317,7 +368,6 @@ bool SMESH_Gen::Compute(SMESH_Mesh & aMesh, const TopoDS_Shape& aSubShape = smToCompute->GetSubShape(); const int aShapeDim = GetShapeDim( aSubShape ); - //if ( aSubShape.ShapeType() == TopAbs_VERTEX ) continue; if ( aShapeDim < 1 ) continue; // check for preview dimension limitations @@ -332,10 +382,14 @@ bool SMESH_Gen::Compute(SMESH_Mesh & aMesh, if ( SMESH_Algo* subAlgo = (SMESH_Algo*) aMesh.GetHypothesis( smToCompute, filter, true)) { if ( ! subAlgo->NeedDiscreteBoundary() ) continue; + TopTools_IndexedMapOfShape* localAllowed = allowedSubShapes; + if ( localAllowed && localAllowed->IsEmpty() ) + localAllowed = 0; // prevent fillAllowed() with aSubShape + SMESH_Hypothesis::Hypothesis_Status status; if ( subAlgo->CheckHypothesis( aMesh, aSubShape, status )) // mesh a lower smToCompute starting from vertices - Compute( aMesh, aSubShape, aShapeOnly, /*anUpward=*/true, aDim, aShapesId ); + Compute( aMesh, aSubShape, aFlags | SHAPE_ONLY_UPWARD, aDim, aShapesId, localAllowed ); } } } @@ -354,9 +408,11 @@ bool SMESH_Gen::Compute(SMESH_Mesh & aMesh, if (_compute_canceled) return false; + sm->SetAllowedSubShapes( fillAllowed( shapeSM, aShapeOnly, allowedSubShapes )); setCurrentSubMesh( sm ); sm->ComputeStateEngine( computeEvent ); setCurrentSubMesh( NULL ); + sm->SetAllowedSubShapes( nullptr ); if ( aShapesId ) aShapesId->insert( sm->GetId() ); } @@ -366,27 +422,29 @@ bool SMESH_Gen::Compute(SMESH_Mesh & aMesh, // ----------------------------------------------- // mesh the rest sub-shapes starting from vertices // ----------------------------------------------- - ret = Compute( aMesh, aShape, aShapeOnly, /*anUpward=*/true, aDim, aShapesId ); + ret = Compute( aMesh, aShape, aFlags | UPWARD, aDim, aShapesId, allowedSubShapes ); } - MESSAGE( "VSR - SMESH_Gen::Compute() finished, OK = " << ret); MEMOSTAT; - SMESHDS_Mesh *myMesh = aMesh.GetMeshDS(); - MESSAGE("*** compactMesh after compute"); - myMesh->compactMesh(); - // fix quadratic mesh by bending iternal links near concave boundary - if ( aShape.IsSame( aMesh.GetShapeToMesh() ) && + if ( aCompactMesh && // a final compute + aShape.IsSame( aMesh.GetShapeToMesh() ) && !aShapesId && // not preview ret ) // everything is OK { SMESH_MesherHelper aHelper( aMesh ); if ( aHelper.IsQuadraticMesh() != SMESH_MesherHelper::LINEAR ) { - aHelper.FixQuadraticElements( sm->GetComputeError() ); + aHelper.FixQuadraticElements( shapeSM->GetComputeError() ); } } + + if ( aCompactMesh ) + { + aMesh.GetMeshDS()->Modified(); + aMesh.GetMeshDS()->CompactMesh(); + } return ret; } @@ -441,7 +499,8 @@ void SMESH_Gen::setCurrentSubMesh(SMESH_subMesh* sm) { if ( sm ) _sm_current.push_back( sm ); - else + + else if ( !_sm_current.empty() ) _sm_current.pop_back(); } @@ -462,8 +521,6 @@ bool SMESH_Gen::Evaluate(SMESH_Mesh & aMesh, const bool anUpward, TSetOfInt* aShapesId) { - MESSAGE("SMESH_Gen::Evaluate"); - bool ret = true; SMESH_subMesh *sm = aMesh.GetSubMesh(aShape); @@ -585,7 +642,6 @@ bool SMESH_Gen::Evaluate(SMESH_Mesh & aMesh, ret = Evaluate( aMesh, aShape, aResMap, /*anUpward=*/true, aShapesId ); } - MESSAGE( "VSR - SMESH_Gen::Evaluate() finished, OK = " << ret); return ret; } @@ -655,7 +711,7 @@ static bool checkConformIgnoredAlgos(SMESH_Mesh& aMesh, checkConform = false; // no more check conformity INFOS( "ERROR: Local <" << algo->GetName() << "> would produce not conform mesh: " - " hypotesis is missing"); + " hypothesis is missing"); theErrors.push_back( SMESH_Gen::TAlgoStateError() ); theErrors.back().Set( SMESH_Hypothesis::HYP_NOTCONFORM, algo, false ); } @@ -706,8 +762,6 @@ static bool checkMissing(SMESH_Gen* aGen, if ( aCheckedMap.count( aSubMesh )) return true; - //MESSAGE("=====checkMissing"); - int ret = true; SMESH_Algo* algo = 0; @@ -828,8 +882,6 @@ bool SMESH_Gen::GetAlgoState(SMESH_Mesh& theMesh, const TopoDS_Shape& theShape, list< TAlgoStateError > & theErrors) { - //MESSAGE("SMESH_Gen::CheckAlgoState"); - bool ret = true; bool hasAlgo = false; @@ -907,8 +959,6 @@ bool SMESH_Gen::GetAlgoState(SMESH_Mesh& theMesh, // well defined // ---------------------------------------------------------------- - //MESSAGE( "---info on missing hypothesis and find out if all needed algos are"); - // find max dim of global algo int aTopAlgoDim = 0; for (dim = 3; dim > 0; dim--) @@ -943,7 +993,7 @@ bool SMESH_Gen::GetAlgoState(SMESH_Mesh& theMesh, if ( !hasAlgo ) { ret = false; theErrors.push_back( TAlgoStateError() ); - theErrors.back().Set( SMESH_Hypothesis::HYP_MISSING, 1, true ); + theErrors.back().Set( SMESH_Hypothesis::HYP_MISSING, theMesh.HasShapeToMesh() ? 1 : 3, true ); } return ret; @@ -978,7 +1028,7 @@ std::vector< std::string > SMESH_Gen::GetPluginXMLPaths() while ( from < meshers.size() ) { // cut off plugin name - pos = meshers.find( ':', from ); + pos = meshers.find( env_sep, from ); if ( pos != string::npos ) plugin = meshers.substr( from, pos-from ); else @@ -1025,7 +1075,15 @@ std::vector< std::string > SMESH_Gen::GetPluginXMLPaths() xmlPath += sep + plugin + ".xml"; bool fileOK; #ifdef WIN32 - fileOK = (GetFileAttributes(xmlPath.c_str()) != INVALID_FILE_ATTRIBUTES); +#ifdef UNICODE + const wchar_t* path = Kernel_Utils::decode_s(xmlPath); +#else + const char* path = xmlPath.c_str(); +#endif + fileOK = (GetFileAttributes(path) != INVALID_FILE_ATTRIBUTES); +#ifdef UNICODE + delete path; +#endif #else fileOK = (access(xmlPath.c_str(), F_OK) == 0); #endif @@ -1065,7 +1123,8 @@ SMESH_Algo *SMESH_Gen::GetAlgo(SMESH_subMesh * aSubMesh, SMESH_Mesh& aMesh = *aSubMesh->GetFather(); SMESH_HypoFilter filter( SMESH_HypoFilter::IsAlgo() ); - filter.And( filter.IsApplicableTo( aShape )); + if ( aMesh.HasShapeToMesh() ) + filter.And( filter.IsApplicableTo( aShape )); typedef SMESH_Algo::Features AlgoData; @@ -1134,17 +1193,9 @@ SMESH_Algo *SMESH_Gen::GetAlgo(SMESH_subMesh * aSubMesh, */ //============================================================================= -StudyContextStruct *SMESH_Gen::GetStudyContext(int studyId) +StudyContextStruct *SMESH_Gen::GetStudyContext() { - // Get studyContext, create it if it does'nt exist, with a SMESHDS_Document - - if (_mapStudyContext.find(studyId) == _mapStudyContext.end()) - { - _mapStudyContext[studyId] = new StudyContextStruct; - _mapStudyContext[studyId]->myDocument = new SMESHDS_Document(studyId); - } - StudyContextStruct *myStudyContext = _mapStudyContext[studyId]; - return myStudyContext; + return _studyContext; } //================================================================================ @@ -1173,7 +1224,7 @@ int SMESH_Gen::GetShapeDim(const TopAbs_ShapeEnum & aShapeType) //============================================================================= /*! - * Genarate a new id unique withing this Gen + * Generate a new id unique within this Gen */ //=============================================================================