sharpetronics/QGIS
1
0
Fork 0
mirror of https://github.com/qgis/QGIS.git synced 2025-02-25 00:58:06 -05:00
Code Issues Packages Projects Releases Wiki Activity

Add SIP_SKIP to QgsPolygon3DSymbol::exportGeometries and its overloads

Browse Source
This commit is contained in:
NEDJIMAbelgacem 2020-07-28 17:07:23 +01:00
parent a656da3b75
commit 750f21d467
9 changed files with 13 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
python/3d/auto_generated/symbols/qgsline3dsymbol.sip.in
View File

@ -115,12 +115,6 @@ Sets the ``material`` settings used for shading of the symbol.
Ownership of ``material`` is transferred to the symbol.
%End
virtual bool exportGeometries( Qgs3DSceneExporter *exporter, Qt3DCore::QEntity *entity, const QString &objectNamePrefix ) const;
%Docstring
Exports the geometries contained withing the hierarchy of entity.
Returns whether any objects were exported
%End
};

6
python/3d/auto_generated/symbols/qgspoint3dsymbol.sip.in
View File

@ -138,12 +138,6 @@ Sets transform for individual objects represented by the symbol
Returns transform for billboards
%End
virtual bool exportGeometries( Qgs3DSceneExporter *exporter, Qt3DCore::QEntity *entity, const QString &objectNamePrefix ) const;
%Docstring
Exports the geometries contained withing the hierarchy of entity.
Returns whether any objects were exported
%End
private:
QgsPoint3DSymbol &operator=( const QgsPoint3DSymbol & );
};

8
python/3d/auto_generated/symbols/qgspolygon3dsymbol.sip.in
View File

@ -186,14 +186,6 @@ Returns which facade of the buildings is rendered (0 for None, 1 for Walls, 2 fo
.. versionadded:: 3.16
%End
virtual bool exportGeometries( Qgs3DSceneExporter *exporter, Qt3DCore::QEntity *entity, const QString &objectNamePrefix ) const;
%Docstring
Exports the geometries contained withing the hierarchy of entity.
Returns whether any objects were exported
.. versionadded:: 3.16
%End
};

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

@ -10,9 +10,6 @@
namespace Qt3DCore
{
}
class QgsAbstract3DSymbol
@ -81,12 +78,6 @@ Returns a reference to the symbol layer's property collection, used for data def
Sets the symbol layer's property collection, used for data defined overrides.
%End
virtual bool exportGeometries( Qgs3DSceneExporter *exporter, Qt3DCore::QEntity *entity, const QString &objectNamePrefix ) const;
%Docstring
Exports the geometries contained withing the hierarchy of entity.
Returns whether any objects were exported
If this function is not overloaded we don't try to export anything
%End
protected:

2
src/3d/symbols/qgsline3dsymbol.h
View File

@ -96,7 +96,7 @@ class _3D_EXPORT QgsLine3DSymbol : public QgsAbstract3DSymbol SIP_NODEFAULTCTORS
* Exports the geometries contained withing the hierarchy of entity.
* Returns whether any objects were exported
*/
bool exportGeometries( Qgs3DSceneExporter *exporter, Qt3DCore::QEntity *entity, const QString &objectNamePrefix ) const override;
bool exportGeometries( Qgs3DSceneExporter *exporter, Qt3DCore::QEntity *entity, const QString &objectNamePrefix ) const override SIP_SKIP;
private:
//! how to handle altitude of vector features

2
src/3d/symbols/qgspoint3dsymbol.h
View File

@ -118,7 +118,7 @@ class _3D_EXPORT QgsPoint3DSymbol : public QgsAbstract3DSymbol SIP_NODEFAULTCTOR
* Exports the geometries contained withing the hierarchy of entity.
* Returns whether any objects were exported
*/
bool exportGeometries( Qgs3DSceneExporter *exporter, Qt3DCore::QEntity *entity, const QString &objectNamePrefix ) const override;
bool exportGeometries( Qgs3DSceneExporter *exporter, Qt3DCore::QEntity *entity, const QString &objectNamePrefix ) const override SIP_SKIP;
private:
//! how to handle altitude of vector features
Qgs3DTypes::AltitudeClamping mAltClamping = Qgs3DTypes::AltClampRelative;

2
src/3d/symbols/qgspolygon3dsymbol.h
View File

@ -159,7 +159,7 @@ class _3D_EXPORT QgsPolygon3DSymbol : public QgsAbstract3DSymbol SIP_NODEFAULTCT
* Returns whether any objects were exported
* \since QGIS 3.16
*/
bool exportGeometries( Qgs3DSceneExporter *exporter, Qt3DCore::QEntity *entity, const QString &objectNamePrefix ) const override;
bool exportGeometries( Qgs3DSceneExporter *exporter, Qt3DCore::QEntity *entity, const QString &objectNamePrefix ) const override SIP_SKIP;
private:
//! how to handle altitude of vector features

8
src/core/3d/qgsabstract3dsymbol.cpp
View File

@ -44,3 +44,11 @@ void QgsAbstract3DSymbol::initPropertyDefinitions()
};
}
bool QgsAbstract3DSymbol::exportGeometries( Qgs3DSceneExporter *exporter, Qt3DCore::QEntity *entity, const QString &objectNamePrefix ) const
{
Q_UNUSED( exporter );
Q_UNUSED( entity );
Q_UNUSED( objectNamePrefix );
return false;
}

13
src/core/3d/qgsabstract3dsymbol.h
View File

@ -26,10 +26,7 @@ class QString;
class QgsReadWriteContext;
class Qgs3DSceneExporter;
namespace Qt3DCore
{
class QEntity;
}
namespace Qt3DCore { class QEntity; } SIP_SKIP
/**
@ -84,13 +81,7 @@ class CORE_EXPORT QgsAbstract3DSymbol
* Returns whether any objects were exported
* If this function is not overloaded we don't try to export anything
*/
virtual bool exportGeometries( Qgs3DSceneExporter *exporter, Qt3DCore::QEntity *entity, const QString &objectNamePrefix ) const
{
Q_UNUSED( exporter );
Q_UNUSED( entity );
Q_UNUSED( objectNamePrefix );
return false;
}
virtual bool exportGeometries( Qgs3DSceneExporter *exporter, Qt3DCore::QEntity *entity, const QString &objectNamePrefix ) const SIP_SKIP;
protected: