qgis · Sep 5, 2009
diff --git a/‎src/analysis/CMakeLists.txt
Lines changed: 6 additions & 0 deletions b/‎src/analysis/CMakeLists.txt
Lines changed: 6 additions & 0 deletions
diff --git a/‎src/plugins/raster_terrain_analysis/qgsaspectfilter.cpp renamed to ‎src/analysis/raster/qgsaspectfilter.cpp
Lines changed: 5 additions & 5 deletions b/‎src/plugins/raster_terrain_analysis/qgsaspectfilter.cpp renamed to ‎src/analysis/raster/qgsaspectfilter.cpp
Lines changed: 5 additions & 5 deletions
diff --git a/‎src/plugins/raster_terrain_analysis/qgsaspectfilter.h renamed to ‎src/analysis/raster/qgsaspectfilter.h b/‎src/plugins/raster_terrain_analysis/qgsaspectfilter.h renamed to ‎src/analysis/raster/qgsaspectfilter.h
diff --git a/‎src/plugins/raster_terrain_analysis/qgsderivativefilter.cpp renamed to ‎src/analysis/raster/qgsderivativefilter.cpp b/‎src/plugins/raster_terrain_analysis/qgsderivativefilter.cpp renamed to ‎src/analysis/raster/qgsderivativefilter.cpp
diff --git a/‎src/plugins/raster_terrain_analysis/qgsderivativefilter.h renamed to ‎src/analysis/raster/qgsderivativefilter.h b/‎src/plugins/raster_terrain_analysis/qgsderivativefilter.h renamed to ‎src/analysis/raster/qgsderivativefilter.h
diff --git a/‎src/plugins/raster_terrain_analysis/qgsninecellfilter.cpp renamed to ‎src/analysis/raster/qgsninecellfilter.cpp b/‎src/plugins/raster_terrain_analysis/qgsninecellfilter.cpp renamed to ‎src/analysis/raster/qgsninecellfilter.cpp
diff --git a/‎src/plugins/raster_terrain_analysis/qgsninecellfilter.h renamed to ‎src/analysis/raster/qgsninecellfilter.h b/‎src/plugins/raster_terrain_analysis/qgsninecellfilter.h renamed to ‎src/analysis/raster/qgsninecellfilter.h
diff --git a/‎src/plugins/raster_terrain_analysis/qgsruggednessfilter.cpp renamed to ‎src/analysis/raster/qgsruggednessfilter.cpp b/‎src/plugins/raster_terrain_analysis/qgsruggednessfilter.cpp renamed to ‎src/analysis/raster/qgsruggednessfilter.cpp
diff --git a/‎src/plugins/raster_terrain_analysis/qgsruggednessfilter.h renamed to ‎src/analysis/raster/qgsruggednessfilter.h b/‎src/plugins/raster_terrain_analysis/qgsruggednessfilter.h renamed to ‎src/analysis/raster/qgsruggednessfilter.h
diff --git a/‎src/plugins/raster_terrain_analysis/qgsslopefilter.cpp renamed to ‎src/analysis/raster/qgsslopefilter.cpp b/‎src/plugins/raster_terrain_analysis/qgsslopefilter.cpp renamed to ‎src/analysis/raster/qgsslopefilter.cpp
diff --git a/‎src/plugins/raster_terrain_analysis/qgsslopefilter.h renamed to ‎src/analysis/raster/qgsslopefilter.h b/‎src/plugins/raster_terrain_analysis/qgsslopefilter.h renamed to ‎src/analysis/raster/qgsslopefilter.h
diff --git a/‎src/plugins/raster_terrain_analysis/qgstotalcurvaturefilter.cpp renamed to ‎src/analysis/raster/qgstotalcurvaturefilter.cpp b/‎src/plugins/raster_terrain_analysis/qgstotalcurvaturefilter.cpp renamed to ‎src/analysis/raster/qgstotalcurvaturefilter.cpp
diff --git a/‎src/plugins/raster_terrain_analysis/qgstotalcurvaturefilter.h renamed to ‎src/analysis/raster/qgstotalcurvaturefilter.h b/‎src/plugins/raster_terrain_analysis/qgstotalcurvaturefilter.h renamed to ‎src/analysis/raster/qgstotalcurvaturefilter.h
diff --git a/‎src/plugins/raster_terrain_analysis/CMakeLists.txt
Lines changed: 1 addition & 6 deletions b/‎src/plugins/raster_terrain_analysis/CMakeLists.txt
Lines changed: 1 addition & 6 deletions
@@ -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
 )
 
 
@@ -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;
   }
 }
 
@@ -3,12 +3,6 @@
 
 SET (RASTER_TERRAIN_SRCS
      qgsrasterterrainanalysisplugin.cpp
-     qgsninecellfilter.cpp
-     qgsruggednessfilter.cpp
-     qgsderivativefilter.cpp
-     qgsslopefilter.cpp
-     qgsaspectfilter.cpp
-     qgstotalcurvaturefilter.cpp
      qgsrasterterrainanalysisdialog.cpp
 )
 
@@ -48,6 +42,7 @@ INCLUDE_DIRECTORIES(
 )
 
 TARGET_LINK_LIBRARIES(rasterterrainplugin
+  qgis_analysis
   qgis_core
   qgis_gui
 )
Original file line number	Diff line number	Diff line change
`@@ -29,22 +29,22 @@ QgsAspectFilter::~QgsAspectFilter()`
`29`	`29`	`}`
`30`	`30`
`31`	`31`	`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 )`
`35`	`35`	`{`
`36`	`36`	`float derX = calcFirstDerX( x11, x21, x31, x12, x22, x32, x13, x23, x33 );`
`37`	`37`	`float derY = calcFirstDerY( x11, x21, x31, x12, x22, x32, x13, x23, x33 );`
`38`	`38`
`39`	`39`	`if ( derX == mOutputNodataValue \|\|`
`40`	`40`	`derY == mOutputNodataValue \|\|`
`41`		`- (derX == 0.0 && derY == 0.0) )`
	`41`	`+ ( derX == 0.0 && derY == 0.0 ) )`
`42`	`42`	`{`
`43`	`43`	`return mOutputNodataValue;`
`44`	`44`	`}`
`45`	`45`	`else`
`46`	`46`	`{`
`47`		`- return 180.0 + atan2(derX, derY) * 180.0 / M_PI;`
	`47`	`+ return 180.0 + atan2( derX, derY ) * 180.0 / M_PI;`
`48`	`48`	`}`
`49`	`49`	`}`
`50`	`50`
Original file line number	Diff line number	Diff line change
`@@ -3,12 +3,6 @@`
`3`	`3`
`4`	`4`	`SET (RASTER_TERRAIN_SRCS`
`5`	`5`	`qgsrasterterrainanalysisplugin.cpp`
`6`		`- qgsninecellfilter.cpp`
`7`		`- qgsruggednessfilter.cpp`
`8`		`- qgsderivativefilter.cpp`
`9`		`- qgsslopefilter.cpp`
`10`		`- qgsaspectfilter.cpp`
`11`		`- qgstotalcurvaturefilter.cpp`
`12`	`6`	`qgsrasterterrainanalysisdialog.cpp`
`13`	`7`	`)`
`14`	`8`
`@@ -48,6 +42,7 @@ INCLUDE_DIRECTORIES(`
`48`	`42`	`)`
`49`	`43`
`50`	`44`	`TARGET_LINK_LIBRARIES(rasterterrainplugin`
	`45`	`+ qgis_analysis`
`51`	`46`	`qgis_core`
`52`	`47`	`qgis_gui`
`53`	`48`	`)`