Salome HOME
projects
/
modules
/
smesh.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Join modifications from branch OCC_development_for_3_2_0a2
[modules/smesh.git]
/
src
/
StdMeshers
/
StdMeshers_Distribution.cxx
diff --git
a/src/StdMeshers/StdMeshers_Distribution.cxx
b/src/StdMeshers/StdMeshers_Distribution.cxx
index 93858296b6bce1a77ea6492b0a75843bc5ae4d6b..1223fc009e716220152d1c577951231b3729f23d 100644
(file)
--- a/
src/StdMeshers/StdMeshers_Distribution.cxx
+++ b/
src/StdMeshers/StdMeshers_Distribution.cxx
@@
-27,10
+27,8
@@
// $Header$
#include "StdMeshers_Distribution.hxx"
// $Header$
#include "StdMeshers_Distribution.hxx"
-#include <CASCatch_CatchSignals.hxx>
-#include <CASCatch_Failure.hxx>
-#include <CASCatch_ErrorHandler.hxx>
-#include <OSD.hxx>
+#include "CASCatch.hxx"
+
#include <math_GaussSingleIntegration.hxx>
#include <utilities.h>
#include <math_GaussSingleIntegration.hxx>
#include <utilities.h>
@@
-45,9
+43,6
@@
Function::~Function()
bool Function::value( const double, double& f ) const
{
bool Function::value( const double, double& f ) const
{
- CASCatch_CatchSignals aCatchSignals;
- aCatchSignals.Activate();
-
bool ok = true;
if( myConv==0 )
{
bool ok = true;
if( myConv==0 )
{
@@
-55,10
+50,9
@@
bool Function::value( const double, double& f ) const
{
f = pow( 10, f );
}
{
f = pow( 10, f );
}
- CASCatch_CATCH(
CASCatch
_Failure)
+ CASCatch_CATCH(
Standard
_Failure)
{
{
- aCatchSignals.Deactivate();
- Handle(CASCatch_Failure) aFail = CASCatch_Failure::Caught();
+ Handle(Standard_Failure) aFail = Standard_Failure::Caught();
f = 0.0;
ok = false;
}
f = 0.0;
ok = false;
}
@@
-174,22
+168,17
@@
FunctionExpr::FunctionExpr( const char* str, const int conv )
myVars( 1, 1 ),
myValues( 1, 1 )
{
myVars( 1, 1 ),
myValues( 1, 1 )
{
- CASCatch_CatchSignals aCatchSignals;
- aCatchSignals.Activate();
-
bool ok = true;
CASCatch_TRY
{
myExpr = ExprIntrp_GenExp::Create();
myExpr->Process( ( Standard_CString )str );
}
bool ok = true;
CASCatch_TRY
{
myExpr = ExprIntrp_GenExp::Create();
myExpr->Process( ( Standard_CString )str );
}
- CASCatch_CATCH(
CASCatch
_Failure)
+ CASCatch_CATCH(
Standard
_Failure)
{
{
- aCatchSignals.Deactivate();
- Handle(CASCatch_Failure) aFail = CASCatch_Failure::Caught();
+ Handle(Standard_Failure) aFail = Standard_Failure::Caught();
ok = false;
}
ok = false;
}
- aCatchSignals.Deactivate();
if( !ok || !myExpr->IsDone() )
myExpr.Nullify();
if( !ok || !myExpr->IsDone() )
myExpr.Nullify();
@@
-214,23
+203,17
@@
bool FunctionExpr::value( const double t, double& f ) const
if( myExpr.IsNull() )
return false;
if( myExpr.IsNull() )
return false;
- OSD::SetSignal( true );
- CASCatch_CatchSignals aCatchSignals;
- aCatchSignals.Activate();
-
( ( TColStd_Array1OfReal& )myValues ).ChangeValue( 1 ) = t;
bool ok = true;
CASCatch_TRY {
f = myExpr->Expression()->Evaluate( myVars, myValues );
}
( ( TColStd_Array1OfReal& )myValues ).ChangeValue( 1 ) = t;
bool ok = true;
CASCatch_TRY {
f = myExpr->Expression()->Evaluate( myVars, myValues );
}
- CASCatch_CATCH(CASCatch_Failure) {
- aCatchSignals.Deactivate();
- Handle(CASCatch_Failure) aFail = CASCatch_Failure::Caught();
+ CASCatch_CATCH(Standard_Failure) {
+ Handle(Standard_Failure) aFail = Standard_Failure::Caught();
f = 0.0;
ok = false;
}
f = 0.0;
ok = false;
}
- aCatchSignals.Deactivate();
ok = Function::value( t, f ) && ok;
return ok;
}
ok = Function::value( t, f ) && ok;
return ok;
}
@@
-244,7
+227,7
@@
double FunctionExpr::integral( const double a, const double b ) const
if( _int.IsDone() )
res = _int.Value();
}
if( _int.IsDone() )
res = _int.Value();
}
- CASCatch_CATCH(
CASCatch
_Failure)
+ CASCatch_CATCH(
Standard
_Failure)
{
res = 0.0;
MESSAGE( "Exception in integral calculating" );
{
res = 0.0;
MESSAGE( "Exception in integral calculating" );