From: nds Date: Tue, 19 Jun 2007 06:49:13 +0000 (+0000) Subject: Porting to qwt-5.0.1 and qt-4.2.3 products. X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=9911c24cf0d98781936a46e86a7cc37e6de90090;p=modules%2Fgui.git Porting to qwt-5.0.1 and qt-4.2.3 products. --- diff --git a/src/Plot2d/Plot2d_ViewFrame.cxx b/src/Plot2d/Plot2d_ViewFrame.cxx index 630f72e87..de03ad90a 100755 --- a/src/Plot2d/Plot2d_ViewFrame.cxx +++ b/src/Plot2d/Plot2d_ViewFrame.cxx @@ -209,7 +209,7 @@ Plot2d_ViewFrame::Plot2d_ViewFrame( QWidget* parent, const QString& title ) QwtScaleMap yMap2 = myPlot->canvasMap( QwtPlot::yRight ); myYDistance2 = yMap2.s2() - yMap2.s1(); } - qApp->installEventFilter( this ); + myPlot->canvas()->installEventFilter( this ); } /*! Destructor @@ -311,7 +311,6 @@ bool Plot2d_ViewFrame::eventFilter( QObject* watched, QEvent* e ) QMouseEvent m( QEvent::MouseButtonPress, me->pos(), me->button(), me->buttons(), me->modifiers() ); plotMousePressed( m ); - //return true; } break; } @@ -321,7 +320,6 @@ bool Plot2d_ViewFrame::eventFilter( QObject* watched, QEvent* e ) QMouseEvent m( QEvent::MouseButtonRelease, me->pos(), me->button(), me->buttons(), me->modifiers() ); plotMouseReleased( m ); - //return true; } break; } @@ -1694,7 +1692,6 @@ Plot2d_Plot2d::Plot2d_Plot2d( QWidget* parent ) : QwtPlot( parent ), myIsPolished( false ) { - myPlotZoomer = new Plot2d_QwtPlotZoomer( QwtPlot::xBottom, QwtPlot::yLeft, canvas() ); myPlotZoomer->setSelectionFlags( QwtPicker::DragSelection | QwtPicker::CornerToCorner ); myPlotZoomer->setTrackerMode( QwtPicker::AlwaysOff ); @@ -1722,7 +1719,7 @@ Plot2d_Plot2d::Plot2d_Plot2d( QWidget* parent ) myGrid->attach( this ); setMouseTracking( false ); - canvas()->setMouseTracking( false ); + canvas()->setMouseTracking( true ); myPlotZoomer->setEnabled( true ); }