-// Copyright (C) 2007-2014 CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2016 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
#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>
-
-#ifdef NO_CAS_CATCH
#include <Standard_ErrorHandler.hxx>
-#endif
#ifdef WIN32
# include <algorithm>
#include <math.h>
#include <limits>
+// SALOME KERNEL includes
#include <Basics_Utils.hxx>
+// SALOME GUI includes
+#include <Plot2d_PlotItems.h>
+
+Plot2d_QwtLegendLabel* getLegendLabel( QwtPlotCurve* plotCurve )
+{
+ const QVariant itemInfo = plotCurve->plot()->itemToInfo( plotCurve );
+ QwtLegend* legend = dynamic_cast<QwtLegend*>( plotCurve->plot()->legend() );
+ QWidget* widget = legend->legendWidget( itemInfo );
+ QwtLegendLabel* label = dynamic_cast<QwtLegendLabel*>( widget );
+ Plot2d_QwtLegendLabel* anItem = (Plot2d_QwtLegendLabel*)label;
+ return anItem;
+}
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 );
myVars.ChangeValue( 1 ) = new Expr_NamedUnknown( "t" );
+
+ QwtAbstractLegend* absLegend = legend();
+ QwtLegend* legend = 0;
+ if ( !absLegend ) {
+ legend = new Plot2d_QwtLegend( this );
+ legend->setFrameStyle( QFrame::Box | QFrame::Sunken );
+ }
+ else
+ legend = dynamic_cast<QwtLegend*>( absLegend );
+ if( legend )
+ insertLegend( legend, QwtPlot::BottomLegend );
+
myDensity = new QwtPlotCurve( QString() );
myDensity->attach( this );
+ QPen densityPen = QPen( Qt::red, 1 );
+ myDensity->setPen( QPen( Qt::red, 1 ) );
+ if( Plot2d_QwtLegendLabel* anItem = getLegendLabel( myDensity ) ) {
+ anItem->setPen( densityPen );
+ anItem->repaint();
+ }
+
myDistr = new QwtPlotCurve( QString() );
myDistr->attach( this );
+ QPen distrPen = QPen( Qt::blue, 1 );
+ QwtSymbol* distrSymbol = new QwtSymbol( QwtSymbol::XCross, QBrush( Qt::blue ),
+ QPen( Qt::blue ), QSize( 5, 5 ) );
+ myDistr->setPen( distrPen );
+ myDistr->setSymbol( distrSymbol );
+ if( Plot2d_QwtLegendLabel* anItem = getLegendLabel( myDistr ) ) {
+ anItem->setPen( distrPen );
+ anItem->setSymbol( distrSymbol );
+ anItem->repaint();
+ }
+
myMsg = new QwtPlotMarker();
myMsg->attach( this );
myMsg->setValue( 0.5, 0.5 );
QwtText mt = myMsg->label();
- mt.setBackgroundPen( QPen( Qt::red, 1 ) );
+ mt.setBorderPen( QPen( Qt::red, 1 ) );
QFont f = mt.font();
f.setPointSize( 14 ); //f.setBold( true );
mt.setFont( f );
myMsg->setLabel( mt );
- myDensity->setPen( QPen( Qt::red, 1 ) );
-
- QColor dc = Qt::blue;
- myDistr->setPen( QPen( dc, 1 ) );
- myDistr->setSymbol( QwtSymbol( QwtSymbol::XCross, QBrush( dc ), QPen( dc ), QSize( 5, 5 ) ) );
-
- QwtLegend* l = legend();
- if ( !l ) {
- l = new QwtLegend( this );
- l->setFrameStyle( QFrame::Box | QFrame::Sunken );
- }
- insertLegend( l, QwtPlot::BottomLegend );
enableAxis(QwtPlot::yLeft, false);
enableAxis(QwtPlot::yRight, true);
myDistr->setTitle( tr( "SMESH_DISTR" ) );
QwtPlotGrid* aGrid = new QwtPlotGrid();
- QPen aMajPen = aGrid->majPen();
+ QPen aMajPen = aGrid->majorPen();
aMajPen.setStyle( Qt::DashLine );
aGrid->setPen( aMajPen );
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];
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 )
std::max( 0.0, max_y )
#endif
);
- myDensity->setData( x, y, size );
+ myDensity->setSamples( x, y, size );
if( x )
delete[] x;
if( y )
x[i] = distr[i];
y[i] = 0;
}
- myDistr->setData( x, y, size );
+ myDistr->setSamples( x, y, size );
delete[] x;
delete[] y;
x = y = 0;
try {
-#ifdef NO_CAS_CATCH
OCC_CATCH_SIGNALS;
-#endif
replot();
} catch(Standard_Failure) {
- Handle(Standard_Failure) aFail = Standard_Failure::Caught();
}
}
{
setAxisScale( myDensity->xAxis(), 0.0, 1.0 );
setAxisScale( myDensity->yAxis(), 0.0, 1.0 );
- myDensity->setData( 0, 0, 0 );
- myDistr->setData( 0, 0, 0 );
+ myDensity->setSamples( 0, 0, 0 );
+ myDistr->setSamples( 0, 0, 0 );
QwtText mt = myMsg->label();
mt.setText( tr( "SMESH_INVALID_FUNCTION" ) );
myMsg->setLabel( mt );
Kernel_Utils::Localizer loc;
bool parsed_ok = true;
try {
-#ifdef NO_CAS_CATCH
OCC_CATCH_SIGNALS;
-#endif
myExpr = ExprIntrp_GenExp::Create();
myExpr->Process( ( Standard_CString ) str.toLatin1().data() );
} catch(Standard_Failure) {
- Handle(Standard_Failure) aFail = Standard_Failure::Caught();
parsed_ok = false;
}
ok = true;
try {
-#ifdef NO_CAS_CATCH
OCC_CATCH_SIGNALS;
-#endif
res = myExpr->Expression()->Evaluate( myVars, myValues );
} catch(Standard_Failure) {
- Handle(Standard_Failure) aFail = Standard_Failure::Caught();
ok = false;
res = 0.0;
}
case EXPONENT:
{
try {
-#ifdef NO_CAS_CATCH
OCC_CATCH_SIGNALS;
-#endif
// 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();
v = 0.0;
ok = false;
}
