Skip to content

Commit

Permalink
Moved non-gui related raster terrain classes to analysis branch
Browse files Browse the repository at this point in the history
git-svn-id: http://svn.osgeo.org/qgis/trunk@11558 c8812cc2-4d05-0410-92ff-de0c093fc19c
  • Loading branch information
mhugent committed Sep 5, 2009
1 parent 1bf9bfb commit 6cbe63e
Show file tree
Hide file tree
Showing 14 changed files with 12 additions and 11 deletions.
6 changes: 6 additions & 0 deletions src/analysis/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,12 @@ SET(QGIS_ANALYSIS_SRCS
interpolation/TriangleInterpolator.cc
interpolation/Triangulation.cc
interpolation/Vector3D.cc
raster/qgsninecellfilter.cpp
raster/qgsruggednessfilter.cpp
raster/qgsderivativefilter.cpp
raster/qgsslopefilter.cpp
raster/qgsaspectfilter.cpp
raster/qgstotalcurvaturefilter.cpp
vector/qgsgeometryanalyzer.cpp
)

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,22 +29,22 @@ QgsAspectFilter::~QgsAspectFilter()
}

float QgsAspectFilter::processNineCellWindow(
float* x11, float* x21, float* x31,
float* x12, float* x22, float* x32,
float* x13, float* x23, float* x33 )
float* x11, float* x21, float* x31,
float* x12, float* x22, float* x32,
float* x13, float* x23, float* x33 )
{
float derX = calcFirstDerX( x11, x21, x31, x12, x22, x32, x13, x23, x33 );
float derY = calcFirstDerY( x11, x21, x31, x12, x22, x32, x13, x23, x33 );

if ( derX == mOutputNodataValue ||
derY == mOutputNodataValue ||
(derX == 0.0 && derY == 0.0) )
( derX == 0.0 && derY == 0.0 ) )
{
return mOutputNodataValue;
}
else
{
return 180.0 + atan2(derX, derY) * 180.0 / M_PI;
return 180.0 + atan2( derX, derY ) * 180.0 / M_PI;
}
}

File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
7 changes: 1 addition & 6 deletions src/plugins/raster_terrain_analysis/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,6 @@

SET (RASTER_TERRAIN_SRCS
qgsrasterterrainanalysisplugin.cpp
qgsninecellfilter.cpp
qgsruggednessfilter.cpp
qgsderivativefilter.cpp
qgsslopefilter.cpp
qgsaspectfilter.cpp
qgstotalcurvaturefilter.cpp
qgsrasterterrainanalysisdialog.cpp
)

Expand Down Expand Up @@ -48,6 +42,7 @@ INCLUDE_DIRECTORIES(
)

TARGET_LINK_LIBRARIES(rasterterrainplugin
qgis_analysis
qgis_core
qgis_gui
)
Expand Down

0 comments on commit 6cbe63e

Please sign in to comment.