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
Some fixes to compile against ParaView master.
[modules/smesh.git]
/
src
/
StdMeshersGUI
/
StdMeshersGUI_DistrPreview.cxx
diff --git
a/src/StdMeshersGUI/StdMeshersGUI_DistrPreview.cxx
b/src/StdMeshersGUI/StdMeshersGUI_DistrPreview.cxx
index 0d567e4fb232d2e74af3458a136ca8d5cd6547f5..a2c8dbff32448d9cc419fe74c923808b06759559 100644
(file)
--- a/
src/StdMeshersGUI/StdMeshersGUI_DistrPreview.cxx
+++ b/
src/StdMeshersGUI/StdMeshersGUI_DistrPreview.cxx
@@
-1,4
+1,4
@@
-// Copyright (C) 2007-20
15
CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-20
22
CEA/DEN, EDF R&D, 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
@@
-37,15
+37,8
@@
#include <Expr_NamedUnknown.hxx>
#include <Expr_GeneralExpression.hxx>
#include <Expr_NamedUnknown.hxx>
#include <Expr_GeneralExpression.hxx>
-#if (OCC_VERSION_MAJOR << 16 | OCC_VERSION_MINOR << 8 | OCC_VERSION_MAINTENANCE) > 0x060100
-#define NO_CAS_CATCH
-#endif
-
#include <Standard_Failure.hxx>
#include <Standard_Failure.hxx>
-
-#ifdef NO_CAS_CATCH
#include <Standard_ErrorHandler.hxx>
#include <Standard_ErrorHandler.hxx>
-#endif
#ifdef WIN32
# include <algorithm>
#ifdef WIN32
# include <algorithm>
@@
-64,19
+57,19
@@
Plot2d_QwtLegendLabel* getLegendLabel( QwtPlotCurve* plotCurve )
QwtLegend* legend = dynamic_cast<QwtLegend*>( plotCurve->plot()->legend() );
QWidget* widget = legend->legendWidget( itemInfo );
QwtLegendLabel* label = dynamic_cast<QwtLegendLabel*>( widget );
QwtLegend* legend = dynamic_cast<QwtLegend*>( plotCurve->plot()->legend() );
QWidget* widget = legend->legendWidget( itemInfo );
QwtLegendLabel* label = dynamic_cast<QwtLegendLabel*>( widget );
- if( Plot2d_QwtLegendLabel* anItem = (Plot2d_QwtLegendLabel*)label )
-
return anItem;
+ Plot2d_QwtLegendLabel* anItem = (Plot2d_QwtLegendLabel*)label;
+ return anItem;
}
StdMeshersGUI_DistrPreview::StdMeshersGUI_DistrPreview( QWidget* p, StdMeshers::StdMeshers_NumberOfSegments_ptr h )
}
StdMeshersGUI_DistrPreview::StdMeshersGUI_DistrPreview( QWidget* p, StdMeshers::StdMeshers_NumberOfSegments_ptr h )
-: QwtPlot( p ),
- myPoints( 50 ),
-
myIsTable( false
),
-
myVars( 1, 1
),
-
myValues( 1, 1
),
-
myConv( CUT_NEGATIVE
),
-
myIsDone( true
),
-
myNbSeg( 1
)
+
: QwtPlot( p ),
+
myPoints( 50 ),
+
myNbSeg( 1
),
+
myIsTable( false
),
+
myConv( CUT_NEGATIVE
),
+
myVars( 1, 1
),
+
myValues( 1, 1
),
+
myIsDone( true
)
{
Kernel_Utils::Localizer loc;
myHypo = StdMeshers::StdMeshers_NumberOfSegments::_duplicate( h );
{
Kernel_Utils::Localizer loc;
myHypo = StdMeshers::StdMeshers_NumberOfSegments::_duplicate( h );
@@
-293,7
+286,7
@@
void StdMeshersGUI_DistrPreview::update()
int size = graph.length()/2;
double* x = new double[size], *y = new double[size];
int size = graph.length()/2;
double* x = new double[size], *y = new double[size];
- double min_x
, max_x, min_y, max_y
;
+ double min_x
= 0, max_x = 0, min_y = 0, max_y = 0
;
for( int i=0; i<size; i++ )
{
x[i] = graph[2*i];
for( int i=0; i<size; i++ )
{
x[i] = graph[2*i];
@@
-310,7
+303,7
@@
void StdMeshersGUI_DistrPreview::update()
if ( std::fabs(y[i]) >= HUGE_VAL)
y[i] = HUGE_VAL/100.;
#else
if ( std::fabs(y[i]) >= HUGE_VAL)
y[i] = HUGE_VAL/100.;
#else
- if ( isinf(y[i]))
+ if (
std::
isinf(y[i]))
y[i] = std::numeric_limits<double>::max()/100.;
#endif
// if ( y[i] > 1e3 )
y[i] = std::numeric_limits<double>::max()/100.;
#endif
// if ( y[i] > 1e3 )
@@
-327,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 )
@@
-356,12
+344,9
@@
void StdMeshersGUI_DistrPreview::update()
x = y = 0;
try {
x = y = 0;
try {
-#ifdef NO_CAS_CATCH
OCC_CATCH_SIGNALS;
OCC_CATCH_SIGNALS;
-#endif
replot();
replot();
- } catch(Standard_Failure) {
- Handle(Standard_Failure) aFail = Standard_Failure::Caught();
+ } catch(Standard_Failure&) {
}
}
}
}
@@
-404,13
+389,10
@@
bool StdMeshersGUI_DistrPreview::init( const QString& str )
Kernel_Utils::Localizer loc;
bool parsed_ok = true;
try {
Kernel_Utils::Localizer loc;
bool parsed_ok = true;
try {
-#ifdef NO_CAS_CATCH
OCC_CATCH_SIGNALS;
OCC_CATCH_SIGNALS;
-#endif
myExpr = ExprIntrp_GenExp::Create();
myExpr->Process( ( Standard_CString ) str.toLatin1().data() );
myExpr = ExprIntrp_GenExp::Create();
myExpr->Process( ( Standard_CString ) str.toLatin1().data() );
- } catch(Standard_Failure) {
- Handle(Standard_Failure) aFail = Standard_Failure::Caught();
+ } catch(Standard_Failure&) {
parsed_ok = false;
}
parsed_ok = false;
}
@@
-446,12
+428,9
@@
double StdMeshersGUI_DistrPreview::calc( bool& ok )
ok = true;
try {
ok = true;
try {
-#ifdef NO_CAS_CATCH
OCC_CATCH_SIGNALS;
OCC_CATCH_SIGNALS;
-#endif
res = myExpr->Expression()->Evaluate( myVars, myValues );
res = myExpr->Expression()->Evaluate( myVars, myValues );
- } catch(Standard_Failure) {
- Handle(Standard_Failure) aFail = Standard_Failure::Caught();
+ } catch(Standard_Failure&) {
ok = false;
res = 0.0;
}
ok = false;
res = 0.0;
}
@@
-472,16
+451,13
@@
bool StdMeshersGUI_DistrPreview::convert( double& v ) const
case EXPONENT:
{
try {
case EXPONENT:
{
try {
-#ifdef NO_CAS_CATCH
OCC_CATCH_SIGNALS;
OCC_CATCH_SIGNALS;
-#endif
// in StdMeshers_NumberOfSegments.cc
// const double PRECISION = 1e-7;
//
if(v < -7) v = -7.0;
v = pow( 10.0, v );
// in StdMeshers_NumberOfSegments.cc
// const double PRECISION = 1e-7;
//
if(v < -7) v = -7.0;
v = pow( 10.0, v );
- } catch(Standard_Failure) {
- Handle(Standard_Failure) aFail = Standard_Failure::Caught();
+ } catch(Standard_Failure&) {
v = 0.0;
ok = false;
}
v = 0.0;
ok = false;
}