X-Git-Url: http://git.salome-platform.org/gitweb/?p=modules%2Fsmesh.git;a=blobdiff_plain;f=src%2FSMESH%2FSMESH_Mesh.cxx;h=9ed363a17251602bd888c851959075cb107425bb;hp=b5a598f5725eafae43203519c2f58ad0fc24e31c;hb=HEAD;hpb=f6f19e7452a9a62395b87847c87e87d3b9469541 diff --git a/src/SMESH/SMESH_Mesh.cxx b/src/SMESH/SMESH_Mesh.cxx index b5a598f57..2f7c6efa7 100644 --- a/src/SMESH/SMESH_Mesh.cxx +++ b/src/SMESH/SMESH_Mesh.cxx @@ -1,4 +1,4 @@ -// Copyright (C) 2007-2020 CEA/DEN, EDF R&D, OPEN CASCADE +// Copyright (C) 2007-2024 CEA, EDF, OPEN CASCADE // // Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN, // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS @@ -57,7 +57,7 @@ #include -#undef _Precision_HeaderFile +//#undef _Precision_HeaderFile #include #include #include @@ -76,19 +76,18 @@ #ifndef WIN32 #include #include -#else +#else #include #endif +#ifndef WIN32 +#include +namespace fs=boost::filesystem; +#endif + // maximum stored group name length in MED file #define MAX_MED_GROUP_NAME_LENGTH 80 -#ifdef _DEBUG_ -static int MYDEBUG = 0; -#else -static int MYDEBUG = 0; -#endif - #define cSMESH_Hyp(h) static_cast(h) typedef SMESH_HypoFilter THypType; @@ -99,28 +98,46 @@ class SMESH_Mesh::SubMeshHolder : public SMESHDS_TSubMeshHolder< SMESH_subMesh > //============================================================================= /*! - * + * */ //============================================================================= -SMESH_Mesh::SMESH_Mesh(int theLocalId, +SMESH_Mesh::SMESH_Mesh(int theLocalId, SMESH_Gen* theGen, bool theIsEmbeddedMode, SMESHDS_Document* theDocument): _groupId( 0 ), _nbSubShapes( 0 ) { - if(MYDEBUG) MESSAGE("SMESH_Mesh::SMESH_Mesh(int localId)"); + MESSAGE("SMESH_Mesh::SMESH_Mesh(int localId)"); _id = theLocalId; _gen = theGen; - _myDocument = theDocument; - _myMeshDS = theDocument->NewMesh(theIsEmbeddedMode,theLocalId); + _document = theDocument; + _meshDS = theDocument->NewMesh(theIsEmbeddedMode,theLocalId); _isShapeToMesh = false; _isAutoColor = false; _isModified = false; _shapeDiagonal = 0.0; _callUp = NULL; - _myMeshDS->ShapeToMesh( PseudoShape() ); + _meshDS->ShapeToMesh( PseudoShape() ); _subMeshHolder = new SubMeshHolder; + + // assure unique persistent ID + if ( _document->NbMeshes() > 1 ) + { + std::set< int > ids; + for ( _document->InitMeshesIterator(); _document->MoreMesh(); ) + { + SMESHDS_Mesh * meshDS =_document->NextMesh(); + if ( meshDS != _meshDS ) + ids.insert( meshDS->GetPersistentId() ); + } + + if ( ids.count( _meshDS->GetPersistentId() )) + { + int uniqueID = *ids.rbegin() + 1; + _meshDS->SetPersistentId( uniqueID ); + } + } } //================================================================================ @@ -134,8 +151,8 @@ SMESH_Mesh::SMESH_Mesh(): _groupId( 0 ), _nbSubShapes( 0 ), _isShapeToMesh( false ), - _myDocument( 0 ), - _myMeshDS( 0 ), + _document( 0 ), + _meshDS( 0 ), _gen( 0 ), _isAutoColor( false ), _isModified( false ), @@ -150,13 +167,11 @@ namespace #ifndef WIN32 void deleteMeshDS(SMESHDS_Mesh* meshDS) { - //cout << "deleteMeshDS( " << meshDS << endl; delete meshDS; } #else static void* deleteMeshDS(void* meshDS) { - //cout << "deleteMeshDS( " << meshDS << endl; SMESHDS_Mesh* m = (SMESHDS_Mesh*)meshDS; if(m) { delete m; @@ -174,11 +189,11 @@ namespace SMESH_Mesh::~SMESH_Mesh() { - if(MYDEBUG) MESSAGE("SMESH_Mesh::~SMESH_Mesh"); + MESSAGE("SMESH_Mesh::~SMESH_Mesh"); - if ( _myDocument ) // avoid destructing _myMeshDS from ~SMESH_Gen() - _myDocument->RemoveMesh( _id ); - _myDocument = 0; + if ( _document ) // avoid destructing _meshDS from ~SMESH_Gen() + _document->RemoveMesh( _id ); + _document = 0; // remove self from studyContext if ( _gen ) @@ -187,7 +202,7 @@ SMESH_Mesh::~SMESH_Mesh() studyContext->mapMesh.erase( _id ); } - _myMeshDS->ClearMesh(); + _meshDS->ClearMesh(); // issue 0020340: EDF 1022 SMESH : Crash with FindNodeClosestTo in a second new study // Notify event listeners at least that something happens @@ -208,13 +223,13 @@ SMESH_Mesh::~SMESH_Mesh() if ( _callUp) delete _callUp; _callUp = 0; - if ( _myMeshDS ) { - // delete _myMeshDS, in a thread in order not to block closing a study with large meshes + if ( _meshDS ) { + // delete _meshDS, in a thread in order not to block closing a study with large meshes #ifndef WIN32 - boost::thread aThread(boost::bind( & deleteMeshDS, _myMeshDS )); + boost::thread aThread(boost::bind( & deleteMeshDS, _meshDS )); #else pthread_t thread; - int result=pthread_create(&thread, NULL, deleteMeshDS, (void*)_myMeshDS); + int result=pthread_create(&thread, NULL, deleteMeshDS, (void*)_meshDS); #endif } } @@ -227,7 +242,7 @@ SMESH_Mesh::~SMESH_Mesh() bool SMESH_Mesh::MeshExists( int meshId ) const { - return _myDocument ? bool( _myDocument->GetMesh( meshId )) : false; + return _document ? bool( _document->GetMesh( meshId )) : false; } //================================================================================ @@ -258,15 +273,15 @@ SMESH_Mesh* SMESH_Mesh::FindMesh( int meshId ) const void SMESH_Mesh::ShapeToMesh(const TopoDS_Shape & aShape) { - if(MYDEBUG) MESSAGE("SMESH_Mesh::ShapeToMesh"); + MESSAGE("SMESH_Mesh::ShapeToMesh"); if ( !aShape.IsNull() && _isShapeToMesh ) { if ( aShape.ShapeType() != TopAbs_COMPOUND && // group contents is allowed to change - _myMeshDS->ShapeToMesh().ShapeType() != TopAbs_COMPOUND ) + _meshDS->ShapeToMesh().ShapeType() != TopAbs_COMPOUND ) throw SALOME_Exception(LOCALIZED ("a shape to mesh has already been defined")); } // clear current data - if ( !_myMeshDS->ShapeToMesh().IsNull() ) + if ( !_meshDS->ShapeToMesh().IsNull() ) { // removal of a shape to mesh, delete objects referring to sub-shapes: // - sub-meshes @@ -275,7 +290,7 @@ void SMESH_Mesh::ShapeToMesh(const TopoDS_Shape & aShape) std::map ::iterator i_gr = _mapGroup.begin(); while ( i_gr != _mapGroup.end() ) { if ( dynamic_cast( i_gr->second->GetGroupDS() )) { - _myMeshDS->RemoveGroup( i_gr->second->GetGroupDS() ); + _meshDS->RemoveGroup( i_gr->second->GetGroupDS() ); delete i_gr->second; _mapGroup.erase( i_gr++ ); } @@ -286,7 +301,7 @@ void SMESH_Mesh::ShapeToMesh(const TopoDS_Shape & aShape) // clear SMESHDS TopoDS_Shape aNullShape; - _myMeshDS->ShapeToMesh( aNullShape ); + _meshDS->ShapeToMesh( aNullShape ); _shapeDiagonal = 0.0; } @@ -294,9 +309,9 @@ void SMESH_Mesh::ShapeToMesh(const TopoDS_Shape & aShape) // set a new geometry if ( !aShape.IsNull() ) { - _myMeshDS->ShapeToMesh(aShape); + _meshDS->ShapeToMesh(aShape); _isShapeToMesh = true; - _nbSubShapes = _myMeshDS->MaxShapeIndex(); + _nbSubShapes = _meshDS->MaxShapeIndex(); // fill map of ancestors fillAncestorsMap(aShape); @@ -305,7 +320,7 @@ void SMESH_Mesh::ShapeToMesh(const TopoDS_Shape & aShape) { _isShapeToMesh = false; _shapeDiagonal = 0.0; - _myMeshDS->ShapeToMesh( PseudoShape() ); + _meshDS->ShapeToMesh( PseudoShape() ); } _isModified = false; } @@ -318,7 +333,7 @@ void SMESH_Mesh::ShapeToMesh(const TopoDS_Shape & aShape) TopoDS_Shape SMESH_Mesh::GetShapeToMesh() const { - return _myMeshDS->ShapeToMesh(); + return _meshDS->ShapeToMesh(); } //======================================================================= @@ -411,7 +426,7 @@ void SMESH_Mesh::Clear() if ( HasShapeToMesh() ) // remove all nodes and elements { // clear mesh data - _myMeshDS->ClearMesh(); + _meshDS->ClearMesh(); // update compute state of submeshes if ( SMESH_subMesh *sm = GetSubMeshContaining( GetShapeToMesh() ) ) @@ -474,7 +489,7 @@ int SMESH_Mesh::UNVToMesh(const char* theFileName) _isShapeToMesh = false; DriverUNV_R_SMDS_Mesh myReader; - myReader.SetMesh(_myMeshDS); + myReader.SetMesh(_meshDS); myReader.SetFile(theFileName); myReader.SetMeshId(-1); myReader.Perform(); @@ -486,7 +501,7 @@ int SMESH_Mesh::UNVToMesh(const char* theFileName) { SMDS_MeshGroup* aGroup = gr2names->first; const std::string& aName = gr2names->second; - SMESHDS_Group* aGroupDS = new SMESHDS_Group( anId++, _myMeshDS, aGroup->GetType() ); + SMESHDS_Group* aGroupDS = new SMESHDS_Group( anId++, _meshDS, aGroup->GetType() ); aGroupDS->SMDSGroup() = std::move( *aGroup ); aGroupDS->SetStoreName( aName.c_str() ); AddGroup( aGroupDS ); @@ -507,15 +522,17 @@ int SMESH_Mesh::MEDToMesh(const char* theFileName, const char* theMeshName) _isShapeToMesh = false; DriverMED_R_SMESHDS_Mesh myReader; - myReader.SetMesh(_myMeshDS); + myReader.SetMesh(_meshDS); myReader.SetMeshId(-1); myReader.SetFile(theFileName); myReader.SetMeshName(theMeshName); Driver_Mesh::Status status = myReader.Perform(); -#ifdef _DEBUG_ - SMESH_ComputeErrorPtr er = myReader.GetError(); - if ( er && !er->IsOK() ) std::cout << er->myComment << std::endl; -#endif + + if (SALOME::VerbosityActivated()) + { + SMESH_ComputeErrorPtr er = myReader.GetError(); + if ( er && !er->IsOK() ) std::cout << er->myComment << std::endl; + } // Reading groups (sub-meshes are out of scope of MED import functionality) std::list aGroupNames = myReader.GetGroupNamesAndTypes(); @@ -532,8 +549,8 @@ int SMESH_Mesh::MEDToMesh(const char* theFileName, const char* theMeshName) } } - _myMeshDS->Modified(); - _myMeshDS->CompactMesh(); + _meshDS->Modified(); + _meshDS->CompactMesh(); return (int) status; } @@ -550,7 +567,7 @@ std::string SMESH_Mesh::STLToMesh(const char* theFileName) _isShapeToMesh = false; DriverSTL_R_SMDS_Mesh myReader; - myReader.SetMesh(_myMeshDS); + myReader.SetMesh(_meshDS); myReader.SetFile(theFileName); myReader.SetMeshId(-1); myReader.Perform(); @@ -574,7 +591,7 @@ int SMESH_Mesh::CGNSToMesh(const char* theFileName, #ifdef WITH_CGNS DriverCGNS_Read myReader; - myReader.SetMesh(_myMeshDS); + myReader.SetMesh(_meshDS); myReader.SetFile(theFileName); myReader.SetMeshId(theMeshIndex); res = myReader.Perform(); @@ -597,7 +614,7 @@ SMESH_ComputeErrorPtr SMESH_Mesh::GMFToMesh(const char* theFileName, bool theMakeRequiredGroups) { DriverGMF_Read myReader; - myReader.SetMesh(_myMeshDS); + myReader.SetMesh(_meshDS); myReader.SetFile(theFileName); myReader.SetMakeRequiredGroups( theMakeRequiredGroups ); myReader.Perform(); @@ -611,7 +628,7 @@ SMESH_ComputeErrorPtr SMESH_Mesh::GMFToMesh(const char* theFileName, //============================================================================= /*! - * + * */ //============================================================================= @@ -620,8 +637,7 @@ SMESH_Mesh::AddHypothesis(const TopoDS_Shape & aSubShape, int anHypId, std::string* anError ) { - Unexpect aCatch(SalomeException); - if(MYDEBUG) MESSAGE("SMESH_Mesh::AddHypothesis"); + MESSAGE("SMESH_Mesh::AddHypothesis"); if ( anError ) anError->clear(); @@ -645,7 +661,7 @@ SMESH_Mesh::AddHypothesis(const TopoDS_Shape & aSubShape, std::string hypName = anHyp->GetName(); if ( hypName == "NotConformAllowed" ) { - if(MYDEBUG) MESSAGE( "Hypothesis can be only global" ); + MESSAGE( "Hypothesis can be only global" ); return SMESH_Hypothesis::HYP_INCOMPATIBLE; } } @@ -688,7 +704,7 @@ SMESH_Mesh::AddHypothesis(const TopoDS_Shape & aSubShape, while ( smIt->more() ) { SMESH_subMesh* sm = smIt->next(); if ( sm->IsApplicableHypothesis( anHyp )) { - ret2 = sm->CheckConcurrentHypothesis( anHyp->GetType() ); + ret2 = sm->CheckConcurrentHypothesis( anHyp ); if (ret2 > ret) { ret = ret2; break; @@ -700,14 +716,14 @@ SMESH_Mesh::AddHypothesis(const TopoDS_Shape & aSubShape, HasModificationsToDiscard(); // to reset _isModified flag if a mesh becomes empty GetMeshDS()->Modified(); - if(MYDEBUG) subMesh->DumpAlgoState(true); - if(MYDEBUG) SCRUTE(ret); + if(SALOME::VerbosityActivated()) subMesh->DumpAlgoState(true); + SCRUTE(ret); return ret; } //============================================================================= /*! - * + * */ //============================================================================= @@ -715,17 +731,16 @@ SMESH_Hypothesis::Hypothesis_Status SMESH_Mesh::RemoveHypothesis(const TopoDS_Shape & aSubShape, int anHypId) { - Unexpect aCatch(SalomeException); - if(MYDEBUG) MESSAGE("SMESH_Mesh::RemoveHypothesis"); + MESSAGE("SMESH_Mesh::RemoveHypothesis"); StudyContextStruct *sc = _gen->GetStudyContext(); if (sc->mapHypothesis.find(anHypId) == sc->mapHypothesis.end()) throw SALOME_Exception(LOCALIZED("hypothesis does not exist")); SMESH_Hypothesis *anHyp = sc->mapHypothesis[anHypId]; - if(MYDEBUG) { SCRUTE(anHyp->GetType()); } + SCRUTE(anHyp->GetType()); - // shape + // shape bool isAlgo = ( !anHyp->GetType() == SMESHDS_Hypothesis::PARAM_ALGO ); SMESH_subMesh::algo_event event = isAlgo ? SMESH_subMesh::REMOVE_ALGO : SMESH_subMesh::REMOVE_HYP; @@ -737,7 +752,7 @@ SMESH_Mesh::RemoveHypothesis(const TopoDS_Shape & aSubShape, // there may appear concurrent hyps that were covered by the removed hyp if (ret < SMESH_Hypothesis::HYP_CONCURRENT && subMesh->IsApplicableHypothesis( anHyp ) && - subMesh->CheckConcurrentHypothesis( anHyp->GetType() ) != SMESH_Hypothesis::HYP_OK) + subMesh->CheckConcurrentHypothesis( anHyp ) != SMESH_Hypothesis::HYP_OK) ret = SMESH_Hypothesis::HYP_CONCURRENT; // sub-shapes @@ -758,7 +773,7 @@ SMESH_Mesh::RemoveHypothesis(const TopoDS_Shape & aSubShape, while ( smIt->more() ) { SMESH_subMesh* sm = smIt->next(); if ( sm->IsApplicableHypothesis( anHyp )) { - ret2 = sm->CheckConcurrentHypothesis( anHyp->GetType() ); + ret2 = sm->CheckConcurrentHypothesis( anHyp ); if (ret2 > ret) { ret = ret2; break; @@ -771,21 +786,21 @@ SMESH_Mesh::RemoveHypothesis(const TopoDS_Shape & aSubShape, HasModificationsToDiscard(); // to reset _isModified flag if mesh become empty GetMeshDS()->Modified(); - if(MYDEBUG) subMesh->DumpAlgoState(true); - if(MYDEBUG) SCRUTE(ret); + if(SALOME::VerbosityActivated()) subMesh->DumpAlgoState(true); + SCRUTE(ret); return ret; } //============================================================================= /*! - * + * */ //============================================================================= const std::list& SMESH_Mesh::GetHypothesisList(const TopoDS_Shape & aSubShape) const { - return _myMeshDS->GetHypothesis(aSubShape); + return _meshDS->GetHypothesis(aSubShape); } //======================================================================= @@ -828,7 +843,7 @@ const SMESH_Hypothesis * SMESH_Mesh::GetHypothesis(const SMESH_subMesh * aSubM { const TopoDS_Shape & aSubShape = aSubMesh->GetSubShape(); - const std::list& hypList = _myMeshDS->GetHypothesis(aSubShape); + const std::list& hypList = _meshDS->GetHypothesis(aSubShape); std::list::const_iterator hyp = hypList.begin(); for ( ; hyp != hypList.end(); hyp++ ) { const SMESH_Hypothesis * h = cSMESH_Hyp( *hyp ); @@ -845,11 +860,11 @@ const SMESH_Hypothesis * SMESH_Mesh::GetHypothesis(const SMESH_subMesh * aSubM const_cast< std::vector< SMESH_subMesh * > & > ( aSubMesh->GetAncestors() ); SortByMeshOrder( ancestors ); - std::vector::const_iterator smIt = ancestors.begin(); + std::vector::const_iterator smIt = ancestors.begin(); for ( ; smIt != ancestors.end(); smIt++ ) { const TopoDS_Shape& curSh = (*smIt)->GetSubShape(); - const std::list& hypList = _myMeshDS->GetHypothesis(curSh); + const std::list& hypList = _meshDS->GetHypothesis(curSh); std::list::const_iterator hyp = hypList.begin(); for ( ; hyp != hypList.end(); hyp++ ) { const SMESH_Hypothesis * h = cSMESH_Hyp( *hyp ); @@ -921,7 +936,7 @@ int SMESH_Mesh::GetHypotheses(const SMESH_subMesh * aSubMesh, // get hypos from aSubShape { const TopoDS_Shape & aSubShape = aSubMesh->GetSubShape(); - const std::list& hypList = _myMeshDS->GetHypothesis(aSubShape); + const std::list& hypList = _meshDS->GetHypothesis(aSubShape); for ( hyp = hypList.begin(); hyp != hypList.end(); hyp++ ) { const SMESH_Hypothesis* h = cSMESH_Hyp( *hyp ); @@ -950,7 +965,7 @@ int SMESH_Mesh::GetHypotheses(const SMESH_subMesh * aSubMesh, for ( ; smIt != ancestors.end(); smIt++ ) { const TopoDS_Shape& curSh = (*smIt)->GetSubShape(); - const std::list& hypList = _myMeshDS->GetHypothesis(curSh); + const std::list& hypList = _meshDS->GetHypothesis(curSh); for ( hyp = hypList.begin(); hyp != hypList.end(); hyp++ ) { const SMESH_Hypothesis* h = cSMESH_Hyp( *hyp ); @@ -988,25 +1003,23 @@ SMESH_Hypothesis * SMESH_Mesh::GetHypothesis(const int anHypId) const //============================================================================= /*! - * + * */ //============================================================================= const std::list & SMESH_Mesh::GetLog() { - Unexpect aCatch(SalomeException); - return _myMeshDS->GetScript()->GetCommands(); + return _meshDS->GetScript()->GetCommands(); } //============================================================================= /*! - * + * */ //============================================================================= void SMESH_Mesh::ClearLog() { - Unexpect aCatch(SalomeException); - _myMeshDS->GetScript()->Clear(); + _meshDS->GetScript()->Clear(); } //============================================================================= @@ -1017,7 +1030,7 @@ void SMESH_Mesh::ClearLog() SMESH_subMesh * SMESH_Mesh::GetSubMesh(const TopoDS_Shape & aSubShape) { - int index = _myMeshDS->ShapeToIndex(aSubShape); + int index = _meshDS->ShapeToIndex(aSubShape); if ( !index && aSubShape.IsNull() ) return 0; @@ -1027,10 +1040,10 @@ SMESH_subMesh * SMESH_Mesh::GetSubMesh(const TopoDS_Shape & aSubShape) TopoDS_Iterator it( aSubShape ); if ( it.More() ) { - index = _myMeshDS->AddCompoundSubmesh( aSubShape, it.Value().ShapeType() ); + index = _meshDS->AddCompoundSubmesh( aSubShape, it.Value().ShapeType() ); // fill map of Ancestors while ( _nbSubShapes < index ) - fillAncestorsMap( _myMeshDS->IndexToShape( ++_nbSubShapes )); + fillAncestorsMap( _meshDS->IndexToShape( ++_nbSubShapes )); } } // if ( !index ) @@ -1039,7 +1052,7 @@ SMESH_subMesh * SMESH_Mesh::GetSubMesh(const TopoDS_Shape & aSubShape) SMESH_subMesh* aSubMesh = _subMeshHolder->Get( index ); if ( !aSubMesh ) { - aSubMesh = new SMESH_subMesh(index, this, _myMeshDS, aSubShape); + aSubMesh = new SMESH_subMesh(index, this, _meshDS, aSubShape); _subMeshHolder->Add( index, aSubMesh ); // include non-computable sub-meshes in SMESH_subMesh::_ancestors of sub-submeshes @@ -1069,7 +1082,7 @@ SMESH_subMesh * SMESH_Mesh::GetSubMesh(const TopoDS_Shape & aSubShape) SMESH_subMesh *SMESH_Mesh::GetSubMeshContaining(const TopoDS_Shape & aSubShape) const { - int index = _myMeshDS->ShapeToIndex(aSubShape); + int index = _meshDS->ShapeToIndex(aSubShape); return GetSubMeshContaining( index ); } @@ -1159,7 +1172,7 @@ bool SMESH_Mesh::IsUsedHypothesis(SMESHDS_Hypothesis * anHyp, // algorithm parameter if (algo) { - // look trough hypotheses used by algo + // look through hypotheses used by algo const SMESH_HypoFilter* hypoKind; if (( hypoKind = algo->GetCompatibleHypoFilter( !hyp->IsAuxiliary() ))) { std::list usedHyps; @@ -1178,16 +1191,15 @@ bool SMESH_Mesh::IsUsedHypothesis(SMESHDS_Hypothesis * anHyp, void SMESH_Mesh::NotifySubMeshesHypothesisModification(const SMESH_Hypothesis* hyp) { - Unexpect aCatch(SalomeException); if ( !GetMeshDS()->IsUsedHypothesis( hyp )) return; - int nbEntities = ( _myMeshDS->NbNodes() + _myMeshDS->NbElements() ); + smIdType nbEntities = ( _meshDS->NbNodes() + _meshDS->NbElements() ); if ( hyp && _callUp && !_callUp->IsLoaded() ) // for not loaded mesh (#16648) { _callUp->HypothesisModified( hyp->GetID(), /*updateIcons=*/true ); - nbEntities = ( _myMeshDS->NbNodes() + _myMeshDS->NbElements() ); // after loading mesh + nbEntities = ( _meshDS->NbNodes() + _meshDS->NbElements() ); // after loading mesh } SMESH_Algo *algo; @@ -1257,7 +1269,7 @@ void SMESH_Mesh::NotifySubMeshesHypothesisModification(const SMESH_Hypothesis* h HasModificationsToDiscard(); // to reset _isModified flag if mesh becomes empty GetMeshDS()->Modified(); - int newNbEntities = ( _myMeshDS->NbNodes() + _myMeshDS->NbElements() ); + smIdType newNbEntities = ( _meshDS->NbNodes() + _meshDS->NbElements() ); if ( hyp && _callUp ) _callUp->HypothesisModified( hyp->GetID(), newNbEntities != nbEntities ); } @@ -1269,13 +1281,11 @@ void SMESH_Mesh::NotifySubMeshesHypothesisModification(const SMESH_Hypothesis* h //============================================================================= void SMESH_Mesh::SetAutoColor(bool theAutoColor) { - Unexpect aCatch(SalomeException); _isAutoColor = theAutoColor; } bool SMESH_Mesh::GetAutoColor() { - Unexpect aCatch(SalomeException); return _isAutoColor; } @@ -1394,69 +1404,47 @@ bool SMESH_Mesh::HasDuplicatedGroupNamesMED() //================================================================================ /*! - * \brief Export the mesh to a med file - * \param [in] file - name of the MED file - * \param [in] theMeshName - name of this mesh - * \param [in] theAutoGroups - boolean parameter for creating/not creating - * the groups Group_On_All_Nodes, Group_On_All_Faces, ... ; - * the typical use is auto_groups=false. - * \param [in] theVersion - define the minor (xy, where version is x.y.z) of MED file format. - * If theVersion is equal to -1, the minor version is not changed (default). - * \param [in] meshPart - mesh data to export - * \param [in] theAutoDimension - if \c true, a space dimension of a MED mesh can be either - * - 1D if all mesh nodes lie on OX coordinate axis, or - * - 2D if all mesh nodes lie on XOY coordinate plane, or - * - 3D in the rest cases. - * If \a theAutoDimension is \c false, the space dimension is always 3. - * \param [in] theAddODOnVertices - to create 0D elements on all vertices - * \param [in] theAllElemsToGroup - to make every element to belong to any group (PAL23413) - * \param [in] ZTolerance - tolerance in Z direction. If Z coordinate of a node is close to zero - * within a given tolerance, the coordinate is set to zero. - * If \a ZTolerance is negative, the node coordinates are kept as is. - * \return int - mesh index in the file + * \brief Export the mesh to a writer */ //================================================================================ -void SMESH_Mesh::ExportMED(const char * file, - const char* theMeshName, - bool theAutoGroups, - int theVersion, - const SMESHDS_Mesh* meshPart, - bool theAutoDimension, - bool theAddODOnVertices, - double theZTolerance, - bool theAllElemsToGroup) +void SMESH_Mesh::exportMEDCommmon(DriverMED_W_SMESHDS_Mesh& theWriter, + const char* theMeshName, + bool theAutoGroups, + const SMESHDS_Mesh* theMeshPart, + bool theAutoDimension, + bool theAddODOnVertices, + double theZTolerance, + bool theSaveNumbers) { - MESSAGE("MED_VERSION:"<< theVersion); + Driver_Mesh::Status status = Driver_Mesh::DRS_OK; + SMESH_TRY; - DriverMED_W_SMESHDS_Mesh myWriter; - myWriter.SetFile ( file , theVersion); - myWriter.SetMesh ( meshPart ? (SMESHDS_Mesh*) meshPart : _myMeshDS ); - myWriter.SetAutoDimension( theAutoDimension ); - myWriter.AddODOnVertices ( theAddODOnVertices ); - myWriter.SetZTolerance ( theZTolerance ); + theWriter.SetMesh ( theMeshPart ? (SMESHDS_Mesh*) theMeshPart : _meshDS ); + theWriter.SetAutoDimension( theAutoDimension ); + theWriter.AddODOnVertices ( theAddODOnVertices ); + theWriter.SetZTolerance ( theZTolerance ); + theWriter.SetSaveNumbers ( theSaveNumbers ); if ( !theMeshName ) - myWriter.SetMeshId ( _id ); + theWriter.SetMeshId ( _id ); else { - myWriter.SetMeshId ( -1 ); - myWriter.SetMeshName ( theMeshName ); + theWriter.SetMeshId ( -1 ); + theWriter.SetMeshName ( theMeshName ); } if ( theAutoGroups ) { - myWriter.AddGroupOfNodes(); - myWriter.AddGroupOfEdges(); - myWriter.AddGroupOfFaces(); - myWriter.AddGroupOfVolumes(); - myWriter.AddGroupOf0DElems(); - myWriter.AddGroupOfBalls(); + theWriter.AddGroupOfNodes(); + theWriter.AddGroupOfEdges(); + theWriter.AddGroupOfFaces(); + theWriter.AddGroupOfVolumes(); + theWriter.AddGroupOf0DElems(); + theWriter.AddGroupOfBalls(); } - if ( theAllElemsToGroup ) - myWriter.AddAllToGroup(); // Pass groups to writer. Provide unique group names. //set aGroupNames; // Corrected for Mantis issue 0020028 - if ( !meshPart ) + if ( !theMeshPart ) { std::map< SMDSAbs_ElementType, std::set > aGroupNames; char aString [256]; @@ -1477,59 +1465,79 @@ void SMESH_Mesh::ExportMED(const char * file, aGroupName.resize(MAX_MED_GROUP_NAME_LENGTH); } aGroupDS->SetStoreName( aGroupName.c_str() ); - myWriter.AddGroup( aGroupDS ); + theWriter.AddGroup( aGroupDS ); } } } // Perform export - myWriter.Perform(); + status = theWriter.Perform(); SMESH_CATCH( SMESH::throwSalomeEx ); + + if ( status == Driver_Mesh::DRS_TOO_LARGE_MESH ) + throw TooLargeForExport("MED"); } //================================================================================ /*! - * \brief Export the mesh to a SAUV file + * Same as SMESH_Mesh::ExportMED except for \a file and \a theVersion */ //================================================================================ -void SMESH_Mesh::ExportSAUV(const char *file, - const char* theMeshName, - bool theAutoGroups) +MEDCoupling::MCAuto +SMESH_Mesh::ExportMEDCoupling(const char* theMeshName, + bool theAutoGroups, + const SMESHDS_Mesh* theMeshPart, + bool theAutoDimension, + bool theAddODOnVertices, + double theZTolerance, + bool theSaveNumbers) { - std::string medfilename(file); - medfilename += ".med"; - std::string cmd; -#ifdef WIN32 - cmd = "%PYTHONBIN% "; -#else - cmd = "python3 "; -#endif - cmd += "-c \""; - cmd += "from medutilities import my_remove ; my_remove(r'" + medfilename + "')"; - cmd += "\""; - system(cmd.c_str()); - ExportMED(medfilename.c_str(), theMeshName, theAutoGroups, /*minor=*/-1, - /*meshPart=*/NULL, /*theAutoDimension=*/false, /*theAddODOnVertices=*/false, - /*zTol=*/-1, /*theAllElemsToGroup=*/true ); // theAllElemsToGroup is for PAL0023413 -#ifdef WIN32 - cmd = "%PYTHONBIN% "; -#else - cmd = "python3 "; -#endif - cmd += "-c \""; - cmd += "from medutilities import convert ; convert(r'" + medfilename + "', 'MED', 'GIBI', 1, r'" + file + "')"; - cmd += "\""; - system(cmd.c_str()); -#ifdef WIN32 - cmd = "%PYTHONBIN% "; -#else - cmd = "python3 "; -#endif - cmd += "-c \""; - cmd += "from medutilities import my_remove ; my_remove(r'" + medfilename + "')"; - cmd += "\""; - system(cmd.c_str()); + DriverMED_W_SMESHDS_Mesh_Mem writer; + this->exportMEDCommmon( writer, theMeshName, theAutoGroups, theMeshPart, theAutoDimension, + theAddODOnVertices, theZTolerance, theSaveNumbers); + return writer.getData(); +} + +//================================================================================ +/*! + * \brief Export the mesh to a med file + * \param [in] theFile - name of the MED file + * \param [in] theMeshName - name of this mesh + * \param [in] theAutoGroups - boolean parameter for creating/not creating + * the groups Group_On_All_Nodes, Group_On_All_Faces, ... ; + * the typical use is auto_groups=false. + * \param [in] theVersion - define the minor (xy, where version is x.y.z) of MED file format. + * If theVersion is equal to -1, the minor version is not changed (default). + * \param [in] theMeshPart - mesh data to export + * \param [in] theAutoDimension - if \c true, a space dimension of a MED mesh can be either + * - 1D if all mesh nodes lie on OX coordinate axis, or + * - 2D if all mesh nodes lie on XOY coordinate plane, or + * - 3D in the rest cases. + * If \a theAutoDimension is \c false, the space dimension is always 3. + * \param [in] theAddODOnVertices - to create 0D elements on all vertices + * \param [in] theZTolerance - tolerance in Z direction. If Z coordinate of a node is close to zero + * within a given tolerance, the coordinate is set to zero. + * If \a ZTolerance is negative, the node coordinates are kept as is. + * \param [in] theSaveNumbers : enable saving numbers of nodes and cells. + * \return int - mesh index in the file + */ +//================================================================================ + +void SMESH_Mesh::ExportMED(const char * theFile, + const char* theMeshName, + bool theAutoGroups, + int theVersion, + const SMESHDS_Mesh* theMeshPart, + bool theAutoDimension, + bool theAddODOnVertices, + double theZTolerance, + bool theSaveNumbers) +{ + MESSAGE("MED_VERSION:"<< theVersion); + DriverMED_W_SMESHDS_Mesh writer; + writer.SetFile( theFile, theVersion ); + this->exportMEDCommmon( writer, theMeshName, theAutoGroups, theMeshPart, theAutoDimension, theAddODOnVertices, theZTolerance, theSaveNumbers ); } //================================================================================ @@ -1539,14 +1547,23 @@ void SMESH_Mesh::ExportSAUV(const char *file, //================================================================================ void SMESH_Mesh::ExportDAT(const char * file, - const SMESHDS_Mesh* meshPart) + const SMESHDS_Mesh* meshPart, + const bool renumber) { - Unexpect aCatch(SalomeException); - DriverDAT_W_SMDS_Mesh myWriter; - myWriter.SetFile( file ); - myWriter.SetMesh( meshPart ? (SMESHDS_Mesh*) meshPart : _myMeshDS ); - myWriter.SetMeshId(_id); - myWriter.Perform(); + Driver_Mesh::Status status; + SMESH_TRY; + + DriverDAT_W_SMDS_Mesh writer; + writer.SetFile( file ); + writer.SetMesh( meshPart ? (SMESHDS_Mesh*) meshPart : _meshDS ); + writer.SetMeshId(_id); + writer.SetRenumber( renumber ); + status = writer.Perform(); + + SMESH_CATCH( SMESH::throwSalomeEx ); + + if ( status == Driver_Mesh::DRS_TOO_LARGE_MESH ) + throw TooLargeForExport("DAT"); } //================================================================================ @@ -1556,14 +1573,17 @@ void SMESH_Mesh::ExportDAT(const char * file, //================================================================================ void SMESH_Mesh::ExportUNV(const char * file, - const SMESHDS_Mesh* meshPart) + const SMESHDS_Mesh* meshPart, + const bool renumber) { - Unexpect aCatch(SalomeException); - DriverUNV_W_SMDS_Mesh myWriter; - myWriter.SetFile( file ); - myWriter.SetMesh( meshPart ? (SMESHDS_Mesh*) meshPart : _myMeshDS ); - myWriter.SetMeshId(_id); - // myWriter.SetGroups(_mapGroup); + Driver_Mesh::Status status; + + SMESH_TRY; + DriverUNV_W_SMDS_Mesh writer; + writer.SetFile( file ); + writer.SetMesh( meshPart ? (SMESHDS_Mesh*) meshPart : _meshDS ); + writer.SetMeshId(_id); + writer.SetRenumber( renumber ); // pass group names to SMESHDS if ( !meshPart ) @@ -1575,11 +1595,16 @@ void SMESH_Mesh::ExportUNV(const char * file, if ( aGroupDS ) { std::string aGroupName = aGroup->GetName(); aGroupDS->SetStoreName( aGroupName.c_str() ); - myWriter.AddGroup( aGroupDS ); + writer.AddGroup( aGroupDS ); } } } - myWriter.Perform(); + status = writer.Perform(); + + SMESH_CATCH( SMESH::throwSalomeEx ); + + if ( status == Driver_Mesh::DRS_TOO_LARGE_MESH ) + throw TooLargeForExport("UNV"); } //================================================================================ @@ -1593,14 +1618,21 @@ void SMESH_Mesh::ExportSTL(const char * file, const char * name, const SMESHDS_Mesh* meshPart) { - Unexpect aCatch(SalomeException); - DriverSTL_W_SMDS_Mesh myWriter; - myWriter.SetFile( file ); - myWriter.SetIsAscii( isascii ); - myWriter.SetMesh( meshPart ? (SMESHDS_Mesh*) meshPart : _myMeshDS); - myWriter.SetMeshId(_id); - if ( name ) myWriter.SetName( name ); - myWriter.Perform(); + Driver_Mesh::Status status; + SMESH_TRY; + + DriverSTL_W_SMDS_Mesh writer; + writer.SetFile( file ); + writer.SetIsAscii( isascii ); + writer.SetMesh( meshPart ? (SMESHDS_Mesh*) meshPart : _meshDS); + writer.SetMeshId(_id); + if ( name ) writer.SetName( name ); + status = writer.Perform(); + + SMESH_CATCH( SMESH::throwSalomeEx ); + + if ( status == Driver_Mesh::DRS_TOO_LARGE_MESH ) + throw TooLargeForExport("STL"); } //================================================================================ @@ -1614,7 +1646,9 @@ void SMESH_Mesh::ExportCGNS(const char * file, const char * meshName, const bool groupElemsByType) { + int res = Driver_Mesh::DRS_FAIL; + SMESH_TRY; // pass group names to SMESHDS std::map::iterator it = _mapGroup.begin(); @@ -1628,22 +1662,27 @@ void SMESH_Mesh::ExportCGNS(const char * file, } #ifdef WITH_CGNS - DriverCGNS_Write myWriter; - myWriter.SetFile( file ); - myWriter.SetMesh( const_cast( meshDS )); - myWriter.SetMeshName( SMESH_Comment("Mesh_") << meshDS->GetPersistentId()); + DriverCGNS_Write writer; + writer.SetFile( file ); + writer.SetMesh( const_cast( meshDS )); + writer.SetMeshName( SMESH_Comment("Mesh_") << meshDS->GetPersistentId()); if ( meshName && meshName[0] ) - myWriter.SetMeshName( meshName ); - myWriter.SetElementsByType( groupElemsByType ); - res = myWriter.Perform(); + writer.SetMeshName( meshName ); + writer.SetElementsByType( groupElemsByType ); + res = writer.Perform(); if ( res != Driver_Mesh::DRS_OK ) { - SMESH_ComputeErrorPtr err = myWriter.GetError(); + SMESH_ComputeErrorPtr err = writer.GetError(); if ( err && !err->IsOK() && !err->myComment.empty() ) throw SALOME_Exception(("Export failed: " + err->myComment ).c_str() ); } #endif + SMESH_CATCH( SMESH::throwSalomeEx ); + + if ( res == Driver_Mesh::DRS_TOO_LARGE_MESH ) + throw TooLargeForExport("CGNS"); + if ( res != Driver_Mesh::DRS_OK ) throw SALOME_Exception("Export failed"); } @@ -1658,12 +1697,20 @@ void SMESH_Mesh::ExportGMF(const char * file, const SMESHDS_Mesh* meshDS, bool withRequiredGroups) { - DriverGMF_Write myWriter; - myWriter.SetFile( file ); - myWriter.SetMesh( const_cast( meshDS )); - myWriter.SetExportRequiredGroups( withRequiredGroups ); + Driver_Mesh::Status status; + SMESH_TRY; + + DriverGMF_Write writer; + writer.SetFile( file ); + writer.SetMesh( const_cast( meshDS )); + writer.SetExportRequiredGroups( withRequiredGroups ); - myWriter.Perform(); + status = writer.Perform(); + + SMESH_CATCH( SMESH::throwSalomeEx ); + + if ( status == Driver_Mesh::DRS_TOO_LARGE_MESH ) + throw TooLargeForExport("GMF"); } //================================================================================ @@ -1679,7 +1726,7 @@ double SMESH_Mesh::GetComputeProgress() const const SMESH_subMesh* curSM = _gen->GetCurrentSubMesh(); // get progress of a current algo - TColStd_MapOfInteger currentSubIds; + TColStd_MapOfInteger currentSubIds; if ( curSM ) if ( SMESH_Algo* algo = curSM->GetAlgo() ) { @@ -1700,9 +1747,8 @@ double SMESH_Mesh::GetComputeProgress() const rate = algo->GetProgress(); } catch (...) { -#ifdef _DEBUG_ - std::cerr << "Exception in " << algo->GetName() << "::GetProgress()" << std::endl; -#endif + if (SALOME::VerbosityActivated()) + std::cerr << "Exception in " << algo->GetName() << "::GetProgress()" << std::endl; } if ( 0. < rate && rate < 1.001 ) { @@ -1713,7 +1759,6 @@ double SMESH_Mesh::GetComputeProgress() const rate = algo->GetProgressByTic(); computedCost += algoDoneCost + rate * algoNotDoneCost; } - // cout << "rate: "<GetMeshInfo().NbElements() << endl; return computedCost / totalCost; } @@ -1746,10 +1788,9 @@ double SMESH_Mesh::GetComputeProgress() const */ //================================================================================ -int SMESH_Mesh::NbNodes() const +smIdType SMESH_Mesh::NbNodes() const { - Unexpect aCatch(SalomeException); - return _myMeshDS->NbNodes(); + return _meshDS->NbNodes(); } //================================================================================ @@ -1758,10 +1799,9 @@ int SMESH_Mesh::NbNodes() const */ //================================================================================ -int SMESH_Mesh::Nb0DElements() const +smIdType SMESH_Mesh::Nb0DElements() const { - Unexpect aCatch(SalomeException); - return _myMeshDS->GetMeshInfo().Nb0DElements(); + return _meshDS->GetMeshInfo().Nb0DElements(); } //================================================================================ @@ -1770,10 +1810,9 @@ int SMESH_Mesh::Nb0DElements() const */ //================================================================================ -int SMESH_Mesh::NbEdges(SMDSAbs_ElementOrder order) const +smIdType SMESH_Mesh::NbEdges(SMDSAbs_ElementOrder order) const { - Unexpect aCatch(SalomeException); - return _myMeshDS->GetMeshInfo().NbEdges(order); + return _meshDS->GetMeshInfo().NbEdges(order); } //================================================================================ @@ -1782,10 +1821,9 @@ int SMESH_Mesh::NbEdges(SMDSAbs_ElementOrder order) const */ //================================================================================ -int SMESH_Mesh::NbFaces(SMDSAbs_ElementOrder order) const +smIdType SMESH_Mesh::NbFaces(SMDSAbs_ElementOrder order) const { - Unexpect aCatch(SalomeException); - return _myMeshDS->GetMeshInfo().NbFaces(order); + return _meshDS->GetMeshInfo().NbFaces(order); } //================================================================================ @@ -1794,10 +1832,9 @@ int SMESH_Mesh::NbFaces(SMDSAbs_ElementOrder order) const */ //================================================================================ -int SMESH_Mesh::NbTriangles(SMDSAbs_ElementOrder order) const +smIdType SMESH_Mesh::NbTriangles(SMDSAbs_ElementOrder order) const { - Unexpect aCatch(SalomeException); - return _myMeshDS->GetMeshInfo().NbTriangles(order); + return _meshDS->GetMeshInfo().NbTriangles(order); } //================================================================================ @@ -1806,10 +1843,9 @@ int SMESH_Mesh::NbTriangles(SMDSAbs_ElementOrder order) const */ //================================================================================ -int SMESH_Mesh::NbBiQuadTriangles() const +smIdType SMESH_Mesh::NbBiQuadTriangles() const { - Unexpect aCatch(SalomeException); - return _myMeshDS->GetMeshInfo().NbBiQuadTriangles(); + return _meshDS->GetMeshInfo().NbBiQuadTriangles(); } //================================================================================ @@ -1818,10 +1854,9 @@ int SMESH_Mesh::NbBiQuadTriangles() const */ //================================================================================ -int SMESH_Mesh::NbQuadrangles(SMDSAbs_ElementOrder order) const +smIdType SMESH_Mesh::NbQuadrangles(SMDSAbs_ElementOrder order) const { - Unexpect aCatch(SalomeException); - return _myMeshDS->GetMeshInfo().NbQuadrangles(order); + return _meshDS->GetMeshInfo().NbQuadrangles(order); } //================================================================================ @@ -1830,10 +1865,9 @@ int SMESH_Mesh::NbQuadrangles(SMDSAbs_ElementOrder order) const */ //================================================================================ -int SMESH_Mesh::NbBiQuadQuadrangles() const +smIdType SMESH_Mesh::NbBiQuadQuadrangles() const { - Unexpect aCatch(SalomeException); - return _myMeshDS->GetMeshInfo().NbBiQuadQuadrangles(); + return _meshDS->GetMeshInfo().NbBiQuadQuadrangles(); } //================================================================================ @@ -1842,10 +1876,9 @@ int SMESH_Mesh::NbBiQuadQuadrangles() const */ //================================================================================ -int SMESH_Mesh::NbPolygons(SMDSAbs_ElementOrder order) const +smIdType SMESH_Mesh::NbPolygons(SMDSAbs_ElementOrder order) const { - Unexpect aCatch(SalomeException); - return _myMeshDS->GetMeshInfo().NbPolygons(order); + return _meshDS->GetMeshInfo().NbPolygons(order); } //================================================================================ @@ -1854,10 +1887,9 @@ int SMESH_Mesh::NbPolygons(SMDSAbs_ElementOrder order) const */ //================================================================================ -int SMESH_Mesh::NbVolumes(SMDSAbs_ElementOrder order) const +smIdType SMESH_Mesh::NbVolumes(SMDSAbs_ElementOrder order) const { - Unexpect aCatch(SalomeException); - return _myMeshDS->GetMeshInfo().NbVolumes(order); + return _meshDS->GetMeshInfo().NbVolumes(order); } //================================================================================ @@ -1866,10 +1898,9 @@ int SMESH_Mesh::NbVolumes(SMDSAbs_ElementOrder order) const */ //================================================================================ -int SMESH_Mesh::NbTetras(SMDSAbs_ElementOrder order) const +smIdType SMESH_Mesh::NbTetras(SMDSAbs_ElementOrder order) const { - Unexpect aCatch(SalomeException); - return _myMeshDS->GetMeshInfo().NbTetras(order); + return _meshDS->GetMeshInfo().NbTetras(order); } //================================================================================ @@ -1878,10 +1909,9 @@ int SMESH_Mesh::NbTetras(SMDSAbs_ElementOrder order) const */ //================================================================================ -int SMESH_Mesh::NbHexas(SMDSAbs_ElementOrder order) const +smIdType SMESH_Mesh::NbHexas(SMDSAbs_ElementOrder order) const { - Unexpect aCatch(SalomeException); - return _myMeshDS->GetMeshInfo().NbHexas(order); + return _meshDS->GetMeshInfo().NbHexas(order); } //================================================================================ @@ -1890,10 +1920,9 @@ int SMESH_Mesh::NbHexas(SMDSAbs_ElementOrder order) const */ //================================================================================ -int SMESH_Mesh::NbTriQuadraticHexas() const +smIdType SMESH_Mesh::NbTriQuadraticHexas() const { - Unexpect aCatch(SalomeException); - return _myMeshDS->GetMeshInfo().NbTriQuadHexas(); + return _meshDS->GetMeshInfo().NbTriQuadHexas(); } //================================================================================ @@ -1902,10 +1931,9 @@ int SMESH_Mesh::NbTriQuadraticHexas() const */ //================================================================================ -int SMESH_Mesh::NbPyramids(SMDSAbs_ElementOrder order) const +smIdType SMESH_Mesh::NbPyramids(SMDSAbs_ElementOrder order) const { - Unexpect aCatch(SalomeException); - return _myMeshDS->GetMeshInfo().NbPyramids(order); + return _meshDS->GetMeshInfo().NbPyramids(order); } //================================================================================ @@ -1914,22 +1942,19 @@ int SMESH_Mesh::NbPyramids(SMDSAbs_ElementOrder order) const */ //================================================================================ -int SMESH_Mesh::NbPrisms(SMDSAbs_ElementOrder order) const +smIdType SMESH_Mesh::NbPrisms(SMDSAbs_ElementOrder order) const { - Unexpect aCatch(SalomeException); - return _myMeshDS->GetMeshInfo().NbPrisms(order); + return _meshDS->GetMeshInfo().NbPrisms(order); } -int SMESH_Mesh::NbQuadPrisms() const +smIdType SMESH_Mesh::NbQuadPrisms() const { - Unexpect aCatch(SalomeException); - return _myMeshDS->GetMeshInfo().NbQuadPrisms(); + return _meshDS->GetMeshInfo().NbQuadPrisms(); } -int SMESH_Mesh::NbBiQuadPrisms() const +smIdType SMESH_Mesh::NbBiQuadPrisms() const { - Unexpect aCatch(SalomeException); - return _myMeshDS->GetMeshInfo().NbBiQuadPrisms(); + return _meshDS->GetMeshInfo().NbBiQuadPrisms(); } @@ -1939,10 +1964,9 @@ int SMESH_Mesh::NbBiQuadPrisms() const */ //================================================================================ -int SMESH_Mesh::NbHexagonalPrisms() const +smIdType SMESH_Mesh::NbHexagonalPrisms() const { - Unexpect aCatch(SalomeException); - return _myMeshDS->GetMeshInfo().NbHexPrisms(); + return _meshDS->GetMeshInfo().NbHexPrisms(); } //================================================================================ @@ -1951,10 +1975,9 @@ int SMESH_Mesh::NbHexagonalPrisms() const */ //================================================================================ -int SMESH_Mesh::NbPolyhedrons() const +smIdType SMESH_Mesh::NbPolyhedrons() const { - Unexpect aCatch(SalomeException); - return _myMeshDS->GetMeshInfo().NbPolyhedrons(); + return _meshDS->GetMeshInfo().NbPolyhedrons(); } //================================================================================ @@ -1963,10 +1986,9 @@ int SMESH_Mesh::NbPolyhedrons() const */ //================================================================================ -int SMESH_Mesh::NbBalls() const +smIdType SMESH_Mesh::NbBalls() const { - Unexpect aCatch(SalomeException); - return _myMeshDS->GetMeshInfo().NbBalls(); + return _meshDS->GetMeshInfo().NbBalls(); } //================================================================================ @@ -1975,10 +1997,9 @@ int SMESH_Mesh::NbBalls() const */ //================================================================================ -int SMESH_Mesh::NbSubMesh() const +smIdType SMESH_Mesh::NbSubMesh() const { - Unexpect aCatch(SalomeException); - return _myMeshDS->NbSubMesh(); + return _meshDS->NbSubMesh(); } //================================================================================ @@ -1990,7 +2011,7 @@ int SMESH_Mesh::NbSubMesh() const int SMESH_Mesh::NbMeshes() const // nb meshes in the Study { - return _myDocument->NbMeshes(); + return _document->NbMeshes(); } //======================================================================= @@ -2000,20 +2021,20 @@ int SMESH_Mesh::NbMeshes() const // nb meshes in the Study bool SMESH_Mesh::IsNotConformAllowed() const { - if(MYDEBUG) MESSAGE("SMESH_Mesh::IsNotConformAllowed"); + MESSAGE("SMESH_Mesh::IsNotConformAllowed"); static SMESH_HypoFilter filter( SMESH_HypoFilter::HasName( "NotConformAllowed" )); - return GetHypothesis( _myMeshDS->ShapeToMesh(), filter, false ); + return GetHypothesis( _meshDS->ShapeToMesh(), filter, false ); } //======================================================================= //function : IsMainShape -//purpose : +//purpose : //======================================================================= bool SMESH_Mesh::IsMainShape(const TopoDS_Shape& theShape) const { - return theShape.IsSame(_myMeshDS->ShapeToMesh() ); + return theShape.IsSame(_meshDS->ShapeToMesh() ); } //======================================================================= @@ -2028,7 +2049,7 @@ TopoDS_Shape SMESH_Mesh::GetShapeByEntry(const std::string& entry) const //============================================================================= /*! - * + * */ //============================================================================= @@ -2088,7 +2109,7 @@ SMESH_Group* SMESH_Mesh::AddGroup (SMESHDS_GroupBase* groupDS) bool SMESH_Mesh::SynchronizeGroups() { const size_t nbGroups = _mapGroup.size(); - const std::set& groups = _myMeshDS->GetGroups(); + const std::set& groups = _meshDS->GetGroups(); std::set::const_iterator gIt = groups.begin(); for ( ; gIt != groups.end(); ++gIt ) { @@ -2142,7 +2163,7 @@ std::list SMESH_Mesh::GetGroupIds() const std::map::const_iterator it = _mapGroup.begin(); for ( ; it != _mapGroup.end(); it++ ) anIds.push_back( it->first ); - + return anIds; } @@ -2161,7 +2182,7 @@ void SMESH_Mesh::SetCallUp( TCallUp* upCaller ) //============================================================================= /*! - * + * */ //============================================================================= @@ -2215,13 +2236,13 @@ ostream& SMESH_Mesh::Dump(ostream& save) save << ++clause << ") Total number of " << orderStr << " edges:\t" << NbEdges(order) << endl; save << ++clause << ") Total number of " << orderStr << " faces:\t" << NbFaces(order) << endl; if ( NbFaces(order) > 0 ) { - int nb3 = NbTriangles(order); - int nb4 = NbQuadrangles(order); + smIdType nb3 = NbTriangles(order); + smIdType nb4 = NbQuadrangles(order); save << clause << ".1) Number of " << orderStr << " triangles: \t" << nb3 << endl; save << clause << ".2) Number of " << orderStr << " quadrangles:\t" << nb4 << endl; if ( nb3 + nb4 != NbFaces(order) ) { std::map myFaceMap; - SMDS_FaceIteratorPtr itFaces=_myMeshDS->facesIterator(); + SMDS_FaceIteratorPtr itFaces=_meshDS->facesIterator(); while( itFaces->more( ) ) { int nbNodes = itFaces->next()->NbNodes(); if ( myFaceMap.find( nbNodes ) == myFaceMap.end() ) @@ -2236,17 +2257,17 @@ ostream& SMESH_Mesh::Dump(ostream& save) } save << ++clause << ") Total number of " << orderStr << " volumes:\t" << NbVolumes(order) << endl; if ( NbVolumes(order) > 0 ) { - int nb8 = NbHexas(order); - int nb4 = NbTetras(order); - int nb5 = NbPyramids(order); - int nb6 = NbPrisms(order); + smIdType nb8 = NbHexas(order); + smIdType nb4 = NbTetras(order); + smIdType nb5 = NbPyramids(order); + smIdType nb6 = NbPrisms(order); save << clause << ".1) Number of " << orderStr << " hexahedrons: \t" << nb8 << endl; save << clause << ".2) Number of " << orderStr << " tetrahedrons:\t" << nb4 << endl; save << clause << ".3) Number of " << orderStr << " prisms: \t" << nb6 << endl; save << clause << ".4) Number of " << orderStr << " pyramids: \t" << nb5 << endl; if ( nb8 + nb4 + nb5 + nb6 != NbVolumes(order) ) { std::map myVolumesMap; - SMDS_VolumeIteratorPtr itVolumes=_myMeshDS->volumesIterator(); + SMDS_VolumeIteratorPtr itVolumes=_meshDS->volumesIterator(); while( itVolumes->more( ) ) { int nbNodes = itVolumes->next()->NbNodes(); if ( myVolumesMap.find( nbNodes ) == myVolumesMap.end() ) @@ -2270,9 +2291,9 @@ ostream& SMESH_Mesh::Dump(ostream& save) //purpose : Returns type of mesh element with certain id //======================================================================= -SMDSAbs_ElementType SMESH_Mesh::GetElementType( const int id, const bool iselem ) +SMDSAbs_ElementType SMESH_Mesh::GetElementType( const smIdType id, const bool iselem ) { - return _myMeshDS->GetElementType( id, iselem ); + return _meshDS->GetElementType( id, iselem ); } //============================================================================= @@ -2323,7 +2344,7 @@ SMESH_Group* SMESH_Mesh::ConvertToStandalone ( int theGroupID ) void SMESH_Mesh::ClearMeshOrder() { - _mySubMeshOrder.clear(); + _subMeshOrder.clear(); } //============================================================================= @@ -2334,7 +2355,7 @@ void SMESH_Mesh::ClearMeshOrder() void SMESH_Mesh::SetMeshOrder(const TListOfListOfInt& theOrder ) { - _mySubMeshOrder = theOrder; + _subMeshOrder = theOrder; } //============================================================================= @@ -2345,7 +2366,7 @@ void SMESH_Mesh::SetMeshOrder(const TListOfListOfInt& theOrder ) const TListOfListOfInt& SMESH_Mesh::GetMeshOrder() const { - return _mySubMeshOrder; + return _subMeshOrder; } //============================================================================= @@ -2406,7 +2427,7 @@ void SMESH_Mesh::fillAncestorsMap(const TopoDS_Shape& theShape) bool SMESH_Mesh::SortByMeshOrder(std::vector& theListToSort) const { - if ( _mySubMeshOrder.empty() || theListToSort.size() < 2 ) + if ( _subMeshOrder.empty() || theListToSort.size() < 2 ) return true; @@ -2417,9 +2438,9 @@ bool SMESH_Mesh::SortByMeshOrder(std::vector& theListToSort) con typedef std::vector::iterator TPosInList; std::map< size_t, size_t > sortedPos; // index in theListToSort to order TPosInList smBeg = theListToSort.begin(), smEnd = theListToSort.end(); - TListOfListOfInt::const_iterator listIdsIt = _mySubMeshOrder.begin(); + TListOfListOfInt::const_iterator listIdsIt = _subMeshOrder.begin(); bool needSort = false; - for( ; listIdsIt != _mySubMeshOrder.end(); listIdsIt++) + for( ; listIdsIt != _subMeshOrder.end(); listIdsIt++) { const TListOfInt& listOfId = *listIdsIt; // convert sm ids to sm's @@ -2497,8 +2518,8 @@ bool SMESH_Mesh::SortByMeshOrder(std::vector& theListToSort) con bool SMESH_Mesh::IsOrderOK( const SMESH_subMesh* smBefore, const SMESH_subMesh* smAfter ) const { - TListOfListOfInt::const_iterator listIdsIt = _mySubMeshOrder.begin(); - for( ; listIdsIt != _mySubMeshOrder.end(); listIdsIt++) + TListOfListOfInt::const_iterator listIdsIt = _subMeshOrder.begin(); + for( ; listIdsIt != _subMeshOrder.end(); listIdsIt++) { const TListOfInt& listOfId = *listIdsIt; int iB = -1, iA = -1, i = 0; @@ -2519,7 +2540,7 @@ bool SMESH_Mesh::IsOrderOK( const SMESH_subMesh* smBefore, } } return true; // no order imposed to given sub-meshes -} +} //============================================================================= /*!