Skip to content
Permalink
Browse files

Merge master and fix merge conflict

  • Loading branch information
NEDJIMAbelgacem committed Jul 28, 2020
2 parents 750f21d + e06cefe commit 7c37c22ec17405cbdc9095f650ffc9bfa564e3fe
Showing with 3,952 additions and 367 deletions.
  1. +1 −0 python/3d/3d_auto.sip
  2. +6 −0 python/3d/auto_generated/qgs3d.sip.in
  3. +5 −0 python/3d/auto_generated/qgsabstractmaterialsettings.sip.in
  4. +118 −0 python/3d/auto_generated/qgsmaterialregistry.sip.in
  5. +8 −0 python/3d/auto_generated/qgsphongmaterialsettings.sip.in
  6. +37 −0 python/core/auto_generated/layout/qgslayoutitem.sip.in
  7. +155 −0 python/core/auto_generated/layout/qgslayoutitemmap.sip.in
  8. +4 −1 python/core/auto_generated/layout/qgslayoutitempolygon.sip.in
  9. +5 −0 python/core/auto_generated/layout/qgslayoutitemshape.sip.in
  10. +7 −0 python/core/auto_generated/layout/qgslayoututils.sip.in
  11. +4 −4 python/core/auto_generated/symbology/qgsstyle.sip.in
  12. +1 −1 python/core/auto_generated/textrenderer/qgstextbackgroundsettings.sip.in
  13. +1 −1 python/core/auto_generated/textrenderer/qgstextbuffersettings.sip.in
  14. +1 −0 python/gui/auto_generated/qgsfontbutton.sip.in
  15. +7 −0 python/gui/auto_generated/qgstextformatwidget.sip.in
  16. +5 −0 python/gui/auto_generated/tableeditor/qgstableeditordialog.sip.in
  17. +1 −1 python/plugins/processing/algs/qgis/Climb.py
  18. +2 −2 python/plugins/processing/gui/AlgorithmExecutor.py
  19. +14 −1 python/plugins/processing/gui/BatchPanel.py
  20. +2 −0 python/plugins/processing/gui/HistoryDialog.py
  21. +4 −1 python/plugins/processing/gui/ProcessingToolbox.py
  22. +86 −0 python/plugins/processing/tests/testdata/expected/rotated_points_max.gml
  23. +43 −0 python/plugins/processing/tests/testdata/expected/rotated_points_max.xsd
  24. +86 −0 python/plugins/processing/tests/testdata/expected/rotated_points_no_max.gml
  25. +43 −0 python/plugins/processing/tests/testdata/expected/rotated_points_no_max.xsd
  26. +41 −0 python/plugins/processing/tests/testdata/qgis_algorithm_tests4.yaml
  27. +2 −0 src/3d/CMakeLists.txt
  28. +10 −0 src/3d/qgs3d.cpp
  29. +9 −0 src/3d/qgs3d.h
  30. +5 −0 src/3d/qgsabstractmaterialsettings.h
  31. +53 −0 src/3d/qgsmaterialregistry.cpp
  32. +200 −0 src/3d/qgsmaterialregistry.h
  33. +10 −0 src/3d/qgsphongmaterialsettings.cpp
  34. +7 −0 src/3d/qgsphongmaterialsettings.h
  35. +8 −2 src/3d/symbols/qgsline3dsymbol.cpp
  36. +1 −1 src/3d/symbols/qgsline3dsymbol_p.cpp
  37. +7 −1 src/3d/symbols/qgspoint3dsymbol.cpp
  38. +8 −1 src/3d/symbols/qgspolygon3dsymbol.cpp
  39. +1 −0 src/analysis/CMakeLists.txt
  40. +52 −11 src/analysis/processing/qgsalgorithmaddxyfields.cpp
  41. +5 −0 src/analysis/processing/qgsalgorithmaddxyfields.h
  42. +318 −0 src/analysis/processing/qgsalgorithmangletonearest.cpp
  43. +67 −0 src/analysis/processing/qgsalgorithmangletonearest.h
  44. +2 −0 src/analysis/processing/qgsnativealgorithms.cpp
  45. +33 −0 src/app/3d/qgs3dapputils.cpp
  46. +30 −0 src/app/3d/qgs3dapputils.h
  47. +6 −2 src/app/3d/qgs3dmapconfigwidget.cpp
  48. +4 −4 src/app/3d/qgsline3dsymbolwidget.cpp
  49. +116 −0 src/app/3d/qgsmaterialwidget.cpp
  50. +52 −0 src/app/3d/qgsmaterialwidget.h
  51. +34 −24 src/app/3d/qgsphongmaterialwidget.cpp
  52. +6 −7 src/app/3d/qgsphongmaterialwidget.h
  53. +4 −4 src/app/3d/qgspoint3dsymbolwidget.cpp
  54. +3 −5 src/app/3d/qgspolygon3dsymbolwidget.cpp
  55. +2 −0 src/app/CMakeLists.txt
  56. +205 −1 src/app/locator/qgsinbuiltlocatorfilters.cpp
  57. +20 −1 src/app/locator/qgsinbuiltlocatorfilters.h
  58. +3 −8 src/app/qgisapp.cpp
  59. +1 −0 src/core/labeling/qgspallabeling.cpp
  60. +17 −2 src/core/layout/qgslayoutitem.cpp
  61. +33 −0 src/core/layout/qgslayoutitem.h
  62. +247 −13 src/core/layout/qgslayoutitemmap.cpp
  63. +159 −0 src/core/layout/qgslayoutitemmap.h
  64. +8 −1 src/core/layout/qgslayoutitemnodeitem.cpp
  65. +1 −1 src/core/layout/qgslayoutitempage.cpp
  66. +16 −0 src/core/layout/qgslayoutitempolygon.cpp
  67. +2 −1 src/core/layout/qgslayoutitempolygon.h
  68. +36 −7 src/core/layout/qgslayoutitemshape.cpp
  69. +6 −1 src/core/layout/qgslayoutitemshape.h
  70. +16 −0 src/core/layout/qgslayoututils.cpp
  71. +7 −0 src/core/layout/qgslayoututils.h
  72. +2 −1 src/core/locator/qgslocator.cpp
  73. +6 −6 src/core/symbology/qgsstyle.h
  74. +1 −1 src/core/textrenderer/qgstextbackgroundsettings.cpp
  75. +1 −1 src/core/textrenderer/qgstextbackgroundsettings.h
  76. +1 −1 src/core/textrenderer/qgstextbuffersettings.cpp
  77. +1 −1 src/core/textrenderer/qgstextbuffersettings.h
  78. +8 −5 src/core/textrenderer/qgstextrenderer.cpp
  79. +2 −0 src/gui/CMakeLists.txt
  80. +11 −5 src/gui/qgsfontbutton.cpp
  81. +3 −0 src/gui/qgsfontbutton.h
  82. +20 −0 src/gui/qgsmaterialsettingswidget.cpp
  83. +66 −0 src/gui/qgsmaterialsettingswidget.h
  84. +63 −4 src/gui/qgstextformatwidget.cpp
  85. +8 −0 src/gui/qgstextformatwidget.h
  86. +17 −0 src/gui/tableeditor/qgstableeditordialog.cpp
  87. +4 −0 src/gui/tableeditor/qgstableeditordialog.h
  88. +16 −0 src/gui/tableeditor/qgstableeditorwidget.cpp
  89. +4 −4 src/providers/delimitedtext/qgsdelimitedtextfile.cpp
  90. +1 −1 src/providers/postgres/raster/qgspostgresrasterprovider.cpp
  91. +29 −5 src/providers/postgres/raster/qgspostgresrastershareddata.cpp
  92. +13 −0 src/providers/postgres/raster/qgspostgresrasterutils.cpp
  93. +1 −1 src/server/services/wfs/qgswfsgetfeature.cpp
  94. +3 −3 src/ui/3d/line3dsymbolwidget.ui
  95. +54 −0 src/ui/3d/materialwidget.ui
  96. +3 −3 src/ui/3d/point3dsymbolwidget.ui
  97. +3 −3 src/ui/3d/polygon3dsymbolwidget.ui
  98. +30 −30 src/ui/qgisapp.ui
  99. +133 −160 src/ui/qgstextformatwidgetbase.ui
  100. +1 −0 tests/src/3d/CMakeLists.txt
  101. +93 −0 tests/src/3d/testqgs3drendering.cpp
  102. +161 −0 tests/src/3d/testqgsmaterialregistry.cpp
  103. +28 −0 tests/src/app/testqgsapplocatorfilters.cpp
  104. +1 −0 tests/src/python/CMakeLists.txt
  105. +23 −1 tests/src/python/test_provider_postgresraster.py
  106. +330 −17 tests/src/python/test_qgslayoutmap.py
  107. +196 −0 tests/src/python/test_qgslayoutmapitemclippingsettings.py
  108. +49 −3 tests/src/python/test_qgslayoutpolygon.py
  109. +39 −1 tests/src/python/test_qgslayoutshape.py
  110. +1 −0 tests/testdata/3d/lines.cpg
  111. BIN tests/testdata/3d/lines.dbf
  112. +1 −0 tests/testdata/3d/lines.prj
  113. BIN tests/testdata/3d/lines.shp
  114. BIN tests/testdata/3d/lines.shx
  115. BIN ...tdata/control_images/3d/expected_billboard_rendering_1/default/expected_billboard_rendering_1.png
  116. BIN ...a/control_images/3d/expected_billboard_rendering_1/{ → travis}/expected_billboard_rendering_1.png
  117. BIN ...trol_images/3d/expected_billboard_rendering_1/{ → travis}/expected_billboard_rendering_1_mask.png
  118. BIN ...tdata/control_images/3d/expected_billboard_rendering_2/default/expected_billboard_rendering_2.png
  119. BIN ...a/control_images/3d/expected_billboard_rendering_2/{ → travis}/expected_billboard_rendering_2.png
  120. BIN ...trol_images/3d/expected_billboard_rendering_2/{ → travis}/expected_billboard_rendering_2_mask.png
  121. BIN tests/testdata/control_images/3d/expected_buffered_lines/default/expected_buffered_lines.png
  122. BIN tests/testdata/control_images/3d/expected_buffered_lines/travis/expected_buffered_lines.png
  123. BIN ...estdata/control_images/3d/expected_buffered_lines_width/default/expected_buffered_lines_width.png
  124. BIN ...ta/control_images/3d/expected_buffered_lines_width/default/expected_buffered_lines_width_mask.png
  125. BIN ...testdata/control_images/3d/expected_buffered_lines_width/travis/expected_buffered_lines_width.png
  126. BIN ...ata/control_images/3d/expected_buffered_lines_width/travis/expected_buffered_lines_width_mask.png
  127. BIN tests/testdata/control_images/3d/expected_line_rendering_1/default/expected_line_rendering_1.png
  128. BIN tests/testdata/control_images/3d/expected_line_rendering_1/{ → travis}/expected_line_rendering_1.png
  129. BIN tests/testdata/control_images/3d/expected_line_rendering_2/default/expected_line_rendering_2.png
  130. BIN tests/testdata/control_images/3d/expected_line_rendering_2/{ → travis}/expected_line_rendering_2.png
  131. BIN tests/testdata/control_images/3d/expected_rulebased/variant3/expected_rulebased.png
  132. BIN ...ontrol_images/composer_items/expected_layoutrotation_label/expected_layoutrotation_label_mask.png
  133. BIN ...tdata/control_images/composer_map/expected_composermap_itemclip/expected_composermap_itemclip.png
  134. BIN ...omposer_map/expected_composermap_itemclip_background/expected_composermap_itemclip_background.png
  135. BIN ...ed_composermap_itemclip_force_labels_inside/expected_composermap_itemclip_force_labels_inside.png
  136. BIN ...ser_map/expected_composermap_itemclip_nodrawsource/expected_composermap_itemclip_nodrawsource.png
  137. BIN ...es/composer_map/expected_composermap_itemclip_overview/expected_composermap_itemclip_overview.png
  138. BIN ...data/control_images/composer_mapgrid/expected_composermap_grid/expected_composermap_grid_mask.png
  139. BIN ...mposer_mapgrid/expected_composermap_gridreprojected/expected_composermap_gridreprojected_mask.png
  140. +6 −0 tests/testdata/provider/postgresraster/bug_37968_dem_linear_cdn_extract.sql
@@ -7,6 +7,7 @@
%Include auto_generated/qgsabstractvectorlayer3drenderer.sip
%Include auto_generated/qgscamerapose.sip
%Include auto_generated/qgslayoutitem3dmap.sip
%Include auto_generated/qgsmaterialregistry.sip
%Include auto_generated/qgsphongmaterialsettings.sip
%Include auto_generated/qgspointlightsettings.sip
%Include auto_generated/qgsdirectionallightsettings.sip
@@ -9,6 +9,7 @@




class Qgs3D
{
%Docstring
@@ -35,6 +36,11 @@ Returns a pointer to the singleton instance.
static void initialize();
%Docstring
Initializes the 3D framework.
%End

static QgsMaterialRegistry *materialRegistry();
%Docstring
Returns the material registry, used for managing 3D materials.
%End

private:
@@ -78,6 +78,11 @@ Abstract base class for material settings.

virtual ~QgsAbstractMaterialSettings();

virtual QString type() const = 0;
%Docstring
Returns the unique type name for the material.
%End

virtual QgsAbstractMaterialSettings *clone() const = 0 /Factory/;
%Docstring
Clones the material settings.
@@ -0,0 +1,118 @@
/************************************************************************
* This file has been generated automatically from *
* *
* src/3d/qgsmaterialregistry.h *
* *
* Do not edit manually ! Edit header and run scripts/sipify.pl again *
************************************************************************/




class QgsMaterialSettingsWidget /External/;

class QgsMaterialSettingsAbstractMetadata
{
%Docstring
Stores metadata about one 3D material settings class.

.. note::

It's necessary to implement :py:func:`~createMaterialSettings` function.
In C++ you can use QgsMaterialSettingsMetadata convenience class.

.. versionadded:: 3.16
%End

%TypeHeaderCode
#include "qgsmaterialregistry.h"
%End
public:

QgsMaterialSettingsAbstractMetadata( const QString &type, const QString &visibleName );
%Docstring
Constructor for QgsMaterialSettingsAbstractMetadata, with the specified ``type`` and ``visibleName``.
%End

virtual ~QgsMaterialSettingsAbstractMetadata();

QString type() const;
%Docstring
Returns the unique material type string.
%End

QString visibleName() const;
%Docstring
Returns the material's visible (translated) name.
%End

virtual QgsAbstractMaterialSettings *create() = 0 /Factory/;
%Docstring
Creates a new instance of this material settings type.

Caller takes ownership of the returned object.
%End


};





class QgsMaterialRegistry
{
%Docstring
Registry of available 3d material settings classes.

QgsMaterialRegistry is not usually directly created, but rather accessed through
Qgs3D.materialRegistry().

.. versionadded:: 3.16
%End

%TypeHeaderCode
#include "qgsmaterialregistry.h"
%End
public:

QgsMaterialRegistry();
~QgsMaterialRegistry();


QgsMaterialSettingsAbstractMetadata *materialSettingsMetadata( const QString &type ) const;
%Docstring
Returns metadata for specified material settings ``type``. Returns ``None`` if not found
%End

QStringList materialSettingsTypes() const;
%Docstring
Returns a list of all available material settings types.
%End

bool addMaterialSettingsType( QgsMaterialSettingsAbstractMetadata *metadata /Transfer/ );
%Docstring
Registers a new material settings type. Takes ownership of the ``metadata`` instance.
%End

QgsAbstractMaterialSettings *createMaterialSettings( const QString &type ) const /Factory/;
%Docstring
Creates a new instance of the material settings of the specified ``type``.

The caller takes ownership of the returned object.

Returns ``None`` if the specified type is not found in the registry.
%End

private:
QgsMaterialRegistry( const QgsMaterialRegistry &rh );
};


/************************************************************************
* This file has been generated automatically from *
* *
* src/3d/qgsmaterialregistry.h *
* *
* Do not edit manually ! Edit header and run scripts/sipify.pl again *
************************************************************************/
@@ -32,6 +32,14 @@ with three color components: ambient, diffuse and specular.
QgsPhongMaterialSettings();
%Docstring
Constructor for QgsPhongMaterialSettings.
%End

virtual QString type() const;


static QgsAbstractMaterialSettings *create() /Factory/;
%Docstring
Returns a new instance of QgsPhongMaterialSettings.
%End

virtual QgsPhongMaterialSettings *clone() const /Factory/;
@@ -246,6 +246,7 @@ Base class for graphical items within a :py:class:`QgsLayout`.
enum Flag
{
FlagOverridesPaint,
FlagProvidesClipPath,
};
typedef QFlags<QgsLayoutItem::Flag> Flags;

@@ -1026,6 +1027,18 @@ Returns ``True`` if the visitor should continue visiting other objects, or ``Fal
should be canceled.

.. versionadded:: 3.10
%End

virtual QgsGeometry clipPath() const;
%Docstring
Returns the clipping path generated by this item, in layout coordinates.

.. note::

Not all items can function as clipping paths. The FlagProvidesClipPath flag
indicates if a particular item can function as a clipping path provider.

.. versionadded:: 3.16
%End

public slots:
@@ -1107,6 +1120,15 @@ Emitted when the item's size or position changes.
Emitted whenever the number of background tasks an item is executing changes.

.. versionadded:: 3.10
%End

void clipPathChanged();
%Docstring
Emitted when the item's clipping path has changed.

.. seealso:: :py:func:`clipPath`

.. versionadded:: 3.16
%End

protected:
@@ -1125,16 +1147,31 @@ Draws the item's contents using the specified item render ``context``.

Note that the context's painter has been scaled so that painter units are pixels.
Use the QgsRenderContext methods to convert from millimeters or other units to the painter's units.
%End

virtual QPainterPath framePath() const;
%Docstring
Returns the path to use when drawing the item's frame or background.

.. seealso:: :py:func:`drawFrame`

.. seealso:: :py:func:`drawBackground`

.. versionadded:: 3.16
%End

virtual void drawFrame( QgsRenderContext &context );
%Docstring
Draws the frame around the item.

.. seealso:: :py:func:`framePath`
%End

virtual void drawBackground( QgsRenderContext &context );
%Docstring
Draws the background for the item.

.. seealso:: :py:func:`framePath`
%End

virtual void setFixedSize( const QgsLayoutSize &size );

0 comments on commit 7c37c22

Please sign in to comment.
You can’t perform that action at this time.