More updates for opencl

qgis · Aug 8, 2018 · 9068fe4 · 9068fe4
1 parent 7404263
commit 9068fe4
Show file tree

Hide file tree

Showing 13 changed files with 352 additions and 126 deletions.
diff --git a/python/analysis/auto_generated/raster/qgsaspectfilter.sip.in b/python/analysis/auto_generated/raster/qgsaspectfilter.sip.in
@@ -29,6 +29,9 @@ Calculates output value from nine input values. The input values and the output
 nodata value if not present or outside of the border. Must be implemented by subclasses*
 %End
 
+
+
+
 };
 
 /************************************************************************

diff --git a/python/analysis/auto_generated/raster/qgsninecellfilter.sip.in b/python/analysis/auto_generated/raster/qgsninecellfilter.sip.in
@@ -10,6 +10,7 @@
 
 
 
+
 class QgsNineCellFilter
 {
 %Docstring
@@ -34,7 +35,8 @@ Starts the calculation, reads from mInputFile and stores the result in mOutputFi
 
 :param feedback: feedback object that receives update and that is checked for cancelation.
 
-:return: 0 in case of success*
+:return: 0 in case of success
+TODO: return an enum
 %End
 
     double cellSizeX() const;

diff --git a/python/analysis/auto_generated/raster/qgsslopefilter.sip.in b/python/analysis/auto_generated/raster/qgsslopefilter.sip.in
@@ -28,6 +28,7 @@ Calculates slope values in a window of 3x3 cells based on first order derivative
 Calculates output value from nine input values. The input values and the output value can be equal to the
 nodata value if not present or outside of the border. Must be implemented by subclasses*
 %End
+
 };
 
 /************************************************************************

diff --git a/src/analysis/raster/qgsaspectfilter.h b/src/analysis/raster/qgsaspectfilter.h
@@ -36,6 +36,15 @@ class ANALYSIS_EXPORT QgsAspectFilter: public QgsDerivativeFilter
                                  float *x12, float *x22, float *x32,
                                  float *x13, float *x23, float *x33 ) override;
 
+
+
+
+    // QgsNineCellFilter interface
+  private:
+    const QString openClProgramBaseName() const override
+    {
+      return QStringLiteral( "aspect" );
+    }
 };
 
 #endif // QGSASPECTFILTER_H
diff --git a/src/analysis/raster/qgshillshadefilter.h b/src/analysis/raster/qgshillshadefilter.h
@@ -46,6 +46,7 @@ class ANALYSIS_EXPORT QgsHillshadeFilter: public QgsDerivativeFilter
   private:
     float mLightAzimuth;
     float mLightAngle;
+
 };
 
 #endif // QGSHILLSHADEFILTER_H