Skip to content

Commit 03fb961

Browse files
authored
Merge branch 'qgis:master' into master
2 parents ffb995e + 9ba0dd7 commit 03fb961

File tree

514 files changed

+11550
-10798
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

514 files changed

+11550
-10798
lines changed

.ci/test_blocklist_qt6.txt

-45
Original file line numberDiff line numberDiff line change
@@ -50,39 +50,29 @@ PyQgsAggregateCalculator
5050
PyQgsAnnotation
5151
PyQgsAnnotationLayer
5252
PyQgsAnnotationLineItem
53-
PyQgsAnnotationLineTextItem
5453
PyQgsAnnotationMarkerItem
55-
PyQgsAnnotationPointTextItem
5654
PyQgsAnnotationPolygonItem
5755
PyQgsAttributeForm
5856
PyQgsAttributeTableModel
5957
PyQgsAuthenticationSystem
6058
PyQgsBatchGeocodeAlgorithm
61-
PyQgsBlendModes
6259
PyQgsBlockingProcess
63-
PyQgsBlockingNetworkRequest
64-
PyQgsBookmarkManager
6560
PyQgsBookmarkModel
6661
PyQgsCategorizedSymbolRenderer
67-
PyQgsCodeEditorPython
6862
PyQgsCodeEditor
6963
PyQgsColorRamp
7064
PyQgsColorRampLegendNode
71-
PyQgsColorUtils
7265
PyQgsCombinedStyleModel
73-
PyQgsCoordinateFormatter
7466
PyQgsConditionalStyle
7567
PyQgsConnectionRegistry
7668
PyQgsXmlUtils
77-
PyQgsDateTimeEdit
7869
PyQgsDateTimeStatisticalSummary
7970
PyQgsDelimitedTextProvider
8071
PyQgsEditWidgets
8172
PyQgsElevationProfileCanvas
8273
PyQgsEmbeddedSymbolRenderer
8374
PyQgsExifTools
8475
PyQgsExpression
85-
PyQgsExpressionBuilderWidget
8676
PyQgsFeature
8777
PyQgsFeatureSink
8878
PyQgsFieldComboBoxTest
@@ -103,9 +93,6 @@ PyQgsGdalProvider
10393
PyQgsGeometryGeneratorSymbolLayer
10494
PyQgsGeometryTest
10595
PyQgsGpsLogger
106-
PyQgsGraduatedSymbolRenderer
107-
PyQgsGroupLayer
108-
PyQgsHashLineSymbolLayer
10996
PyQgsHighlight
11097
PyQgsJsonUtils
11198
PyQgsLabelObstacleSettings
@@ -115,49 +102,34 @@ PyQgsLayerMetadata
115102
PyQgsLayerMetadataProviderPython
116103
PyQgsLayerMetadataProviderOgr
117104
PyQgsLayerMetadataResultsModel
118-
PyQgsLayerTree
119105
PyQgsLayerTreeView
120106
PyQgsLayoutAtlas
121107
PyQgsLayoutElevationProfile
122108
PyQgsLayoutExporter
123-
PyQgsLayoutFrame
124109
PyQgsLayoutManagerModel
125110
PyQgsLayoutPageCollection
126111
PyQgsLayoutView
127112
PyQgsLayoutGuide
128113
PyQgsLayoutHtml
129114
PyQgsLayoutItem
130-
PyQgsLayoutItemComboBox
131-
PyQgsLayoutLabel
132115
PyQgsLayoutLegend
133116
PyQgsLayoutMap
134-
PyQgsLayoutItemMapItemClipPathSettings
135117
PyQgsLayoutMapGrid
136118
PyQgsLayoutMapOverview
137119
PyQgsLayoutMarker
138-
PyQgsLayoutPage
139-
PyQgsLayoutPicture
140120
PyQgsLayoutPolygon
141121
PyQgsLayoutPolyline
142-
PyQgsLayoutScaleBar
143122
PyQgsLayoutShape
144123
PyQgsLineSymbolLayers
145-
PyQgsLineburstSymbolLayer
146124
PyQgsLocator
147125
PyQgsMapBoxGlStyleConverter
148-
PyQgsMapLayer
149-
PyQgsMapLayerComboBox
150126
PyQgsMapLayerModel
151127
PyQgsMapLayerUtils
152-
PyQgsMapRenderer
153128
PyQgsMarkerLineSymbolLayer
154129
PyQgsMetadataBase
155130
PyQgsMemoryProvider
156131
PyQgsMeshLayerProfileGenerator
157132
PyQgsNetworkAccessManager
158-
PyQgsNullSymbolRenderer
159-
PyQgsNewGeoPackageLayerDialog
160-
PyQgsNewVectorTableDialog
161133
PyQgsOgcUtils
162134
PyQgsOGRProviderGpkg
163135
PyQgsOGRProviderSqlite
@@ -189,29 +161,23 @@ PyQgsStyleStorageSpatialite
189161
PyQgsStyleStorageGpkg
190162
PyQgsProviderSublayerDetails
191163
PyQgsProviderSublayerModel
192-
PyQgsRangeSlider
193164
PyQgsRangeWidgets
194165
PyQgsRasterAttributeTable
195166
PyQgsRasterAttributeTableModel
196167
PyQgsRasterFileWriter
197168
PyQgsRasterLayer
198169
PyQgsRasterLayerProfileGenerator
199170
PyQgsRasterLayerRenderer
200-
PyQgsRasterLineSymbolLayer
201171
PyQgsRasterPipe
202-
PyQgsRasterTransparencyWidget
203172
PyQgsProviderUtils
204173
PyQgsRenderContext
205-
PyQgsRubberBand
206174
PyQgsSingleSymbolRenderer
207175
PyQgsShapefileProvider
208176
PyQgsSvgCache
209177
PyQgsTabfileProvider
210178
PyQgsTextRenderer
211179
PyQgsOGRProvider
212-
PyQgsShortcutsManager
213180
PyQgsSimpleLineSymbolLayer
214-
PyQgsSingleItemModel
215181
PyQgsSpatialiteProvider
216182
PyQgsSymbolLayer
217183
PyQgsRasterRendererCreateSld
@@ -222,19 +188,15 @@ PyQgsSymbolExpressionVariables
222188
PyQgsStringUtils
223189
PyQgsStyleModel
224190
PyQgsSubsetStringEditorProviderRegistry
225-
PyQgsSymbolLayerUtils
226191
PyQgsTemporalUtils
227192
PyQgsTextDocument
228193
PyQgsTextFormatWidget
229-
PyQgsTreeWidgetItem
230-
PyQgsUnitTypes
231194
PyQgsValidityChecks
232195
PyQgsValidityResultsWidget
233196
PyQgsVectorFieldMarkerSymbolLayer
234197
PyQgsVectorFileWriter
235198
PyQgsVectorLayer
236199
PyQgsVectorLayerElevationProperties
237-
PyQgsVectorLayerFeatureCounter
238200
PyQgsVectorLayerCache
239201
PyQgsVectorLayerEditBuffer
240202
PyQgsVectorLayerEditUtils
@@ -249,7 +211,6 @@ PyQgsVirtualLayerDefinition
249211
PyQgsLayerDefinition
250212
PyQgsWFSProvider
251213
PyQgsOapifProvider
252-
PyQgsConsole
253214
PyQgsDBManagerGpkg
254215
PyQgsDBManagerSpatialite
255216
PyQgsFileDownloader
@@ -261,7 +222,6 @@ PyQgsFieldValidator
261222
PyQgsDBManagerSQLWindow
262223
PyQgsSelectiveMasking
263224
PyQgsRasterAttributeTableWidget
264-
PyQgsServerWMS
265225
PyQgsServerApi
266226
PyQgsServerWMSGetFeatureInfo
267227
PyQgsServerWMSGetMap
@@ -277,7 +237,6 @@ PyQgsServerAccessControlWFSTransactional
277237
PyQgsServerCacheManager
278238
PyQgsServerWFS
279239
PyQgsServerWFST
280-
PyQgsServerLocaleOverride
281240
PyQgsAuthManagerPasswordOWSTest
282241
PyQgsServerServices
283242
PyQgsArcGisPortalUtils
@@ -325,15 +284,11 @@ ProcessingGrass7AlgorithmsRasterTestPt1
325284
ProcessingGrass7AlgorithmsRasterTestPt2
326285
ProcessingGrass7AlgorithmsVectorTest
327286
ProcessingOtbAlgorithmsTest
328-
PyCoreAdditions
329287
PyPythonRepr
330288
TestQgsRandomMarkerSymbolLayer
331289
ProcessingToolsTest
332-
test_app_qgisapppython
333290
PyQgsCesium3dTilesLayer
334291
PyQgsCoordinateReferenceSystemModel
335-
PyQgsFilledLineSymbolLayer
336-
PyQgsPainting
337292
PyQgsProviderRegistry
338293
PyQgsTiledSceneLayer
339294
PyQgsTiledSceneTile

.docker/qgis3-qt6-build-deps.dockerfile

+2
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,8 @@ RUN dnf -y --refresh install \
3737
protobuf-devel \
3838
protobuf-lite-devel \
3939
python3-devel \
40+
python3-mock \
41+
python3-OWSLib \
4042
python3-pyqt6 \
4143
python3-pyqt6-devel \
4244
python3-qscintilla-qt6 \

python/3d/3d_auto.sip

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
%Include auto_generated/qgs3dmapscene.sip
55
%Include auto_generated/qgs3dmapsettings.sip
66
%Include auto_generated/qgs3dtypes.sip
7-
%Include auto_generated/qgs3dwindow.sip
7+
%Include auto_generated/qgs3dmapcanvas.sip
88
%Include auto_generated/qgsabstractvectorlayer3drenderer.sip
99
%Include auto_generated/qgscameracontroller.sip
1010
%Include auto_generated/qgscamerapose.sip

python/3d/auto_generated/qgs3dwindow.sip.in python/3d/auto_generated/qgs3dmapcanvas.sip.in

+28-8
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/************************************************************************
22
* This file has been generated automatically from *
33
* *
4-
* src/3d/qgs3dwindow.h *
4+
* src/3d/qgs3dmapcanvas.h *
55
* *
66
* Do not edit manually ! Edit header and run scripts/sipify.pl again *
77
************************************************************************/
@@ -11,10 +11,12 @@
1111

1212

1313

14-
class Qgs3DWindow : QWindow
14+
15+
16+
class Qgs3DMapCanvas : QWindow
1517
{
1618
%Docstring(signature="appended")
17-
qgs3dWindow is a convenience wrapper to simplify the creation of a 3D window ready to be used with QGIS.
19+
Qgs3DMapCanvas is a convenience wrapper to simplify the creation of a 3D window ready to be used with QGIS.
1820

1921
.. note::
2022

@@ -32,16 +34,31 @@ qgs3dWindow is a convenience wrapper to simplify the creation of a 3D window rea
3234
%End
3335

3436
%TypeHeaderCode
35-
#include "qgs3dwindow.h"
37+
#include "qgs3dmapcanvas.h"
3638
%End
3739
public:
3840

39-
Qgs3DWindow();
41+
Qgs3DMapCanvas();
4042
%Docstring
41-
Constructor for Qgs3DWindow.
43+
Constructor for Qgs3DMapCanvas.
4244
%End
4345

44-
~Qgs3DWindow();
46+
~Qgs3DMapCanvas();
47+
48+
Qgs3DMapSettings *mapSettings();
49+
%Docstring
50+
Returns access to the 3D scene configuration
51+
%End
52+
53+
Qgs3DMapScene *scene();
54+
%Docstring
55+
Returns access to the 3D scene (root 3D entity)
56+
%End
57+
58+
QgsCameraController *cameraController();
59+
%Docstring
60+
Returns access to the view's camera controller. Returns ``None`` if the scene has not been initialized yet with :py:func:`~Qgs3DMapCanvas.setMapSettings`
61+
%End
4562

4663

4764
protected:
@@ -58,12 +75,15 @@ Manages the display events specified in e.
5875
Resets the aspect ratio of the 3D window.
5976
%End
6077

78+
virtual bool eventFilter( QObject *watched, QEvent *event );
79+
80+
6181
};
6282

6383
/************************************************************************
6484
* This file has been generated automatically from *
6585
* *
66-
* src/3d/qgs3dwindow.h *
86+
* src/3d/qgs3dmapcanvas.h *
6787
* *
6888
* Do not edit manually ! Edit header and run scripts/sipify.pl again *
6989
************************************************************************/

python/3d/auto_generated/qgs3dmapscene.sip.in

+4-1
Original file line numberDiff line numberDiff line change
@@ -120,14 +120,17 @@ Returns the 3D map settings.
120120
.. versionadded:: 3.30
121121
%End
122122

123-
static QMap< QString, Qgs3DMapScene * > openScenes();
123+
static QMap< QString, Qgs3DMapScene * > openScenes() /Deprecated/;
124124
%Docstring
125125
Returns a map of 3D map scenes (by name) open in the QGIS application.
126126

127127
.. note::
128128

129129
Only available from the QGIS desktop application.
130130

131+
.. deprecated:: QGIS 3.36
132+
use QgisAppInterface.mapCanvases3D() instead.
133+
131134
.. versionadded:: 3.30
132135
%End
133136

python/PyQt6/3d/3d_auto.sip

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
%Include auto_generated/qgs3dmapscene.sip
55
%Include auto_generated/qgs3dmapsettings.sip
66
%Include auto_generated/qgs3dtypes.sip
7-
%Include auto_generated/qgs3dwindow.sip
7+
%Include auto_generated/qgs3dmapcanvas.sip
88
%Include auto_generated/qgsabstractvectorlayer3drenderer.sip
99
%Include auto_generated/qgscameracontroller.sip
1010
%Include auto_generated/qgscamerapose.sip

python/PyQt6/3d/auto_generated/qgs3dwindow.sip.in python/PyQt6/3d/auto_generated/qgs3dmapcanvas.sip.in

+28-8
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/************************************************************************
22
* This file has been generated automatically from *
33
* *
4-
* src/3d/qgs3dwindow.h *
4+
* src/3d/qgs3dmapcanvas.h *
55
* *
66
* Do not edit manually ! Edit header and run scripts/sipify.pl again *
77
************************************************************************/
@@ -11,10 +11,12 @@
1111

1212

1313

14-
class Qgs3DWindow : QWindow
14+
15+
16+
class Qgs3DMapCanvas : QWindow
1517
{
1618
%Docstring(signature="appended")
17-
qgs3dWindow is a convenience wrapper to simplify the creation of a 3D window ready to be used with QGIS.
19+
Qgs3DMapCanvas is a convenience wrapper to simplify the creation of a 3D window ready to be used with QGIS.
1820

1921
.. note::
2022

@@ -32,16 +34,31 @@ qgs3dWindow is a convenience wrapper to simplify the creation of a 3D window rea
3234
%End
3335

3436
%TypeHeaderCode
35-
#include "qgs3dwindow.h"
37+
#include "qgs3dmapcanvas.h"
3638
%End
3739
public:
3840

39-
Qgs3DWindow();
41+
Qgs3DMapCanvas();
4042
%Docstring
41-
Constructor for Qgs3DWindow.
43+
Constructor for Qgs3DMapCanvas.
4244
%End
4345

44-
~Qgs3DWindow();
46+
~Qgs3DMapCanvas();
47+
48+
Qgs3DMapSettings *mapSettings();
49+
%Docstring
50+
Returns access to the 3D scene configuration
51+
%End
52+
53+
Qgs3DMapScene *scene();
54+
%Docstring
55+
Returns access to the 3D scene (root 3D entity)
56+
%End
57+
58+
QgsCameraController *cameraController();
59+
%Docstring
60+
Returns access to the view's camera controller. Returns ``None`` if the scene has not been initialized yet with :py:func:`~Qgs3DMapCanvas.setMapSettings`
61+
%End
4562

4663

4764
protected:
@@ -58,12 +75,15 @@ Manages the display events specified in e.
5875
Resets the aspect ratio of the 3D window.
5976
%End
6077

78+
virtual bool eventFilter( QObject *watched, QEvent *event );
79+
80+
6181
};
6282

6383
/************************************************************************
6484
* This file has been generated automatically from *
6585
* *
66-
* src/3d/qgs3dwindow.h *
86+
* src/3d/qgs3dmapcanvas.h *
6787
* *
6888
* Do not edit manually ! Edit header and run scripts/sipify.pl again *
6989
************************************************************************/

0 commit comments

Comments
 (0)