don't consider nan vertices for interpolation

mhugent · mhugent · commit bc0826af42da · 2009-02-27T09:10:16.000Z
git-svn-id: http://svn.osgeo.org/qgis/trunk@10243 c8812cc2-4d05-0410-92ff-de0c093fc19c
diff --git a/src/plugins/interpolation/qgsinterpolator.cpp b/src/plugins/interpolation/qgsinterpolator.cpp
@@ -18,6 +18,7 @@
 #include "qgsinterpolator.h"
 #include "qgsvectordataprovider.h"
 #include "qgsgeometry.h"
+#include <cmath>
 
 QgsInterpolator::QgsInterpolator( const QList<QgsVectorLayer*>& vlayers ): mDataIsCached( false ), mVectorLayers( vlayers ), zCoordInterpolation( false ), mValueAttribute( -1 )
 {
@@ -89,7 +90,7 @@ int QgsInterpolator::cacheBaseData()
           return 3;
         }
         attributeValue = att_it.value().toDouble(&attributeConversionOk);
-        if(!attributeConversionOk) //don't consider vertices with attributes like 'nan' for the interpolation
+        if(!attributeConversionOk || isnan(attributeValue)) //don't consider vertices with attributes like 'nan' for the interpolation
         {
           continue;
         }

Original file line number	Diff line number	Diff line change
`@@ -18,6 +18,7 @@`
`18`	`18`	`#include "qgsinterpolator.h"`
`19`	`19`	`#include "qgsvectordataprovider.h"`
`20`	`20`	`#include "qgsgeometry.h"`
	`21`	`+#include <cmath>`
`21`	`22`
`22`	`23`	`QgsInterpolator::QgsInterpolator( const QList<QgsVectorLayer*>& vlayers ): mDataIsCached( false ), mVectorLayers( vlayers ), zCoordInterpolation( false ), mValueAttribute( -1 )`
`23`	`24`	`{`
`@@ -89,7 +90,7 @@ int QgsInterpolator::cacheBaseData()`
`89`	`90`	`return 3;`
`90`	`91`	`}`
`91`	`92`	`attributeValue = att_it.value().toDouble(&attributeConversionOk);`
`92`		`- if(!attributeConversionOk) //don't consider vertices with attributes like 'nan' for the interpolation`
	`93`	`+ if(!attributeConversionOk \|\| isnan(attributeValue)) //don't consider vertices with attributes like 'nan' for the interpolation`
`93`	`94`	`{`
`94`	`95`	`continue;`
`95`	`96`	`}`