Merge pull request #9516 from qgis/backport-9422-on-release-3_6

Backport #9422 on release-3_6
qgis · Mar 14, 2019 · 568eeb4 · 568eeb4
2 parents ca508a2 + a2b4c21
commit 568eeb4
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 4 deletions.
diff --git a/src/analysis/raster/qgsrastercalculator.cpp b/src/analysis/raster/qgsrastercalculator.cpp
@@ -636,9 +636,18 @@ QVector<QgsRasterCalculatorEntry> QgsRasterCalculatorEntry::rasterEntries()
         // Safety belt
         if ( !( entry.raster && ref.raster ) )
           continue;
-        // Check if a layer with the same data source was already added to the list
+        // Check if is another band of the same raster
         if ( ref.raster->publicSource() == entry.raster->publicSource() )
-          return false;
+        {
+          if ( ref.bandNumber != entry.bandNumber )
+          {
+            continue;
+          }
+          else // a layer with the same data source was already added to the list
+          {
+            return false;
+          }
+        }
         // If same name but different source
         if ( ref.ref == entry.ref )
         {
@@ -664,7 +673,7 @@ QVector<QgsRasterCalculatorEntry> QgsRasterCalculatorEntry::rasterEntries()
         entry.raster = rlayer;
         entry.bandNumber = i + 1;
         if ( ! uniqueRasterBandIdentifier( entry ) )
-          continue;
+          break;
         availableEntries.push_back( entry );
       }
     }

diff --git a/tests/src/analysis/testqgsrastercalculator.cpp b/tests/src/analysis/testqgsrastercalculator.cpp
@@ -583,7 +583,10 @@ void TestQgsRasterCalculator::testRasterEntries()
   }
   QStringList keys( entryMap.keys() );
   keys.sort();
-  QCOMPARE( keys.join( ',' ), QStringLiteral( "dem@1,dem_1@1,landsat@1,landsat_4326@1,slope2@1" ) );
+  QCOMPARE( keys.join( ',' ), QStringLiteral( "dem@1,dem_1@1,landsat@1,landsat@2,landsat@3,landsat@4,"
+            "landsat@5,landsat@6,landsat@7,landsat@8,landsat@9,"
+            "landsat_4326@1,landsat_4326@2,landsat_4326@3,landsat_4326@4,"
+            "landsat_4326@5,landsat_4326@6,landsat_4326@7,landsat_4326@8,landsat_4326@9,slope2@1" ) );
 }
 
 void TestQgsRasterCalculator::errors( )