Skip to content
Permalink
Browse files

fix build with Qwt6

  • Loading branch information
jef-n committed Jul 15, 2012
1 parent e35b115 commit ecaade201dcd16fbb52a35ce77625c054f42c51b
Showing with 10 additions and 2 deletions.
  1. +9 −1 src/app/qgsrasterlayerproperties.cpp
  2. +1 −1 src/app/qgsrasterlayerproperties.h
@@ -1523,7 +1523,11 @@ void QgsRasterLayerProperties::refreshHistogram()
if ( ! mHistoPicker )
{
mHistoPicker = new QwtPlotPicker( mpPlot->canvas() );
#if (QWT_VERSION>=0x060000)
mHistoPicker->setStateMachine(new QwtPickerDragPointMachine);
#else
mHistoPicker->setSelectionFlags( QwtPicker::PointSelection | QwtPicker::DragSelection );
#endif
// mHistoPicker->setTrackerMode( QwtPicker::ActiveOnly );
mHistoPicker->setTrackerMode( QwtPicker::AlwaysOff );
mHistoPicker->setRubberBand( QwtPicker::VLineRubberBand );
@@ -1535,7 +1539,11 @@ void QgsRasterLayerProperties::refreshHistogram()
if ( ! mHistoZoomer )
{
mHistoZoomer = new QwtPlotZoomer( mpPlot->canvas() );
#if (QWT_VERSION>=0x060000)
mHistoZoomer->setStateMachine(new QwtPickerDragRectMachine);
#else
mHistoZoomer->setSelectionFlags( QwtPicker::RectSelection | QwtPicker::DragSelection );
#endif
mHistoZoomer->setTrackerMode( QwtPicker::AlwaysOff );
mHistoZoomer->setEnabled( true );
}
@@ -2218,7 +2226,7 @@ QString findClosestTickVal( double target, QwtScaleDiv * scale, int div = 100 )
return QString::number( closest );
}

void QgsRasterLayerProperties::histoPickerSelected( const QwtDoublePoint & pos )
void QgsRasterLayerProperties::histoPickerSelected( const QPointF & pos )
{
if ( btnHistoMin->isChecked() )
{
@@ -114,7 +114,7 @@ class QgsRasterLayerProperties : public QDialog, private Ui::QgsRasterLayerPrope
void on_btnHistoMin_toggled();
void on_btnHistoMax_toggled();
/** Called when a selection has been made using the plot picker. */
void histoPickerSelected( const QwtDoublePoint & );
void histoPickerSelected( const QPointF & );
/** Various actions that are stored in btnHistoActions. */
void histoActionTriggered( QAction* );
/** Draw the min/max markers on the histogram plot. */

0 comments on commit ecaade2

Please sign in to comment.
You can’t perform that action at this time.