[raster] re-compute min/max when band(s) changed (#3923)

qgis · Dec 30, 2016 · 46a69df · 46a69df
1 parent 882878b
commit 46a69df
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 2 deletions.
diff --git a/src/gui/raster/qgsrasterminmaxwidget.cpp b/src/gui/raster/qgsrasterminmaxwidget.cpp
@@ -34,6 +34,7 @@ QgsRasterMinMaxWidget::QgsRasterMinMaxWidget( QgsRasterLayer* theLayer, QWidget
     , mLayer( theLayer )
     , mCanvas( nullptr )
     , mLastRectangleValid( false )
+    , mBandsChanged( false )
 {
   QgsDebugMsg( "Entered." );
   setupUi( this );
@@ -56,6 +57,12 @@ QgsMapCanvas* QgsRasterMinMaxWidget::mapCanvas()
   return mCanvas;
 }
 
+void QgsRasterMinMaxWidget::setBands( const QList<int> & theBands )
+{
+  mBandsChanged = theBands != mBands;
+  mBands = theBands;
+}
+
 QgsRectangle QgsRasterMinMaxWidget::extent()
 {
   const int nExtentIdx = mStatisticsExtentCombo->currentIndex();
@@ -178,7 +185,8 @@ void QgsRasterMinMaxWidget::doComputations()
 
   QgsRasterMinMaxOrigin newMinMaxOrigin = minMaxOrigin();
   if ( mLastRectangleValid && mLastRectangle == myExtent &&
-       mLastMinMaxOrigin == newMinMaxOrigin )
+       mLastMinMaxOrigin == newMinMaxOrigin &&
+       !mBandsChanged )
   {
     QgsDebugMsg( "Does not need to redo statistics computations" );
     return;
@@ -187,6 +195,7 @@ void QgsRasterMinMaxWidget::doComputations()
   mLastRectangleValid = true;
   mLastRectangle = myExtent;
   mLastMinMaxOrigin = newMinMaxOrigin;
+  mBandsChanged = false;
 
   Q_FOREACH ( int myBand, mBands )
   {

diff --git a/src/gui/raster/qgsrasterminmaxwidget.h b/src/gui/raster/qgsrasterminmaxwidget.h
@@ -61,7 +61,7 @@ class GUI_EXPORT QgsRasterMinMaxWidget: public QWidget, private Ui::QgsRasterMin
      */
     QgsMapCanvas* mapCanvas();
 
-    void setBands( const QList<int> & theBands ) { mBands = theBands; }
+    void setBands( const QList<int> & theBands );
 
     /** Return the extent selected by the user.
      * Either an empty extent for 'full' or the current visible extent.
@@ -125,6 +125,8 @@ class GUI_EXPORT QgsRasterMinMaxWidget: public QWidget, private Ui::QgsRasterMin
     bool mLastRectangleValid;
     QgsRectangle mLastRectangle;
     QgsRasterMinMaxOrigin mLastMinMaxOrigin;
+
+    bool mBandsChanged;
 };
 
 #endif // QGSRASTERMINMAXWIDGET_H