X-Git-Url: http://git.salome-platform.org/gitweb/?p=modules%2Fsmesh.git;a=blobdiff_plain;f=src%2FStdMeshersGUI%2FStdMeshersGUI_DistrPreview.cxx;h=f9ad75818d814768a43d5f10bc1aaee0134180e9;hp=4d9bd5111198fd8409b3ddc75145a0e6016ebc55;hb=70c33e5f83059e589c93b7818348e3c003eaec4d;hpb=bd4e115a78b52e3fbc016e5e30bb0e19b2a9e7d6 diff --git a/src/StdMeshersGUI/StdMeshersGUI_DistrPreview.cxx b/src/StdMeshersGUI/StdMeshersGUI_DistrPreview.cxx index 4d9bd5111..f9ad75818 100644 --- a/src/StdMeshersGUI/StdMeshersGUI_DistrPreview.cxx +++ b/src/StdMeshersGUI/StdMeshersGUI_DistrPreview.cxx @@ -1,4 +1,4 @@ -// Copyright (C) 2007-2012 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 @@ -6,7 +6,7 @@ // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public // License as published by the Free Software Foundation; either -// version 2.1 of the License. +// version 2.1 of the License, or (at your option) any later version. // // This library is distributed in the hope that it will be useful, // but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -37,15 +37,8 @@ #include #include -#if (OCC_VERSION_MAJOR << 16 | OCC_VERSION_MINOR << 8 | OCC_VERSION_MAINTENANCE) > 0x060100 -#define NO_CAS_CATCH -#endif - #include - -#ifdef NO_CAS_CATCH #include -#endif #ifdef WIN32 # include @@ -53,46 +46,77 @@ #include #include +// SALOME KERNEL includes #include +// SALOME GUI includes +#include + +Plot2d_QwtLegendLabel* getLegendLabel( QwtPlotCurve* plotCurve ) +{ + const QVariant itemInfo = plotCurve->plot()->itemToInfo( plotCurve ); + QwtLegend* legend = dynamic_cast( plotCurve->plot()->legend() ); + QWidget* widget = legend->legendWidget( itemInfo ); + QwtLegendLabel* label = dynamic_cast( 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( 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); @@ -109,7 +133,7 @@ StdMeshersGUI_DistrPreview::StdMeshersGUI_DistrPreview( QWidget* p, StdMeshers:: myDistr->setTitle( tr( "SMESH_DISTR" ) ); QwtPlotGrid* aGrid = new QwtPlotGrid(); - QPen aMajPen = aGrid->majPen(); + QPen aMajPen = aGrid->majorPen(); aMajPen.setStyle( Qt::DashLine ); aGrid->setPen( aMajPen ); @@ -262,7 +286,7 @@ void StdMeshersGUI_DistrPreview::update() 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= HUGE_VAL) y[i] = HUGE_VAL/100.; #else - if ( isinf(y[i])) + if ( std::isinf(y[i])) y[i] = std::numeric_limits::max()/100.; #endif // if ( y[i] > 1e3 ) @@ -304,7 +328,7 @@ void StdMeshersGUI_DistrPreview::update() std::max( 0.0, max_y ) #endif ); - myDensity->setData( x, y, size ); + myDensity->setSamples( x, y, size ); if( x ) delete[] x; if( y ) @@ -319,18 +343,15 @@ void StdMeshersGUI_DistrPreview::update() 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(); } } @@ -338,8 +359,8 @@ void StdMeshersGUI_DistrPreview::showError() { 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 ); @@ -373,13 +394,10 @@ bool StdMeshersGUI_DistrPreview::init( const QString& str ) 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; } @@ -415,12 +433,9 @@ double StdMeshersGUI_DistrPreview::calc( bool& ok ) 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; } @@ -441,16 +456,13 @@ bool StdMeshersGUI_DistrPreview::convert( double& v ) const 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; }