Merge pull request #8611 from elpaso/backport-3_4-2

Backports to 3.4
qgis · Dec 6, 2018 · d9d4bd2 · d9d4bd2
2 parents 4d5b195 + 4fd305c
commit d9d4bd2
Show file tree

Hide file tree

Showing 15 changed files with 521 additions and 136 deletions.
diff --git a/python/analysis/auto_generated/raster/qgsrastercalcnode.sip.in b/python/analysis/auto_generated/raster/qgsrastercalcnode.sip.in
@@ -74,6 +74,22 @@ QgsRasterCalcNode cannot be copied
     void setRight( QgsRasterCalcNode *right );
 
 
+    QString toString( bool cStyle = false ) const;
+%Docstring
+Returns a string representation of the expression
+
+:param cStyle: if true operators will follow C syntax
+
+.. versionadded:: 3.6
+%End
+
+    QList<const QgsRasterCalcNode *> findNodes( const QgsRasterCalcNode::Type type ) const;
+%Docstring
+Returns a list of nodes of a specific ``type``
+
+.. versionadded:: 3.6
+%End
+
     static QgsRasterCalcNode *parseRasterCalcString( const QString &str, QString &parserErrorMsg ) /Factory/;
 
   private:

diff --git a/python/plugins/processing/algs/qgis/RasterCalculator.py b/python/plugins/processing/algs/qgis/RasterCalculator.py
@@ -168,8 +168,8 @@ def _cellsize(layer):
 
         output = self.parameterAsOutputLayer(parameters, self.OUTPUT, context)
 
-        width = math.floor((bbox.xMaximum() - bbox.xMinimum()) / cellsize)
-        height = math.floor((bbox.yMaximum() - bbox.yMinimum()) / cellsize)
+        width = round((bbox.xMaximum() - bbox.xMinimum()) / cellsize)
+        height = round((bbox.yMaximum() - bbox.yMinimum()) / cellsize)
         driverName = GdalUtils.getFormatShortNameFromFilename(output)
 
         calc = QgsRasterCalculator(expression,

diff --git a/python/plugins/processing/tests/testdata/qgis_algorithm_tests.yaml b/python/plugins/processing/tests/testdata/qgis_algorithm_tests.yaml
@@ -2537,7 +2537,7 @@ tests:
       EXPRESSION: dem@1
     results:
       OUTPUT:
-        hash: ef97a22ee16e0e28bbdc0341449777b1527e37febc3c4339b2c057c9
+        hash: 525577c05dd999239d9c6f95fd5e70d96355da3a0ea71bfcf021e729
         type: rasterhash
 
   - algorithm: qgis:rastercalculator
@@ -2552,7 +2552,7 @@ tests:
       EXPRESSION: dem@1 * 2
     results:
       OUTPUT:
-        hash: fe6e018be13c5a3c17f3f4d0f0dc7686c628cb440b74c4642aa0c939
+        hash: 98daf025230ec9d031f7502c6a80a3b04dd060808d6b7bcb4328e87c
         type: rasterhash
 
   - algorithm: native:orientedminimumboundingbox

diff --git a/src/analysis/raster/qgsninecellfilter.cpp b/src/analysis/raster/qgsninecellfilter.cpp
@@ -215,7 +215,7 @@ int QgsNineCellFilter::processRasterGPU( const QString &source, QgsFeedback *fee
 
   // Prepare context and queue
   cl::Context ctx = QgsOpenClUtils::context();
-  cl::CommandQueue queue( ctx );
+  cl::CommandQueue queue = QgsOpenClUtils::commandQueue( );
 
   //keep only three scanlines in memory at a time, make room for initial and final nodata
   QgsOpenClUtils::CPLAllocator<float> scanLine( xSize + 2 );
@@ -245,7 +245,7 @@ int QgsNineCellFilter::processRasterGPU( const QString &source, QgsFeedback *fee
   cl::Buffer resultLineBuffer( ctx, CL_MEM_WRITE_ONLY, inputSize, nullptr, nullptr );
 
   // Create a program from the kernel source
-  cl::Program program( QgsOpenClUtils::buildProgram( ctx, source, QgsOpenClUtils::ExceptionBehavior::Throw ) );
+  cl::Program program( QgsOpenClUtils::buildProgram( source, QgsOpenClUtils::ExceptionBehavior::Throw ) );
 
   // Create the OpenCL kernel
   auto kernel = cl::KernelFunctor <

diff --git a/src/analysis/raster/qgsrastercalcnode.cpp b/src/analysis/raster/qgsrastercalcnode.cpp
@@ -16,6 +16,7 @@
 #include "qgsrasterblock.h"
 #include "qgsrastermatrix.h"
 #include <cfloat>
+#include <QtDebug>
 
 QgsRasterCalcNode::QgsRasterCalcNode( double number )
   : mNumber( number )
@@ -199,6 +200,127 @@ bool QgsRasterCalcNode::calculate( QMap<QString, QgsRasterBlock * > &rasterData,
   return false;
 }
 
+QString QgsRasterCalcNode::toString( bool cStyle ) const
+{
+  QString result;
+  QString left;
+  QString right;
+  if ( mLeft )
+    left = mLeft->toString( cStyle );
+  if ( mRight )
+    right = mRight->toString( cStyle );
+  switch ( mType )
+  {
+    case tOperator:
+      switch ( mOperator )
+      {
+        case opPLUS:
+          result = QStringLiteral( "%1 + %2" ).arg( left ).arg( right );
+          break;
+        case opMINUS:
+        case opSIGN:
+          result = QStringLiteral( "%1 - %2" ).arg( left ).arg( right );
+          break;
+        case opMUL:
+          result = QStringLiteral( "%1 * %2" ).arg( left ).arg( right );
+          break;
+        case opDIV:
+          result = QStringLiteral( "%1 / %2" ).arg( left ).arg( right );
+          break;
+        case opPOW:
+          if ( cStyle )
+            result = QStringLiteral( "pow( %1, %2 )" ).arg( left ).arg( right );
+          else
+            result = QStringLiteral( "%1^%2" ).arg( left ).arg( right );
+          break;
+        case opEQ:
+          if ( cStyle )
+            result = QStringLiteral( "%1 == %2" ).arg( left ).arg( right );
+          else
+            result = QStringLiteral( "%1 = %2" ).arg( left ).arg( right );
+          break;
+        case opNE:
+          result = QStringLiteral( "%1 != %2" ).arg( left ).arg( right );
+          break;
+        case opGT:
+          result = QStringLiteral( "%1 > %2" ).arg( left ).arg( right );
+          break;
+        case opLT:
+          result = QStringLiteral( "%1 < %2" ).arg( left ).arg( right );
+          break;
+        case opGE:
+          result = QStringLiteral( "%1 >= %2" ).arg( left ).arg( right );
+          break;
+        case opLE:
+          result = QStringLiteral( "%1 <= %2" ).arg( left ).arg( right );
+          break;
+        case opAND:
+          if ( cStyle )
+            result = QStringLiteral( "%1 && %2" ).arg( left ).arg( right );
+          else
+            result = QStringLiteral( "%1 AND %2" ).arg( left ).arg( right );
+          break;
+        case opOR:
+          if ( cStyle )
+            result = QStringLiteral( "%1 || %2" ).arg( left ).arg( right );
+          else
+            result = QStringLiteral( "%1 OR %2" ).arg( left ).arg( right );
+          break;
+        case opSQRT:
+          result = QStringLiteral( "sqrt( %1 )" ).arg( left );
+          break;
+        case opSIN:
+          result = QStringLiteral( "sin( %1 )" ).arg( left );
+          break;
+        case opCOS:
+          result = QStringLiteral( "cos( %1 )" ).arg( left );
+          break;
+        case opTAN:
+          result = QStringLiteral( "tan( %1 )" ).arg( left );
+          break;
+        case opASIN:
+          result = QStringLiteral( "asin( %1 )" ).arg( left );
+          break;
+        case opACOS:
+          result = QStringLiteral( "acos( %1 )" ).arg( left );
+          break;
+        case opATAN:
+          result = QStringLiteral( "atan( %1 )" ).arg( left );
+          break;
+        case opLOG:
+          result = QStringLiteral( "log( %1 )" ).arg( left );
+          break;
+        case opLOG10:
+          result = QStringLiteral( "log10( %1 )" ).arg( left );
+          break;
+        case opNONE:
+          break;
+      }
+      break;
+    case tRasterRef:
+      result = QStringLiteral( "\"%1\"" ).arg( mRasterName );
+      break;
+    case tNumber:
+      result = QString::number( mNumber );
+      break;
+    case tMatrix:
+      break;
+  }
+  return result;
+}
+
+QList<const QgsRasterCalcNode *> QgsRasterCalcNode::findNodes( const QgsRasterCalcNode::Type type ) const
+{
+  QList<const QgsRasterCalcNode *> nodeList;
+  if ( mType == type )
+    nodeList.push_back( this );
+  if ( mLeft )
+    nodeList.append( mLeft->findNodes( type ) );
+  if ( mRight )
+    nodeList.append( mRight->findNodes( type ) );
+  return nodeList;
+}
+
 QgsRasterCalcNode *QgsRasterCalcNode::parseRasterCalcString( const QString &str, QString &parserErrorMsg )
 {
   extern QgsRasterCalcNode *localParseRasterCalcString( const QString & str, QString & parserErrorMsg );

diff --git a/src/analysis/raster/qgsrastercalcnode.h b/src/analysis/raster/qgsrastercalcnode.h
@@ -106,6 +106,19 @@ class ANALYSIS_EXPORT QgsRasterCalcNode
      */
     bool calculate( QMap<QString, QgsRasterBlock * > &rasterData, QgsRasterMatrix &result, int row = -1 ) const SIP_SKIP;
 
+    /**
+     * Returns a string representation of the expression
+     * \param cStyle if true operators will follow C syntax
+     * \since QGIS 3.6
+     */
+    QString toString( bool cStyle = false ) const;
+
+    /**
+     * Returns a list of nodes of a specific \a type
+     * \since QGIS 3.6
+     */
+    QList<const QgsRasterCalcNode *> findNodes( const QgsRasterCalcNode::Type type ) const;
+
     static QgsRasterCalcNode *parseRasterCalcString( const QString &str, QString &parserErrorMsg ) SIP_FACTORY;
 
   private: