Add method to determine compatible vector layer types for a 3d symbol

qgis · Jul 29, 2020 · 93022ea · 93022ea
1 parent 680e095
commit 93022ea
Show file tree

Hide file tree

Showing 12 changed files with 43 additions and 0 deletions.
diff --git a/python/3d/auto_generated/symbols/qgsline3dsymbol.sip.in b/python/3d/auto_generated/symbols/qgsline3dsymbol.sip.in
@@ -48,6 +48,8 @@ Caller takes ownership of the returned symbol.
 
     virtual void readXml( const QDomElement &elem, const QgsReadWriteContext &context );
 
+    virtual QList< QgsWkbTypes::GeometryType > compatibleGeometryTypes() const;
+
 
     Qgs3DTypes::AltitudeClamping altitudeClamping() const;
 %Docstring

diff --git a/python/3d/auto_generated/symbols/qgspoint3dsymbol.sip.in b/python/3d/auto_generated/symbols/qgspoint3dsymbol.sip.in
@@ -53,6 +53,8 @@ Caller takes ownership of the returned symbol.
 
     virtual void readXml( const QDomElement &elem, const QgsReadWriteContext &context );
 
+    virtual QList< QgsWkbTypes::GeometryType > compatibleGeometryTypes() const;
+
 
     Qgs3DTypes::AltitudeClamping altitudeClamping() const;
 %Docstring

diff --git a/python/3d/auto_generated/symbols/qgspolygon3dsymbol.sip.in b/python/3d/auto_generated/symbols/qgspolygon3dsymbol.sip.in
@@ -42,6 +42,8 @@ Constructor for QgsPolygon3DSymbol
 
     virtual void readXml( const QDomElement &elem, const QgsReadWriteContext &context );
 
+    virtual QList< QgsWkbTypes::GeometryType > compatibleGeometryTypes() const;
+
 
     static QgsAbstract3DSymbol *create() /Factory/;
 %Docstring

diff --git a/python/core/auto_generated/3d/qgsabstract3dsymbol.sip.in b/python/core/auto_generated/3d/qgsabstract3dsymbol.sip.in
@@ -54,6 +54,13 @@ Writes symbol configuration to the given DOM element
     virtual void readXml( const QDomElement &elem, const QgsReadWriteContext &context ) = 0;
 %Docstring
 Reads symbol configuration from the given DOM element
+%End
+
+    virtual QList< QgsWkbTypes::GeometryType > compatibleGeometryTypes() const;
+%Docstring
+Returns the list of the vector layer geometry types which are compatible with this symbol.
+
+.. versionadded:: 3.16
 %End
 
     enum Property

diff --git a/src/3d/symbols/qgsline3dsymbol.cpp b/src/3d/symbols/qgsline3dsymbol.cpp
@@ -94,6 +94,11 @@ void QgsLine3DSymbol::setMaterial( QgsAbstractMaterialSettings *material )
   mMaterial.reset( material );
 }
 
+QList<QgsWkbTypes::GeometryType> QgsLine3DSymbol::compatibleGeometryTypes() const
+{
+  return QList< QgsWkbTypes::GeometryType >() << QgsWkbTypes::LineGeometry;
+}
+
 QgsAbstract3DSymbol *QgsLine3DSymbol::create()
 {
   return new QgsLine3DSymbol();

diff --git a/src/3d/symbols/qgsline3dsymbol.h b/src/3d/symbols/qgsline3dsymbol.h
@@ -51,6 +51,7 @@ class _3D_EXPORT QgsLine3DSymbol : public QgsAbstract3DSymbol SIP_NODEFAULTCTORS
 
     void writeXml( QDomElement &elem, const QgsReadWriteContext &context ) const override;
     void readXml( const QDomElement &elem, const QgsReadWriteContext &context ) override;
+    QList< QgsWkbTypes::GeometryType > compatibleGeometryTypes() const override;
 
     //! Returns method that determines altitude (whether to clamp to feature to terrain)
     Qgs3DTypes::AltitudeClamping altitudeClamping() const { return mAltClamping; }

diff --git a/src/3d/symbols/qgspoint3dsymbol.cpp b/src/3d/symbols/qgspoint3dsymbol.cpp
@@ -109,6 +109,11 @@ void QgsPoint3DSymbol::readXml( const QDomElement &elem, const QgsReadWriteConte
   setBillboardSymbol( QgsSymbolLayerUtils::loadSymbol< QgsMarkerSymbol >( symbolElem, context ) );
 }
 
+QList<QgsWkbTypes::GeometryType> QgsPoint3DSymbol::compatibleGeometryTypes() const
+{
+  return QList< QgsWkbTypes::GeometryType >() << QgsWkbTypes::PointGeometry;
+}
+
 QgsPoint3DSymbol::Shape QgsPoint3DSymbol::shapeFromString( const QString &shape )
 {
   if ( shape ==  QStringLiteral( "sphere" ) )

diff --git a/src/3d/symbols/qgspoint3dsymbol.h b/src/3d/symbols/qgspoint3dsymbol.h
@@ -56,6 +56,7 @@ class _3D_EXPORT QgsPoint3DSymbol : public QgsAbstract3DSymbol SIP_NODEFAULTCTOR
 
     void writeXml( QDomElement &elem, const QgsReadWriteContext &context ) const override;
     void readXml( const QDomElement &elem, const QgsReadWriteContext &context ) override;
+    QList< QgsWkbTypes::GeometryType > compatibleGeometryTypes() const override;
 
     //! Returns method that determines altitude (whether to clamp to feature to terrain)
     Qgs3DTypes::AltitudeClamping altitudeClamping() const { return mAltClamping; }

diff --git a/src/3d/symbols/qgspolygon3dsymbol.cpp b/src/3d/symbols/qgspolygon3dsymbol.cpp
@@ -114,6 +114,11 @@ void QgsPolygon3DSymbol::readXml( const QDomElement &elem, const QgsReadWriteCon
   }
 }
 
+QList<QgsWkbTypes::GeometryType> QgsPolygon3DSymbol::compatibleGeometryTypes() const
+{
+  return QList< QgsWkbTypes::GeometryType >() << QgsWkbTypes::PolygonGeometry;
+}
+
 QgsAbstract3DSymbol *QgsPolygon3DSymbol::create()
 {
   return new QgsPolygon3DSymbol();

diff --git a/src/3d/symbols/qgspolygon3dsymbol.h b/src/3d/symbols/qgspolygon3dsymbol.h
@@ -46,6 +46,7 @@ class _3D_EXPORT QgsPolygon3DSymbol : public QgsAbstract3DSymbol SIP_NODEFAULTCT
 
     void writeXml( QDomElement &elem, const QgsReadWriteContext &context ) const override;
     void readXml( const QDomElement &elem, const QgsReadWriteContext &context ) override;
+    QList< QgsWkbTypes::GeometryType > compatibleGeometryTypes() const override;
 
     /**
      * Creates a new QgsPolygon3DSymbol.

diff --git a/src/core/3d/qgsabstract3dsymbol.cpp b/src/core/3d/qgsabstract3dsymbol.cpp
@@ -19,6 +19,11 @@
 QgsPropertiesDefinition QgsAbstract3DSymbol::sPropertyDefinitions;
 
 
+QList<QgsWkbTypes::GeometryType> QgsAbstract3DSymbol::compatibleGeometryTypes() const
+{
+  return QList< QgsWkbTypes::GeometryType >();
+}
+
 const QgsPropertiesDefinition &QgsAbstract3DSymbol::propertyDefinitions()
 {
   initPropertyDefinitions();

diff --git a/src/core/3d/qgsabstract3dsymbol.h b/src/core/3d/qgsabstract3dsymbol.h
@@ -55,6 +55,13 @@ class CORE_EXPORT QgsAbstract3DSymbol
     //! Reads symbol configuration from the given DOM element
     virtual void readXml( const QDomElement &elem, const QgsReadWriteContext &context ) = 0;
 
+    /**
+     * Returns the list of the vector layer geometry types which are compatible with this symbol.
+     *
+     * \since QGIS 3.16
+     */
+    virtual QList< QgsWkbTypes::GeometryType > compatibleGeometryTypes() const;
+
     //! Data definable properties.
     enum Property
     {