diff --git a/python/analysis/__init__.py.in b/python/analysis/__init__.py.in index 897b274a5a9..3f7807a0a02 100644 --- a/python/analysis/__init__.py.in +++ b/python/analysis/__init__.py.in @@ -27,6 +27,9 @@ from qgis._analysis import * # preserve API compatibility following QgsExifTools moved to core from qgis.core import QgsExifTools +# preserve API compatibility as QgsAlignRaster.Item moved to QgsAlignRasterData.RasterItem +from qgis.core import QgsAlignRasterData from qgis.core import Qgis QgsAlignRaster.ResampleAlg = Qgis.GdalResampleAlgorithm +QgsAlignRaster.Item = QgsAlignRasterData.RasterItem diff --git a/python/core/auto_additions/qgis.py b/python/core/auto_additions/qgis.py index 7a206ba963e..7a489cf62b9 100644 --- a/python/core/auto_additions/qgis.py +++ b/python/core/auto_additions/qgis.py @@ -3812,19 +3812,44 @@ Qgis.TiledSceneRendererFlag.__doc__ = "Flags which control how tiled scene 2D re Qgis.TiledSceneRendererFlag.baseClass = Qgis Qgis.TiledSceneRendererFlags.baseClass = Qgis TiledSceneRendererFlags = Qgis # dirty hack since SIP seems to introduce the flags in module +QgsAlignRaster.ResampleAlg = Qgis.GdalResampleAlgorithm # monkey patching scoped based enum -Qgis.GdalResampleAlgorithm.RA_NearestNeighbour.__doc__ = "Nearest neighbour (select on one input pixel)" -Qgis.GdalResampleAlgorithm.RA_Bilinear.__doc__ = "Bilinear (2x2 kernel)" -Qgis.GdalResampleAlgorithm.RA_Cubic.__doc__ = "Cubic Convolution Approximation (4x4 kernel)" -Qgis.GdalResampleAlgorithm.RA_CubicSpline.__doc__ = "Cubic B-Spline Approximation (4x4 kernel)" -Qgis.GdalResampleAlgorithm.RA_Lanczos.__doc__ = "Lanczos windowed sinc interpolation (6x6 kernel)" -Qgis.GdalResampleAlgorithm.RA_Average.__doc__ = "Average (computes the average of all non-NODATA contributing pixels)" -Qgis.GdalResampleAlgorithm.RA_Mode.__doc__ = "Mode (selects the value which appears most often of all the sampled points)" -Qgis.GdalResampleAlgorithm.RA_Max.__doc__ = "Maximum (selects the maximum of all non-NODATA contributing pixels)" -Qgis.GdalResampleAlgorithm.RA_Min.__doc__ = "Minimum (selects the minimum of all non-NODATA contributing pixels)" -Qgis.GdalResampleAlgorithm.RA_Median.__doc__ = "Median (selects the median of all non-NODATA contributing pixels)" -Qgis.GdalResampleAlgorithm.RA_Q1.__doc__ = "First quartile (selects the first quartile of all non-NODATA contributing pixels)" -Qgis.GdalResampleAlgorithm.RA_Q3.__doc__ = "Third quartile (selects the third quartile of all non-NODATA contributing pixels)" +QgsAlignRaster.RA_NearestNeighbour = Qgis.GdalResampleAlgorithm.RA_NearestNeighbour +QgsAlignRaster.RA_NearestNeighbour.is_monkey_patched = True +QgsAlignRaster.RA_NearestNeighbour.__doc__ = "Nearest neighbour (select on one input pixel)" +QgsAlignRaster.RA_Bilinear = Qgis.GdalResampleAlgorithm.RA_Bilinear +QgsAlignRaster.RA_Bilinear.is_monkey_patched = True +QgsAlignRaster.RA_Bilinear.__doc__ = "Bilinear (2x2 kernel)" +QgsAlignRaster.RA_Cubic = Qgis.GdalResampleAlgorithm.RA_Cubic +QgsAlignRaster.RA_Cubic.is_monkey_patched = True +QgsAlignRaster.RA_Cubic.__doc__ = "Cubic Convolution Approximation (4x4 kernel)" +QgsAlignRaster.RA_CubicSpline = Qgis.GdalResampleAlgorithm.RA_CubicSpline +QgsAlignRaster.RA_CubicSpline.is_monkey_patched = True +QgsAlignRaster.RA_CubicSpline.__doc__ = "Cubic B-Spline Approximation (4x4 kernel)" +QgsAlignRaster.RA_Lanczos = Qgis.GdalResampleAlgorithm.RA_Lanczos +QgsAlignRaster.RA_Lanczos.is_monkey_patched = True +QgsAlignRaster.RA_Lanczos.__doc__ = "Lanczos windowed sinc interpolation (6x6 kernel)" +QgsAlignRaster.RA_Average = Qgis.GdalResampleAlgorithm.RA_Average +QgsAlignRaster.RA_Average.is_monkey_patched = True +QgsAlignRaster.RA_Average.__doc__ = "Average (computes the average of all non-NODATA contributing pixels)" +QgsAlignRaster.RA_Mode = Qgis.GdalResampleAlgorithm.RA_Mode +QgsAlignRaster.RA_Mode.is_monkey_patched = True +QgsAlignRaster.RA_Mode.__doc__ = "Mode (selects the value which appears most often of all the sampled points)" +QgsAlignRaster.RA_Max = Qgis.GdalResampleAlgorithm.RA_Max +QgsAlignRaster.RA_Max.is_monkey_patched = True +QgsAlignRaster.RA_Max.__doc__ = "Maximum (selects the maximum of all non-NODATA contributing pixels)" +QgsAlignRaster.RA_Min = Qgis.GdalResampleAlgorithm.RA_Min +QgsAlignRaster.RA_Min.is_monkey_patched = True +QgsAlignRaster.RA_Min.__doc__ = "Minimum (selects the minimum of all non-NODATA contributing pixels)" +QgsAlignRaster.RA_Median = Qgis.GdalResampleAlgorithm.RA_Median +QgsAlignRaster.RA_Median.is_monkey_patched = True +QgsAlignRaster.RA_Median.__doc__ = "Median (selects the median of all non-NODATA contributing pixels)" +QgsAlignRaster.RA_Q1 = Qgis.GdalResampleAlgorithm.RA_Q1 +QgsAlignRaster.RA_Q1.is_monkey_patched = True +QgsAlignRaster.RA_Q1.__doc__ = "First quartile (selects the first quartile of all non-NODATA contributing pixels)" +QgsAlignRaster.RA_Q3 = Qgis.GdalResampleAlgorithm.RA_Q3 +QgsAlignRaster.RA_Q3.is_monkey_patched = True +QgsAlignRaster.RA_Q3.__doc__ = "Third quartile (selects the third quartile of all non-NODATA contributing pixels)" Qgis.GdalResampleAlgorithm.__doc__ = "Resampling algorithm to be used (equivalent to GDAL's enum GDALResampleAlg)\n\n.. note::\n\n RA_Max, RA_Min, RA_Median, RA_Q1 and RA_Q3 are available on GDAL >= 2.0 builds only\n\n.. versionadded:: 3.34\n\n" + '* ``RA_NearestNeighbour``: ' + Qgis.GdalResampleAlgorithm.RA_NearestNeighbour.__doc__ + '\n' + '* ``RA_Bilinear``: ' + Qgis.GdalResampleAlgorithm.RA_Bilinear.__doc__ + '\n' + '* ``RA_Cubic``: ' + Qgis.GdalResampleAlgorithm.RA_Cubic.__doc__ + '\n' + '* ``RA_CubicSpline``: ' + Qgis.GdalResampleAlgorithm.RA_CubicSpline.__doc__ + '\n' + '* ``RA_Lanczos``: ' + Qgis.GdalResampleAlgorithm.RA_Lanczos.__doc__ + '\n' + '* ``RA_Average``: ' + Qgis.GdalResampleAlgorithm.RA_Average.__doc__ + '\n' + '* ``RA_Mode``: ' + Qgis.GdalResampleAlgorithm.RA_Mode.__doc__ + '\n' + '* ``RA_Max``: ' + Qgis.GdalResampleAlgorithm.RA_Max.__doc__ + '\n' + '* ``RA_Min``: ' + Qgis.GdalResampleAlgorithm.RA_Min.__doc__ + '\n' + '* ``RA_Median``: ' + Qgis.GdalResampleAlgorithm.RA_Median.__doc__ + '\n' + '* ``RA_Q1``: ' + Qgis.GdalResampleAlgorithm.RA_Q1.__doc__ + '\n' + '* ``RA_Q3``: ' + Qgis.GdalResampleAlgorithm.RA_Q3.__doc__ # -- Qgis.GdalResampleAlgorithm.baseClass = Qgis diff --git a/python/core/auto_generated/qgis.sip.in b/python/core/auto_generated/qgis.sip.in index eef11f81033..12d2159d689 100644 --- a/python/core/auto_generated/qgis.sip.in +++ b/python/core/auto_generated/qgis.sip.in @@ -2215,7 +2215,7 @@ The development version enum class GdalResampleAlgorithm - { + { RA_NearestNeighbour, RA_Bilinear, RA_Cubic, diff --git a/src/core/qgis.h b/src/core/qgis.h index fbaacf70ba8..3fe1f9244f6 100644 --- a/src/core/qgis.h +++ b/src/core/qgis.h @@ -3894,8 +3894,8 @@ class CORE_EXPORT Qgis * \note RA_Max, RA_Min, RA_Median, RA_Q1 and RA_Q3 are available on GDAL >= 2.0 builds only * \since QGIS 3.34 */ - enum class GdalResampleAlgorithm : int - { + enum class GdalResampleAlgorithm SIP_MONKEYPATCH_SCOPEENUM_UNNEST( QgsAlignRaster, ResampleAlg ) : int + { RA_NearestNeighbour = 0, //!< Nearest neighbour (select on one input pixel) RA_Bilinear = 1, //!< Bilinear (2x2 kernel) RA_Cubic = 2, //!< Cubic Convolution Approximation (4x4 kernel)