Skip to content

Commit 74062aa

Browse files
author
mhugent
committed
Moved non-gui related raster terrain classes to analysis branch
git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@11558 c8812cc2-4d05-0410-92ff-de0c093fc19c
1 parent 8d16b0b commit 74062aa

14 files changed

+12
-11
lines changed

src/analysis/CMakeLists.txt

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,12 @@ SET(QGIS_ANALYSIS_SRCS
1818
interpolation/TriangleInterpolator.cc
1919
interpolation/Triangulation.cc
2020
interpolation/Vector3D.cc
21+
raster/qgsninecellfilter.cpp
22+
raster/qgsruggednessfilter.cpp
23+
raster/qgsderivativefilter.cpp
24+
raster/qgsslopefilter.cpp
25+
raster/qgsaspectfilter.cpp
26+
raster/qgstotalcurvaturefilter.cpp
2127
vector/qgsgeometryanalyzer.cpp
2228
)
2329

src/plugins/raster_terrain_analysis/qgsaspectfilter.cpp renamed to src/analysis/raster/qgsaspectfilter.cpp

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -29,22 +29,22 @@ QgsAspectFilter::~QgsAspectFilter()
2929
}
3030

3131
float QgsAspectFilter::processNineCellWindow(
32-
float* x11, float* x21, float* x31,
33-
float* x12, float* x22, float* x32,
34-
float* x13, float* x23, float* x33 )
32+
float* x11, float* x21, float* x31,
33+
float* x12, float* x22, float* x32,
34+
float* x13, float* x23, float* x33 )
3535
{
3636
float derX = calcFirstDerX( x11, x21, x31, x12, x22, x32, x13, x23, x33 );
3737
float derY = calcFirstDerY( x11, x21, x31, x12, x22, x32, x13, x23, x33 );
3838

3939
if ( derX == mOutputNodataValue ||
4040
derY == mOutputNodataValue ||
41-
(derX == 0.0 && derY == 0.0) )
41+
( derX == 0.0 && derY == 0.0 ) )
4242
{
4343
return mOutputNodataValue;
4444
}
4545
else
4646
{
47-
return 180.0 + atan2(derX, derY) * 180.0 / M_PI;
47+
return 180.0 + atan2( derX, derY ) * 180.0 / M_PI;
4848
}
4949
}
5050

0 commit comments

Comments
 (0)