fixes ticket #832 Raster cell coount returns incorrect value

timlinux · timlinux · commit d082db630c8d · 2007-11-23T16:02:02.000Z
Added regression test to raster layer unit test git-svn-id: http://svn.osgeo.org/qgis/trunk@7650 c8812cc2-4d05-0410-92ff-de0c093fc19c
diff --git a/src/core/raster/qgsrasterlayer.cpp b/src/core/raster/qgsrasterlayer.cpp
@@ -2945,6 +2945,7 @@ const QgsRasterBandStats QgsRasterLayer::getRasterBandStats(int theBandNoInt)
             myFirstIterationFlag = false;
             myRasterBandStats.minValDouble = myDouble;
             myRasterBandStats.maxValDouble = myDouble;
+            ++myRasterBandStats.elementCountInt;
           }               //end of true part for first iteration check
           else
           {
diff --git a/tests/src/core/testqgsrasterlayer.cpp b/tests/src/core/testqgsrasterlayer.cpp
@@ -24,6 +24,7 @@
 
 //qgis includes...
 #include <qgsrasterlayer.h> 
+#include <qgsrasterbandstats.h> 
 #include <qgsapplication.h>
 
 /** \ingroup UnitTests
@@ -39,7 +40,7 @@ class TestQgsRasterLayer: public QObject
     void cleanup(){};// will be called after every testfunction.
 
     void isValid();
-    
+    void checkDimensions(); 
   private:
     QgsRasterLayer * mpLayer;
 };
@@ -71,6 +72,14 @@ void TestQgsRasterLayer::isValid()
 {
   QVERIFY ( mpLayer->isValid() );
 }
+void TestQgsRasterLayer::checkDimensions()
+{
+   QVERIFY ( mpLayer->getRasterXDim() == 10 );
+   QVERIFY ( mpLayer->getRasterYDim() == 10 );
+   // regression check for ticket #832
+   // note getRasterBandStats call is base 1
+   QVERIFY ( mpLayer->getRasterBandStats(1).elementCountInt == 100 );
+}
 
 QTEST_MAIN(TestQgsRasterLayer)
 #include "moc_testqgsrasterlayer.cxx"

Original file line number	Diff line number	Diff line change
`@@ -2945,6 +2945,7 @@ const QgsRasterBandStats QgsRasterLayer::getRasterBandStats(int theBandNoInt)`
`2945`	`2945`	`myFirstIterationFlag = false;`
`2946`	`2946`	`myRasterBandStats.minValDouble = myDouble;`
`2947`	`2947`	`myRasterBandStats.maxValDouble = myDouble;`
	`2948`	`+ ++myRasterBandStats.elementCountInt;`
`2948`	`2949`	`} //end of true part for first iteration check`
`2949`	`2950`	`else`
`2950`	`2951`	`{`