Merge pull request #45032 from qgis/queued_ltr_backports

Queued ltr backports (3.16.12)
qgis · Sep 14, 2021 · 0e2e98b · 0e2e98b
2 parents 3996de7 + dbba1ed
commit 0e2e98b
Show file tree

Hide file tree

Showing 33 changed files with 1,333 additions and 469 deletions.
diff --git a/python/core/auto_generated/qgsvectorlayer.sip.in b/python/core/auto_generated/qgsvectorlayer.sip.in
@@ -1658,8 +1658,14 @@ Adds topological points for every vertex of the geometry.
 
 :param geom: the geometry where each vertex is added to segments of other features
 
+:return: -1 in case of layer error (invalid or non editable)
+
 :return: 0 in case of success
 
+:return: 1 in case of geometry error (non spatial or null geometry)
+
+:return: 2 in case no vertices needed to be added
+
 .. note::
 
    geom is not going to be modified by the function
@@ -1681,8 +1687,14 @@ editing.
 
 :param p: position of the vertex
 
+:return: -1 in case of layer error (invalid or non editable)
+
 :return: 0 in case of success
 
+:return: 1 in case of geometry error (non spatial or null geometry)
+
+:return: 2 in case no vertices needed to be added
+
 .. note::
 
    Calls to :py:func:`~QgsVectorLayer.addTopologicalPoints` are only valid for layers in which edits have been enabled
@@ -1703,8 +1715,14 @@ editing.
 
 :param p: position of the vertex
 
+:return: -1 in case of layer error (invalid or non editable)
+
 :return: 0 in case of success
 
+:return: 1 in case of geometry error (non spatial or null geometry)
+
+:return: 2 in case no vertices needed to be added
+
 .. note::
 
    Calls to :py:func:`~QgsVectorLayer.addTopologicalPoints` are only valid for layers in which edits have been enabled
@@ -1724,8 +1742,14 @@ editing.
 
 :param ps: point sequence of the vertices
 
+:return: -1 in case of layer error (invalid or non editable)
+
 :return: 0 in case of success
 
+:return: 1 in case of geometry error (non spatial or null geometry)
+
+:return: 2 in case no vertices needed to be added
+
 .. note::
 
    Calls to :py:func:`~QgsVectorLayer.addTopologicalPoints` are only valid for layers in which edits have been enabled

diff --git a/python/plugins/processing/algs/gdal/merge.py b/python/plugins/processing/algs/gdal/merge.py
@@ -71,15 +71,15 @@ def initAlgorithm(self, config=None):
 
         nodata_param = QgsProcessingParameterNumber(self.NODATA_INPUT,
                                                     self.tr('Input pixel value to treat as "nodata"'),
-                                                    type=QgsProcessingParameterNumber.Integer,
+                                                    type=QgsProcessingParameterNumber.Double,
                                                     defaultValue=None,
                                                     optional=True)
         nodata_param.setFlags(nodata_param.flags() | QgsProcessingParameterDefinition.FlagAdvanced)
         self.addParameter(nodata_param)
 
         nodata_out_param = QgsProcessingParameterNumber(self.NODATA_OUTPUT,
                                                         self.tr('Assign specified "nodata" value to output'),
-                                                        type=QgsProcessingParameterNumber.Integer,
+                                                        type=QgsProcessingParameterNumber.Double,
                                                         defaultValue=None,
                                                         optional=True)
         nodata_out_param.setFlags(nodata_out_param.flags() | QgsProcessingParameterDefinition.FlagAdvanced)
@@ -141,12 +141,12 @@ def getConsoleCommands(self, parameters, context, feedback, executing=True):
             arguments.append('-separate')
 
         if self.NODATA_INPUT in parameters and parameters[self.NODATA_INPUT] is not None:
-            nodata_input = self.parameterAsInt(parameters, self.NODATA_INPUT, context)
+            nodata_input = self.parameterAsDouble(parameters, self.NODATA_INPUT, context)
             arguments.append('-n')
             arguments.append(str(nodata_input))
 
         if self.NODATA_OUTPUT in parameters and parameters[self.NODATA_OUTPUT] is not None:
-            nodata_output = self.parameterAsInt(parameters, self.NODATA_OUTPUT, context)
+            nodata_output = self.parameterAsDouble(parameters, self.NODATA_OUTPUT, context)
             arguments.append('-a_nodata')
             arguments.append(str(nodata_output))
 

diff --git a/python/plugins/processing/tests/GdalAlgorithmsRasterTest.py b/python/plugins/processing/tests/GdalAlgorithmsRasterTest.py
@@ -1974,7 +1974,7 @@ def testMerge(self):
             cmd[1] = t[:t.find('--optfile') + 10] + t[t.find('mergeInputFiles.txt'):]
             self.assertEqual(cmd,
                              ['gdal_merge.py',
-                              '-a_nodata -9999 -ot Float32 -of GTiff ' +
+                              '-a_nodata -9999.0 -ot Float32 -of GTiff ' +
                               '-o ' + outdir + '/check.tif ' +
                               '--optfile mergeInputFiles.txt'])
 

diff --git a/src/app/qgsmaptooloffsetcurve.cpp b/src/app/qgsmaptooloffsetcurve.cpp
@@ -131,6 +131,15 @@ void QgsMapToolOffsetCurve::canvasReleaseEvent( QgsMapMouseEvent *e )
   }
 }
 
+void QgsMapToolOffsetCurve::applyOffsetFromWidget( double offset, Qt::KeyboardModifiers modifiers )
+{
+  if ( mSourceLayer && !mOriginalGeometry.isNull() && !qgsDoubleNear( offset, 0 ) )
+  {
+    mGeometryModified = true;
+    applyOffset( offset, modifiers );
+  }
+}
+
 void QgsMapToolOffsetCurve::applyOffset( double offset, Qt::KeyboardModifiers modifiers )
 {
   if ( !mSourceLayer || offset == 0.0 )
@@ -579,7 +588,7 @@ void QgsMapToolOffsetCurve::createUserInputWidget()
   mUserInputWidget->setFocus( Qt::TabFocusReason );
 
   connect( mUserInputWidget, &QgsOffsetUserWidget::offsetChanged, this, &QgsMapToolOffsetCurve::updateGeometryAndRubberBand );
-  connect( mUserInputWidget, &QgsOffsetUserWidget::offsetEditingFinished, this, &QgsMapToolOffsetCurve::applyOffset );
+  connect( mUserInputWidget, &QgsOffsetUserWidget::offsetEditingFinished, this, &QgsMapToolOffsetCurve::applyOffsetFromWidget );
   connect( mUserInputWidget, &QgsOffsetUserWidget::offsetEditingCanceled, this, &QgsMapToolOffsetCurve::cancel );
 
   connect( mUserInputWidget, &QgsOffsetUserWidget::offsetConfigChanged, this, [ = ] {updateGeometryAndRubberBand( mUserInputWidget->offset() );} );
@@ -590,7 +599,7 @@ void QgsMapToolOffsetCurve::deleteUserInputWidget()
   if ( mUserInputWidget )
   {
     disconnect( mUserInputWidget, &QgsOffsetUserWidget::offsetChanged, this, &QgsMapToolOffsetCurve::updateGeometryAndRubberBand );
-    disconnect( mUserInputWidget, &QgsOffsetUserWidget::offsetEditingFinished, this, &QgsMapToolOffsetCurve::applyOffset );
+    disconnect( mUserInputWidget, &QgsOffsetUserWidget::offsetEditingFinished, this, &QgsMapToolOffsetCurve::applyOffsetFromWidget );
     disconnect( mUserInputWidget, &QgsOffsetUserWidget::offsetEditingCanceled, this, &QgsMapToolOffsetCurve::cancel );
     mUserInputWidget->releaseKeyboard();
     mUserInputWidget->deleteLater();

diff --git a/src/app/qgsmaptooloffsetcurve.h b/src/app/qgsmaptooloffsetcurve.h
@@ -69,6 +69,8 @@ class APP_EXPORT QgsMapToolOffsetCurve: public QgsMapToolEdit
     //! Places curve offset from the mouse position or from the value entered in the spin box
     void updateGeometryAndRubberBand( double offset );
 
+    void applyOffsetFromWidget( double offset, Qt::KeyboardModifiers modifiers );
+
     //! Apply the offset either from the spin box or from the mouse event
     void applyOffset( double offset, Qt::KeyboardModifiers modifiers );
 

diff --git a/src/core/layout/qgslayoutitemmap.cpp b/src/core/layout/qgslayoutitemmap.cpp
@@ -2610,7 +2610,7 @@ void QgsLayoutItemMap::updateAtlasFeature()
     else
       scales = mLayout->renderContext().predefinedScales();
     Q_NOWARN_DEPRECATED_POP
-    if ( mAtlasScalingMode == Fixed || isPointLayer || scales.isEmpty() )
+    if ( mAtlasScalingMode == Fixed || scales.isEmpty() || ( isPointLayer && mAtlasScalingMode != Predefined ) )
     {
       // only translate, keep the original scale (i.e. width x height)
       double xMin = geomCenterX - originalExtent.width() / 2.0;

diff --git a/src/core/layout/qgslayoutitemmapgrid.cpp b/src/core/layout/qgslayoutitemmapgrid.cpp
@@ -1944,6 +1944,13 @@ void QgsLayoutItemMapGrid::refreshDataDefinedProperties()
 {
   QgsExpressionContext context = createExpressionContext();
 
+  // if we are changing the grid interval or offset, then we also have to mark the transform as dirty
+  mTransformDirty = mTransformDirty
+                    || mDataDefinedProperties.isActive( QgsLayoutObject::MapGridIntervalX )
+                    || mDataDefinedProperties.isActive( QgsLayoutObject::MapGridIntervalY )
+                    || mDataDefinedProperties.isActive( QgsLayoutObject::MapGridOffsetX )
+                    || mDataDefinedProperties.isActive( QgsLayoutObject::MapGridOffsetY );
+
   mEvaluatedEnabled = mDataDefinedProperties.valueAsBool( QgsLayoutObject::MapGridEnabled, context, enabled() );
   switch ( mGridUnit )
   {
@@ -1971,6 +1978,7 @@ void QgsLayoutItemMapGrid::refreshDataDefinedProperties()
         const double interval = QgsLayoutUtils::calculatePrettySize( minUnitsPerSeg, maxUnitsPerSeg );
         mEvaluatedIntervalX = interval;
         mEvaluatedIntervalY = interval;
+        mTransformDirty = true;
       }
       break;
     }