ForkMaster/smesh
1
0
Fork 0
mirror of https://git.salome-platform.org/gitpub/modules/smesh.git synced 2025-03-01 08:35:38 +05:00
Code Issues Packages Projects Releases Wiki Activity

Use SMESH_TryCatch.hxx

Browse Source
This commit is contained in:
eap 2012-12-17 14:14:18 +00:00
parent 2b6536d33b
commit 7abb1c93b4
1 changed files with 13 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
src/SMESH_I/SMESH_PreMeshInfo.cxx
View File

@ -47,30 +47,15 @@
#include <SALOMEDS_Tool.hxx> #include <SALOMEDS_Tool.hxx>
#include <SALOMEDS_wrap.hxx> #include <SALOMEDS_wrap.hxx>
#include <Standard_ErrorHandler.hxx>
#include <Standard_Failure.hxx>
#include <TopoDS_Iterator.hxx> #include <TopoDS_Iterator.hxx>
#include <TopoDS_Shape.hxx> #include <TopoDS_Shape.hxx>
#include "SMESH_TryCatch.hxx"
#include CORBA_SERVER_HEADER(SALOME_Session) #include CORBA_SERVER_HEADER(SALOME_Session)
#define MYDEBUGOUT(msg) //std::cout << msg << std::endl;
//================================================================================ #define MYDEBUGOUT(msg) //std::cout << msg << std::endl;
#define PreMeshInfo_TRY \
try { OCC_CATCH_SIGNALS
//================================================================================
#define PreMeshInfo_CATCH } \
catch (Standard_Failure& ex) { \
onExceptionCaught(SMESH_Comment("OCC Exception caught: \t")<<ex.GetMessageString()); \
} \
catch ( const std::exception& ex) { \
onExceptionCaught(SMESH_Comment("Exception caught: \t")<<ex.what()); \
} \
catch (...) { \
onExceptionCaught("Unknown Exception caught"); \
}
//================================================================================
namespace namespace
{ {
@ -116,18 +101,6 @@ namespace
} }
} }
//================================================================================
/*!
* \brief Method useful only to set a breakpoint to debug in case of exception
*/
//================================================================================
void onExceptionCaught(const string& msg)
{
INFOS( msg );
MYDEBUGOUT( msg );
}
//============================================================================= //=============================================================================
/*! /*!
* \brief Class sending signals on start and finish of loading * \brief Class sending signals on start and finish of loading
@ -432,7 +405,7 @@ void SMESH_PreMeshInfo::LoadFromFile( SMESH_Mesh_i* mesh,
const std::string& hdfFile, const std::string& hdfFile,
const bool toRemoveFiles) const bool toRemoveFiles)
{ {
PreMeshInfo_TRY; SMESH_TRY;
SMESH_PreMeshInfo* meshPreInfo = new SMESH_PreMeshInfo( mesh,meshID,medFile,hdfFile ); SMESH_PreMeshInfo* meshPreInfo = new SMESH_PreMeshInfo( mesh,meshID,medFile,hdfFile );
mesh->changePreMeshInfo() = meshPreInfo; mesh->changePreMeshInfo() = meshPreInfo;
@ -456,7 +429,7 @@ void SMESH_PreMeshInfo::LoadFromFile( SMESH_Mesh_i* mesh,
{ {
meshPreInfo->FullLoadFromFile(); meshPreInfo->FullLoadFromFile();
} }
PreMeshInfo_CATCH; SMESH_CATCH( SMESH::doNothing );
} }
//================================================================================ //================================================================================
@ -799,7 +772,7 @@ void SMESH_PreMeshInfo::SaveToFile( SMESH_Mesh_i* mesh,
HDFgroup* infoHdfGroup = new HDFgroup( hdfGroupName, hdfFile ); HDFgroup* infoHdfGroup = new HDFgroup( hdfGroupName, hdfFile );
infoHdfGroup->CreateOnDisk(); infoHdfGroup->CreateOnDisk();
PreMeshInfo_TRY; SMESH_TRY;
// info of mesh // info of mesh
meshInfo2hdf( mesh->GetMeshInfo(), "Mesh", infoHdfGroup ); meshInfo2hdf( mesh->GetMeshInfo(), "Mesh", infoHdfGroup );
@ -842,7 +815,7 @@ void SMESH_PreMeshInfo::SaveToFile( SMESH_Mesh_i* mesh,
} }
} }
PreMeshInfo_CATCH; SMESH_CATCH( SMESH::doNothing );
infoHdfGroup->CloseOnDisk(); infoHdfGroup->CloseOnDisk();
} }
@ -863,7 +836,7 @@ void SMESH_PreMeshInfo::FullLoadFromFile() const
::SMESH_Mesh& mesh = _mesh->GetImpl(); ::SMESH_Mesh& mesh = _mesh->GetImpl();
SMESHDS_Mesh* meshDS = mesh.GetMeshDS(); SMESHDS_Mesh* meshDS = mesh.GetMeshDS();
PreMeshInfo_TRY; SMESH_TRY;
MYDEBUGOUT( "BEG FullLoadFromFile() " << _meshID ); MYDEBUGOUT( "BEG FullLoadFromFile() " << _meshID );
@ -884,7 +857,7 @@ void SMESH_PreMeshInfo::FullLoadFromFile() const
// load sub-meshes // load sub-meshes
readSubMeshes( &myReader ); readSubMeshes( &myReader );
PreMeshInfo_CATCH; SMESH_CATCH( SMESH::doNothing );
_mesh->changePreMeshInfo() = meshInfo; _mesh->changePreMeshInfo() = meshInfo;
@ -1147,7 +1120,7 @@ void SMESH_PreMeshInfo::readSubMeshes(DriverMED_R_SMESHDS_Mesh* reader) const
void SMESH_PreMeshInfo::ForgetAllData() const void SMESH_PreMeshInfo::ForgetAllData() const
{ {
PreMeshInfo_TRY; SMESH_TRY;
if ( _mesh->changePreMeshInfo() != this ) if ( _mesh->changePreMeshInfo() != this )
return _mesh->changePreMeshInfo()->ForgetAllData(); return _mesh->changePreMeshInfo()->ForgetAllData();
@ -1179,12 +1152,12 @@ void SMESH_PreMeshInfo::ForgetAllData() const
_mesh->changePreMeshInfo() = NULL; _mesh->changePreMeshInfo() = NULL;
delete this; delete this;
PreMeshInfo_CATCH; SMESH_CATCH( SMESH::doNothing );
// Finalize loading // Finalize loading
// PreMeshInfo_TRY; // SMESH_TRY;
// ::SMESH_Mesh& mesh = _mesh->GetImpl(); // ::SMESH_Mesh& mesh = _mesh->GetImpl();
@ -1195,7 +1168,7 @@ void SMESH_PreMeshInfo::ForgetAllData() const
// // hyp->UpdateAsMeshesRestored(); // // hyp->UpdateAsMeshesRestored();
// PreMeshInfo_CATCH; // SMESH_CATCH( SMESH::doNothing );
} }
//================================================================================ //================================================================================