sharpetronics/QGIS
1
0
Fork 0
mirror of https://github.com/qgis/QGIS.git synced 2025-10-07 00:15:48 -04:00
Code Issues Packages Projects Releases Wiki Activity

Move QgsAbstract3DSymbol to core

Browse Source
This commit is contained in:
Nyall Dawson 2020-07-14 19:01:02 +10:00
parent aa93872f0d
commit f60b79fcea
9 changed files with 15 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
python/3d/3d_auto.sip
View File

@ -11,7 +11,6 @@
%Include auto_generated/qgsdirectionallightsettings.sip
%Include auto_generated/qgsrulebased3drenderer.sip
%Include auto_generated/qgsvectorlayer3drenderer.sip
%Include auto_generated/symbols/qgsabstract3dsymbol.sip
%Include auto_generated/symbols/qgsline3dsymbol.sip
%Include auto_generated/symbols/qgspoint3dsymbol.sip
%Include auto_generated/symbols/qgspolygon3dsymbol.sip

9
python/3d/auto_generated/symbols/qgsabstract3dsymbol.sip.in → python/core/auto_generated/3d/qgsabstract3dsymbol.sip.in
View File

@ -1,7 +1,7 @@
/************************************************************************
* This file has been generated automatically from *
* *
* src/3d/symbols/qgsabstract3dsymbol.h *
* src/core/./3d/qgsabstract3dsymbol.h *
* *
* Do not edit manually ! Edit header and run scripts/sipify.pl again *
************************************************************************/
@ -24,6 +24,11 @@ Abstract base class for 3D symbols that are used by VectorLayer3DRenderer object
This is not considered stable API, and may change in future QGIS releases. It is
exposed to the Python bindings as a tech preview only.
.. note::
Prior to QGIS 3.16 this was available through the QGIS 3D library.
.. versionadded:: 3.0
%End
@ -81,7 +86,7 @@ Sets the symbol layer's property collection, used for data defined overrides.
/************************************************************************
* This file has been generated automatically from *
* *
* src/3d/symbols/qgsabstract3dsymbol.h *
* src/core/./3d/qgsabstract3dsymbol.h *
* *
* Do not edit manually ! Edit header and run scripts/sipify.pl again *
************************************************************************/

1
python/core/auto_generated/symbology/qgsstyle.sip.in
View File

@ -11,7 +11,6 @@
typedef QMap<QString, QgsColorRamp * > QgsVectorColorRampMap;
typedef QMap<int, QString> QgsSymbolGroupMap;

1
python/core/core_auto.sip
View File

@ -251,6 +251,7 @@
%Include auto_generated/qgsxmlutils.sip
%Include auto_generated/qgsziputils.sip
%Include auto_generated/./3d/qgs3drendererregistry.sip
%Include auto_generated/./3d/qgsabstract3dsymbol.sip
%Include auto_generated/./3d/qgsabstract3drenderer.sip
%Include auto_generated/annotations/qgsannotation.sip
%Include auto_generated/annotations/qgsannotationmanager.sip

2
src/3d/CMakeLists.txt
View File

@ -37,7 +37,6 @@ SET(QGIS_3D_SRCS
processing/qgs3dalgorithms.cpp
processing/qgsalgorithmtessellate.cpp
symbols/qgsabstract3dsymbol.cpp
symbols/qgsbillboardgeometry.cpp
symbols/qgsline3dsymbol.cpp
symbols/qgsline3dsymbol_p.cpp
@ -96,7 +95,6 @@ SET(QGIS_3D_HDRS
qgstilingscheme.h
qgsvectorlayer3drenderer.h
qgswindow3dengine.h
symbols/qgsabstract3dsymbol.h
symbols/qgsbillboardgeometry.h
symbols/qgsline3dsymbol.h
symbols/qgsmesh3dsymbol.h

0
src/3d/symbols/qgsabstract3dsymbol.cpp → src/core/3d/qgsabstract3dsymbol.cpp
View File

6
src/3d/symbols/qgsabstract3dsymbol.h → src/core/3d/qgsabstract3dsymbol.h
View File

@ -16,7 +16,7 @@
#ifndef QGSABSTRACT3DSYMBOL_H
#define QGSABSTRACT3DSYMBOL_H
#include "qgis_3d.h"
#include "qgis_core.h"
#include "qgis_sip.h"
#include "qgspropertycollection.h"
@ -36,9 +36,11 @@ class QgsReadWriteContext;
* \warning This is not considered stable API, and may change in future QGIS releases. It is
* exposed to the Python bindings as a tech preview only.
*
* \note Prior to QGIS 3.16 this was available through the QGIS 3D library.
*
* \since QGIS 3.0
*/
class _3D_EXPORT QgsAbstract3DSymbol
class CORE_EXPORT QgsAbstract3DSymbol
{
public:
virtual ~QgsAbstract3DSymbol() = default;

2
src/core/CMakeLists.txt
View File

@ -654,6 +654,7 @@ SET(QGIS_CORE_SRCS
geometry/qgswkbtypes.cpp
3d/qgs3drendererregistry.cpp
3d/qgsabstract3dsymbol.cpp
3d/qgsabstract3drenderer.cpp
fieldformatter/qgscheckboxfieldformatter.cpp
@ -1032,6 +1033,7 @@ SET(QGIS_CORE_HDRS
qobjectuniqueptr.h
3d/qgs3drendererregistry.h
3d/qgsabstract3dsymbol.h
3d/qgsabstract3drenderer.h
annotations/qgsannotation.h

2
src/core/symbology/qgsstyle.h
View File

@ -34,7 +34,7 @@ class QgsSymbol;
class QgsSymbolLayer;
class QgsColorRamp;
class QgsStyleEntityInterface;
class QgsAbstract3DSymbol;
class QDomDocument;
class QDomElement;