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
Update of CheckDone
[modules/smesh.git]
/
src
/
StdMeshersGUI
/
StdMeshersGUI_DistrPreview.cxx
diff --git
a/src/StdMeshersGUI/StdMeshersGUI_DistrPreview.cxx
b/src/StdMeshersGUI/StdMeshersGUI_DistrPreview.cxx
index a088780b3337f1cf300c65e1d06ca185324e0a2b..79e9d929a80e4e7441cd12237110df5dba6c2c2f 100644
(file)
--- a/
src/StdMeshersGUI/StdMeshersGUI_DistrPreview.cxx
+++ b/
src/StdMeshersGUI/StdMeshersGUI_DistrPreview.cxx
@@
-1,4
+1,4
@@
-// Copyright (C) 2007-202
0 CEA/DEN, EDF R&D
, OPEN CASCADE
+// Copyright (C) 2007-202
4 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
//
// Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@
-320,13
+320,8
@@
void StdMeshersGUI_DistrPreview::update()
setAxisScale( myDensity->xAxis(), min_x, max_x );
setAxisScale( myDensity->yAxis(),
setAxisScale( myDensity->xAxis(), min_x, max_x );
setAxisScale( myDensity->yAxis(),
-#ifdef WIN32
- min( 0.0, min_y ),
- max( 0.0, max_y )
-#else
std::min( 0.0, min_y ),
std::max( 0.0, max_y )
std::min( 0.0, min_y ),
std::max( 0.0, max_y )
-#endif
);
myDensity->setSamples( x, y, size );
if( x )
);
myDensity->setSamples( x, y, size );
if( x )
@@
-351,7
+346,7
@@
void StdMeshersGUI_DistrPreview::update()
try {
OCC_CATCH_SIGNALS;
replot();
try {
OCC_CATCH_SIGNALS;
replot();
- } catch(Standard_Failure) {
+ } catch(Standard_Failure
&
) {
}
}
}
}
@@
-397,7
+392,7
@@
bool StdMeshersGUI_DistrPreview::init( const QString& str )
OCC_CATCH_SIGNALS;
myExpr = ExprIntrp_GenExp::Create();
myExpr->Process( ( Standard_CString ) str.toLatin1().data() );
OCC_CATCH_SIGNALS;
myExpr = ExprIntrp_GenExp::Create();
myExpr->Process( ( Standard_CString ) str.toLatin1().data() );
- } catch(Standard_Failure) {
+ } catch(Standard_Failure
&
) {
parsed_ok = false;
}
parsed_ok = false;
}
@@
-435,7
+430,7
@@
double StdMeshersGUI_DistrPreview::calc( bool& ok )
try {
OCC_CATCH_SIGNALS;
res = myExpr->Expression()->Evaluate( myVars, myValues );
try {
OCC_CATCH_SIGNALS;
res = myExpr->Expression()->Evaluate( myVars, myValues );
- } catch(Standard_Failure) {
+ } catch(Standard_Failure
&
) {
ok = false;
res = 0.0;
}
ok = false;
res = 0.0;
}
@@
-462,7
+457,7
@@
bool StdMeshersGUI_DistrPreview::convert( double& v ) const
//
if(v < -7) v = -7.0;
v = pow( 10.0, v );
//
if(v < -7) v = -7.0;
v = pow( 10.0, v );
- } catch(Standard_Failure) {
+ } catch(Standard_Failure
&
) {
v = 0.0;
ok = false;
}
v = 0.0;
ok = false;
}