Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Move QgsAbstract3DSymbol to core
  • Loading branch information
nyalldawson committed Jul 22, 2020
1 parent aa93872 commit f60b79f
Show file tree
Hide file tree
Showing 9 changed files with 15 additions and 9 deletions.
1 change: 0 additions & 1 deletion python/3d/3d_auto.sip
Expand Up @@ -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
@@ -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 *
************************************************************************/
Expand All @@ -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

Expand Down Expand Up @@ -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 change: 0 additions & 1 deletion python/core/auto_generated/symbology/qgsstyle.sip.in
Expand Up @@ -11,7 +11,6 @@




typedef QMap<QString, QgsColorRamp * > QgsVectorColorRampMap;
typedef QMap<int, QString> QgsSymbolGroupMap;

Expand Down
1 change: 1 addition & 0 deletions python/core/core_auto.sip
Expand Up @@ -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
Expand Down
2 changes: 0 additions & 2 deletions src/3d/CMakeLists.txt
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
File renamed without changes.
Expand Up @@ -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"
Expand All @@ -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;
Expand Down
2 changes: 2 additions & 0 deletions src/core/CMakeLists.txt
Expand Up @@ -654,6 +654,7 @@ SET(QGIS_CORE_SRCS
geometry/qgswkbtypes.cpp

3d/qgs3drendererregistry.cpp
3d/qgsabstract3dsymbol.cpp
3d/qgsabstract3drenderer.cpp

fieldformatter/qgscheckboxfieldformatter.cpp
Expand Down Expand Up @@ -1032,6 +1033,7 @@ SET(QGIS_CORE_HDRS
qobjectuniqueptr.h

3d/qgs3drendererregistry.h
3d/qgsabstract3dsymbol.h
3d/qgsabstract3drenderer.h

annotations/qgsannotation.h
Expand Down
2 changes: 1 addition & 1 deletion src/core/symbology/qgsstyle.h
Expand Up @@ -34,7 +34,7 @@ class QgsSymbol;
class QgsSymbolLayer;
class QgsColorRamp;
class QgsStyleEntityInterface;

class QgsAbstract3DSymbol;
class QDomDocument;
class QDomElement;

Expand Down

0 comments on commit f60b79f

Please sign in to comment.