This commit is contained in:
eap 2009-11-03 11:04:33 +00:00
parent 52fc014796
commit 6d8d52cdc3

View File

@ -233,11 +233,11 @@ void StdMeshers_NumberOfSegments::SetTableFunction(const vector<double>& table)
#ifdef NO_CAS_CATCH
OCC_CATCH_SIGNALS;
#endif
val = pow( 10.0, val );
val = pow( 10.0, val );
} catch(Standard_Failure) {
Handle(Standard_Failure) aFail = Standard_Failure::Caught();
throw SALOME_Exception( LOCALIZED( "invalid value"));
return;
Handle(Standard_Failure) aFail = Standard_Failure::Caught();
throw SALOME_Exception( LOCALIZED( "invalid value"));
return;
}
}
else if( _convMode==1 && val<0.0 )
@ -303,7 +303,7 @@ bool isCorrectArg( const Handle( Expr_GeneralExpression )& expr )
if( !name.IsNull() )
{
if( name->GetName()!="t" )
res = false;
res = false;
}
else
res = isCorrectArg( sub );
@ -317,9 +317,9 @@ bool isCorrectArg( const Handle( Expr_GeneralExpression )& expr )
*/
//================================================================================
bool process( const TCollection_AsciiString& str, int convMode,
bool& syntax, bool& args,
bool& non_neg, bool& non_zero,
bool& singulars, double& sing_point )
bool& syntax, bool& args,
bool& non_neg, bool& non_zero,
bool& singulars, double& sing_point )
{
// Set "C" numeric locale to save numbers correctly
std::string aCurLocale = setlocale(LC_NUMERIC, 0);
@ -363,17 +363,17 @@ bool process( const TCollection_AsciiString& str, int convMode,
double t = double(i)/double(max), val;
if( !f.value( t, val ) )
{
sing_point = t;
singulars = true;
break;
sing_point = t;
singulars = true;
break;
}
if( val<0 )
{
non_neg = false;
break;
non_neg = false;
break;
}
if( val>PRECISION )
non_zero = true;
non_zero = true;
}
}