[analysis] fix derivative filter z factor handling

nirvn · nirvn · commit 05071434e3ae · 2017-08-25T17:15:26.000+07:00
diff --git a/src/analysis/raster/qgsderivativefilter.cpp b/src/analysis/raster/qgsderivativefilter.cpp
@@ -87,7 +87,7 @@ float QgsDerivativeFilter::calcFirstDerX( float *x11, float *x21, float *x31, fl
     return mOutputNodataValue;
   }
 
-  return sum / ( weight * mCellSizeX * mZFactor );
+  return sum / ( weight * mCellSizeX ) * mZFactor;
 }
 
 float QgsDerivativeFilter::calcFirstDerY( float *x11, float *x21, float *x31, float *x12, float *x22, float *x32, float *x13, float *x23, float *x33 )
@@ -154,7 +154,7 @@ float QgsDerivativeFilter::calcFirstDerY( float *x11, float *x21, float *x31, fl
     return mOutputNodataValue;
   }
 
-  return sum / ( weight * mCellSizeY * mZFactor );
+  return sum / ( weight * mCellSizeY ) * mZFactor;
 }
 
 

Original file line number	Diff line number	Diff line change
`@@ -87,7 +87,7 @@ float QgsDerivativeFilter::calcFirstDerX( float x11, float x21, float *x31, fl`
`87`	`87`	`return mOutputNodataValue;`
`88`	`88`	`}`
`89`	`89`
`90`		`- return sum / ( weight * mCellSizeX * mZFactor );`
	`90`	`+ return sum / ( weight * mCellSizeX ) * mZFactor;`
`91`	`91`	`}`
`92`	`92`
`93`	`93`	`float QgsDerivativeFilter::calcFirstDerY( float x11, float x21, float x31, float x12, float x22, float x32, float x13, float x23, float *x33 )`
`@@ -154,7 +154,7 @@ float QgsDerivativeFilter::calcFirstDerY( float x11, float x21, float *x31, fl`
`154`	`154`	`return mOutputNodataValue;`
`155`	`155`	`}`
`156`	`156`
`157`		`- return sum / ( weight * mCellSizeY * mZFactor );`
	`157`	`+ return sum / ( weight * mCellSizeY ) * mZFactor;`
`158`	`158`	`}`
`159`	`159`
`160`	`160`