sharpetronics/QGIS
1
0
Fork 0
mirror of https://github.com/qgis/QGIS.git synced 2025-02-27 00:33:48 -05:00
Code Issues Packages Projects Releases Wiki Activity

Update raster histogram widget to use feedback object

Browse Source
This commit is contained in:
Nyall Dawson 2017-04-02 12:22:59 +10:00
parent e8ef91ce98
commit 3d5a039062
1 changed files with 17 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
src/gui/raster/qgsrasterhistogramwidget.cpp
View File

@ -110,8 +110,8 @@ QgsRasterHistogramWidget::QgsRasterHistogramWidget( QgsRasterLayer *lyr, QWidget
// connect( leHistoMax, SIGNAL( textChanged( const QString & ) ), this, SLOT( updateHistoMarkers() ) ); // connect( leHistoMax, SIGNAL( textChanged( const QString & ) ), this, SLOT( updateHistoMarkers() ) );
// connect( leHistoMin, SIGNAL( textChanged( const QString & ) ), this, SLOT( applyHistoMin() ) ); // connect( leHistoMin, SIGNAL( textChanged( const QString & ) ), this, SLOT( applyHistoMin() ) );
// connect( leHistoMax, SIGNAL( textChanged( const QString & ) ), this, SLOT( applyHistoMax() ) ); // connect( leHistoMax, SIGNAL( textChanged( const QString & ) ), this, SLOT( applyHistoMax() ) );
connect( leHistoMin, SIGNAL( editingFinished() ), this, SLOT( applyHistoMin() ) ); connect( leHistoMin, &QLineEdit::editingFinished, this, &QgsRasterHistogramWidget::applyHistoMin );
connect( leHistoMax, SIGNAL( editingFinished() ), this, SLOT( applyHistoMax() ) ); connect( leHistoMax, &QLineEdit::editingFinished, this, &QgsRasterHistogramWidget::applyHistoMax );
// histo actions // histo actions
// TODO move/add options to qgis options dialog // TODO move/add options to qgis options dialog
@ -124,7 +124,7 @@ QgsRasterHistogramWidget::QgsRasterHistogramWidget( QgsRasterLayer *lyr, QWidget
// min/max options // min/max options
group = new QActionGroup( this ); group = new QActionGroup( this );
group->setExclusive( false ); group->setExclusive( false );
connect( group, SIGNAL( triggered( QAction * ) ), this, SLOT( histoActionTriggered( QAction * ) ) ); connect( group, &QActionGroup::triggered, this, &QgsRasterHistogramWidget::histoActionTriggered );
action = new QAction( tr( "Min/Max options" ), group ); action = new QAction( tr( "Min/Max options" ), group );
action->setSeparator( true ); action->setSeparator( true );
menu->addAction( action ); menu->addAction( action );
@ -147,13 +147,13 @@ QgsRasterHistogramWidget::QgsRasterHistogramWidget( QgsRasterLayer *lyr, QWidget
// visibility options // visibility options
group = new QActionGroup( this ); group = new QActionGroup( this );
group->setExclusive( false ); group->setExclusive( false );
connect( group, SIGNAL( triggered( QAction * ) ), this, SLOT( histoActionTriggered( QAction * ) ) ); connect( group, &QActionGroup::triggered, this, &QgsRasterHistogramWidget::histoActionTriggered );
action = new QAction( tr( "Visibility" ), group ); action = new QAction( tr( "Visibility" ), group );
action->setSeparator( true ); action->setSeparator( true );
menu->addAction( action ); menu->addAction( action );
group = new QActionGroup( this ); group = new QActionGroup( this );
group->setExclusive( true ); // these options are exclusive group->setExclusive( true ); // these options are exclusive
connect( group, SIGNAL( triggered( QAction * ) ), this, SLOT( histoActionTriggered( QAction * ) ) ); connect( group, &QActionGroup::triggered, this, &QgsRasterHistogramWidget::histoActionTriggered );
action = new QAction( tr( "Show all bands" ), group ); action = new QAction( tr( "Show all bands" ), group );
action->setData( QVariant( "Show all" ) ); action->setData( QVariant( "Show all" ) );
action->setCheckable( true ); action->setCheckable( true );
@ -173,7 +173,7 @@ QgsRasterHistogramWidget::QgsRasterHistogramWidget( QgsRasterLayer *lyr, QWidget
// display options // display options
group = new QActionGroup( this ); group = new QActionGroup( this );
group->setExclusive( false ); group->setExclusive( false );
connect( group, SIGNAL( triggered( QAction * ) ), this, SLOT( histoActionTriggered( QAction * ) ) ); connect( group, &QActionGroup::triggered, this, &QgsRasterHistogramWidget::histoActionTriggered );
action = new QAction( tr( "Display" ), group ); action = new QAction( tr( "Display" ), group );
action->setSeparator( true ); action->setSeparator( true );
menu->addAction( action ); menu->addAction( action );
@ -201,7 +201,7 @@ QgsRasterHistogramWidget::QgsRasterHistogramWidget( QgsRasterLayer *lyr, QWidget
// load actions // load actions
group = new QActionGroup( this ); group = new QActionGroup( this );
group->setExclusive( false ); group->setExclusive( false );
connect( group, SIGNAL( triggered( QAction * ) ), this, SLOT( histoActionTriggered( QAction * ) ) ); connect( group, &QActionGroup::triggered, this, &QgsRasterHistogramWidget::histoActionTriggered );
action = new QAction( tr( "Reset" ), group ); action = new QAction( tr( "Reset" ), group );
action->setData( QVariant( "Load reset" ) ); action->setData( QVariant( "Load reset" ) );
menu->addAction( action ); menu->addAction( action );
@ -303,7 +303,9 @@ bool QgsRasterHistogramWidget::computeHistogram( bool forceComputeFlag )
// compute histogram // compute histogram
stackedWidget2->setCurrentIndex( 1 ); stackedWidget2->setCurrentIndex( 1 );
connect( mRasterLayer, SIGNAL( progressUpdate( int ) ), mHistogramProgress, SLOT( setValue( int ) ) );
std::unique_ptr< QgsRasterBlockFeedback > feedback( new QgsRasterBlockFeedback() );
connect( feedback.get(), &QgsRasterBlockFeedback::progressChanged, mHistogramProgress, &QProgressBar::setValue );
QApplication::setOverrideCursor( Qt::WaitCursor ); QApplication::setOverrideCursor( Qt::WaitCursor );
for ( int myIteratorInt = 1; for ( int myIteratorInt = 1;
@ -311,10 +313,9 @@ bool QgsRasterHistogramWidget::computeHistogram( bool forceComputeFlag )
++myIteratorInt ) ++myIteratorInt )
{ {
int sampleSize = 250000; // number of sample cells int sampleSize = 250000; // number of sample cells
mRasterLayer->dataProvider()->histogram( myIteratorInt, 0, std::numeric_limits<double>::quiet_NaN(), std::numeric_limits<double>::quiet_NaN(), QgsRectangle(), sampleSize ); mRasterLayer->dataProvider()->histogram( myIteratorInt, 0, std::numeric_limits<double>::quiet_NaN(), std::numeric_limits<double>::quiet_NaN(), QgsRectangle(), sampleSize, false, feedback.get() );
} }
disconnect( mRasterLayer, SIGNAL( progressUpdate( int ) ), mHistogramProgress, SLOT( setValue( int ) ) );
// mHistogramProgress->hide(); // mHistogramProgress->hide();
stackedWidget2->setCurrentIndex( 0 ); stackedWidget2->setCurrentIndex( 0 );
QApplication::restoreOverrideCursor(); QApplication::restoreOverrideCursor();
@ -478,7 +479,11 @@ void QgsRasterHistogramWidget::refreshHistogram()
} }
int sampleSize = 250000; // number of sample cells int sampleSize = 250000; // number of sample cells
QgsRasterHistogram myHistogram = mRasterLayer->dataProvider()->histogram( myIteratorInt, 0, std::numeric_limits<double>::quiet_NaN(), std::numeric_limits<double>::quiet_NaN(), QgsRectangle(), sampleSize );
std::unique_ptr< QgsRasterBlockFeedback > feedback( new QgsRasterBlockFeedback() );
connect( feedback.get(), &QgsRasterBlockFeedback::progressChanged, mHistogramProgress, &QProgressBar::setValue );
QgsRasterHistogram myHistogram = mRasterLayer->dataProvider()->histogram( myIteratorInt, 0, std::numeric_limits<double>::quiet_NaN(), std::numeric_limits<double>::quiet_NaN(), QgsRectangle(), sampleSize, false, feedback.get() );
QgsDebugMsg( QString( "got raster histo for band %1 : min=%2 max=%3 count=%4" ).arg( myIteratorInt ).arg( myHistogram.minimum ).arg( myHistogram.maximum ).arg( myHistogram.binCount ) ); QgsDebugMsg( QString( "got raster histo for band %1 : min=%2 max=%3 count=%4" ).arg( myIteratorInt ).arg( myHistogram.minimum ).arg( myHistogram.maximum ).arg( myHistogram.binCount ) );
@ -638,7 +643,7 @@ void QgsRasterHistogramWidget::refreshHistogram()
mHistoPicker->setRubberBand( QwtPicker::VLineRubberBand ); mHistoPicker->setRubberBand( QwtPicker::VLineRubberBand );
#if defined(QWT_VERSION) && QWT_VERSION>=0x060000 #if defined(QWT_VERSION) && QWT_VERSION>=0x060000
mHistoPicker->setStateMachine( new QwtPickerDragPointMachine ); mHistoPicker->setStateMachine( new QwtPickerDragPointMachine );
connect( mHistoPicker, SIGNAL( selected( const QPointF & ) ), this, SLOT( histoPickerSelected( const QPointF & ) ) ); connect( mHistoPicker, static_cast < void ( QwtPlotPicker::* )( const QPointF & ) > ( &QwtPlotPicker::selected ), this, &QgsRasterHistogramWidget::histoPickerSelected );
#else #else
mHistoPicker->setSelectionFlags( QwtPicker::PointSelection | QwtPicker::DragSelection ); mHistoPicker->setSelectionFlags( QwtPicker::PointSelection | QwtPicker::DragSelection );
connect( mHistoPicker, SIGNAL( selected( const QwtDoublePoint & ) ), this, SLOT( histoPickerSelectedQwt5( const QwtDoublePoint & ) ) ); connect( mHistoPicker, SIGNAL( selected( const QwtDoublePoint & ) ), this, SLOT( histoPickerSelectedQwt5( const QwtDoublePoint & ) ) );
@ -668,7 +673,6 @@ void QgsRasterHistogramWidget::refreshHistogram()
mHistoZoomer->setEnabled( false ); mHistoZoomer->setEnabled( false );
} }
disconnect( mRasterLayer, SIGNAL( progressUpdate( int ) ), mHistogramProgress, SLOT( setValue( int ) ) );
stackedWidget2->setCurrentIndex( 0 ); stackedWidget2->setCurrentIndex( 0 );
// icon from http://findicons.com/icon/169577/14_zoom?id=171427 // icon from http://findicons.com/icon/169577/14_zoom?id=171427
mpPlot->canvas()->setCursor( QCursor( QgsApplication::getThemePixmap( QStringLiteral( "/mIconZoom.svg" ) ) ) ); mpPlot->canvas()->setCursor( QCursor( QgsApplication::getThemePixmap( QStringLiteral( "/mIconZoom.svg" ) ) ) );