Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[3D] Add support for data defined properties of points #57929

Open
wants to merge 17 commits into
base: master
Choose a base branch
from
Open

[3D] Add support for data defined properties of points #57929

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
fff3288
qgspoint3dsymbol_p: Fix a clang-tidy warning
ptitjano Jun 9, 2024
7d47f24
qgsabstract3dsymbol: Add radius symbol definition
ptitjano Jun 9, 2024
df8e493
qgspoint3dsymbol: Add support for data defined radius
ptitjano Jun 9, 2024
016e755
qgspoint3dsymbolwidget: Add support for data defined radius
ptitjano Jun 9, 2024
0c0a500
qgsabstract3dsymbol: Add length symbol definition
ptitjano Jun 9, 2024
be6e0b2
qgspoint3dsymbol: Add support for data defined length
ptitjano Jun 9, 2024
7c229b0
qgspoint3dsymbolwidget: Add support for data defined length
ptitjano Jun 9, 2024
03d2338
qgsabstract3dsymbol: Add size symbol definition
ptitjano Jun 9, 2024
480fdc5
qgspoint3dsymbol: Add support for data defined size
ptitjano Jun 9, 2024
44f7fd7
qgspoint3dsymbolwidget: Add support for data defined size
ptitjano Jun 9, 2024
3543d95
qgsabstract3dsymbol: Add bottom/top radius symbol definition
ptitjano Jun 9, 2024
8f6cdae
qgspoint3dsymbol: Add support for data defined bottom/top radius
ptitjano Jun 9, 2024
592244b
qgspoint3dsymbolwidget: Add support for data defined bottom/top radius
ptitjano Jun 9, 2024
f28c724
qgsabstract3dsymbol: Add minor radius symbol definition
ptitjano Jun 9, 2024
2ef348a
qgspoint3dsymbol: Add support for data defined minor radius
ptitjano Jun 9, 2024
db63491
qgspoint3dsymbolwidget: Add support for data defined minor radius
ptitjano Jun 9, 2024
c5cc462
qgspoint3dsymbol_p: Add comments to instanced handler functions
ptitjano Jun 28, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 25 additions & 1 deletion python/PyQt6/core/auto_additions/qgsabstract3dsymbol.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,5 +8,29 @@
QgsAbstract3DSymbol.Property.PropertyExtrusionHeight = QgsAbstract3DSymbol.Property.ExtrusionHeight
QgsAbstract3DSymbol.PropertyExtrusionHeight.is_monkey_patched = True
QgsAbstract3DSymbol.PropertyExtrusionHeight.__doc__ = "Extrusion height (zero means no extrusion)"
QgsAbstract3DSymbol.Property.__doc__ = "Data definable properties.\n\n" + '* ``PropertyHeight``: ' + QgsAbstract3DSymbol.Property.Height.__doc__ + '\n' + '* ``PropertyExtrusionHeight``: ' + QgsAbstract3DSymbol.Property.ExtrusionHeight.__doc__
QgsAbstract3DSymbol.PropertyLength = QgsAbstract3DSymbol.Property.Length
QgsAbstract3DSymbol.Property.PropertyLength = QgsAbstract3DSymbol.Property.Length
QgsAbstract3DSymbol.PropertyLength.is_monkey_patched = True
QgsAbstract3DSymbol.PropertyLength.__doc__ = "Length"
QgsAbstract3DSymbol.PropertyRadius = QgsAbstract3DSymbol.Property.Radius
QgsAbstract3DSymbol.Property.PropertyRadius = QgsAbstract3DSymbol.Property.Radius
QgsAbstract3DSymbol.PropertyRadius.is_monkey_patched = True
QgsAbstract3DSymbol.PropertyRadius.__doc__ = "Radius"
QgsAbstract3DSymbol.PropertyHeight = QgsAbstract3DSymbol.Property.BottomRadius
QgsAbstract3DSymbol.Property.PropertyHeight = QgsAbstract3DSymbol.Property.BottomRadius
QgsAbstract3DSymbol.PropertyHeight.is_monkey_patched = True
QgsAbstract3DSymbol.PropertyHeight.__doc__ = "Bottom Radius"
QgsAbstract3DSymbol.PropertySize = QgsAbstract3DSymbol.Property.MinorRadius
QgsAbstract3DSymbol.Property.PropertySize = QgsAbstract3DSymbol.Property.MinorRadius
QgsAbstract3DSymbol.PropertySize.is_monkey_patched = True
QgsAbstract3DSymbol.PropertySize.__doc__ = "Minor Radius"
QgsAbstract3DSymbol.PropertyHeight = QgsAbstract3DSymbol.Property.TopRadius
QgsAbstract3DSymbol.Property.PropertyHeight = QgsAbstract3DSymbol.Property.TopRadius
QgsAbstract3DSymbol.PropertyHeight.is_monkey_patched = True
QgsAbstract3DSymbol.PropertyHeight.__doc__ = "Top Radius"
QgsAbstract3DSymbol.PropertySize = QgsAbstract3DSymbol.Property.Size
QgsAbstract3DSymbol.Property.PropertySize = QgsAbstract3DSymbol.Property.Size
QgsAbstract3DSymbol.PropertySize.is_monkey_patched = True
QgsAbstract3DSymbol.PropertySize.__doc__ = "Size"
QgsAbstract3DSymbol.Property.__doc__ = "Data definable properties.\n\n" + '* ``PropertyHeight``: ' + QgsAbstract3DSymbol.Property.Height.__doc__ + '\n' + '* ``PropertyExtrusionHeight``: ' + QgsAbstract3DSymbol.Property.ExtrusionHeight.__doc__ + '\n' + '* ``PropertyLength``: ' + QgsAbstract3DSymbol.Property.Length.__doc__ + '\n' + '* ``PropertyRadius``: ' + QgsAbstract3DSymbol.Property.Radius.__doc__ + '\n' + '* ``PropertyHeight``: ' + QgsAbstract3DSymbol.Property.BottomRadius.__doc__ + '\n' + '* ``PropertySize``: ' + QgsAbstract3DSymbol.Property.MinorRadius.__doc__ + '\n' + '* ``PropertyHeight``: ' + QgsAbstract3DSymbol.Property.TopRadius.__doc__ + '\n' + '* ``PropertySize``: ' + QgsAbstract3DSymbol.Property.Size.__doc__
# --
6 changes: 6 additions & 0 deletions python/PyQt6/core/auto_generated/3d/qgsabstract3dsymbol.sip.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,12 @@ Returns the list of the vector layer geometry types which are compatible with th
{
Height,
ExtrusionHeight,
Length,
Radius,
BottomRadius,
MinorRadius,
TopRadius,
Size,
};

static const QgsPropertiesDefinition &propertyDefinitions();
Expand Down
26 changes: 25 additions & 1 deletion python/core/auto_additions/qgsabstract3dsymbol.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,5 +8,29 @@
QgsAbstract3DSymbol.Property.PropertyExtrusionHeight = QgsAbstract3DSymbol.Property.ExtrusionHeight
QgsAbstract3DSymbol.PropertyExtrusionHeight.is_monkey_patched = True
QgsAbstract3DSymbol.PropertyExtrusionHeight.__doc__ = "Extrusion height (zero means no extrusion)"
QgsAbstract3DSymbol.Property.__doc__ = "Data definable properties.\n\n" + '* ``PropertyHeight``: ' + QgsAbstract3DSymbol.Property.Height.__doc__ + '\n' + '* ``PropertyExtrusionHeight``: ' + QgsAbstract3DSymbol.Property.ExtrusionHeight.__doc__
QgsAbstract3DSymbol.PropertyLength = QgsAbstract3DSymbol.Property.Length
QgsAbstract3DSymbol.Property.PropertyLength = QgsAbstract3DSymbol.Property.Length
QgsAbstract3DSymbol.PropertyLength.is_monkey_patched = True
QgsAbstract3DSymbol.PropertyLength.__doc__ = "Length"
QgsAbstract3DSymbol.PropertyRadius = QgsAbstract3DSymbol.Property.Radius
QgsAbstract3DSymbol.Property.PropertyRadius = QgsAbstract3DSymbol.Property.Radius
QgsAbstract3DSymbol.PropertyRadius.is_monkey_patched = True
QgsAbstract3DSymbol.PropertyRadius.__doc__ = "Radius"
QgsAbstract3DSymbol.PropertyHeight = QgsAbstract3DSymbol.Property.BottomRadius
QgsAbstract3DSymbol.Property.PropertyHeight = QgsAbstract3DSymbol.Property.BottomRadius
QgsAbstract3DSymbol.PropertyHeight.is_monkey_patched = True
QgsAbstract3DSymbol.PropertyHeight.__doc__ = "Bottom Radius"
QgsAbstract3DSymbol.PropertySize = QgsAbstract3DSymbol.Property.MinorRadius
QgsAbstract3DSymbol.Property.PropertySize = QgsAbstract3DSymbol.Property.MinorRadius
QgsAbstract3DSymbol.PropertySize.is_monkey_patched = True
QgsAbstract3DSymbol.PropertySize.__doc__ = "Minor Radius"
QgsAbstract3DSymbol.PropertyHeight = QgsAbstract3DSymbol.Property.TopRadius
QgsAbstract3DSymbol.Property.PropertyHeight = QgsAbstract3DSymbol.Property.TopRadius
QgsAbstract3DSymbol.PropertyHeight.is_monkey_patched = True
QgsAbstract3DSymbol.PropertyHeight.__doc__ = "Top Radius"
QgsAbstract3DSymbol.PropertySize = QgsAbstract3DSymbol.Property.Size
QgsAbstract3DSymbol.Property.PropertySize = QgsAbstract3DSymbol.Property.Size
QgsAbstract3DSymbol.PropertySize.is_monkey_patched = True
QgsAbstract3DSymbol.PropertySize.__doc__ = "Size"
QgsAbstract3DSymbol.Property.__doc__ = "Data definable properties.\n\n" + '* ``PropertyHeight``: ' + QgsAbstract3DSymbol.Property.Height.__doc__ + '\n' + '* ``PropertyExtrusionHeight``: ' + QgsAbstract3DSymbol.Property.ExtrusionHeight.__doc__ + '\n' + '* ``PropertyLength``: ' + QgsAbstract3DSymbol.Property.Length.__doc__ + '\n' + '* ``PropertyRadius``: ' + QgsAbstract3DSymbol.Property.Radius.__doc__ + '\n' + '* ``PropertyHeight``: ' + QgsAbstract3DSymbol.Property.BottomRadius.__doc__ + '\n' + '* ``PropertySize``: ' + QgsAbstract3DSymbol.Property.MinorRadius.__doc__ + '\n' + '* ``PropertyHeight``: ' + QgsAbstract3DSymbol.Property.TopRadius.__doc__ + '\n' + '* ``PropertySize``: ' + QgsAbstract3DSymbol.Property.Size.__doc__
# --
6 changes: 6 additions & 0 deletions python/core/auto_generated/3d/qgsabstract3dsymbol.sip.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,12 @@ Returns the list of the vector layer geometry types which are compatible with th
{
Height,
ExtrusionHeight,
Length,
Radius,
BottomRadius,
MinorRadius,
TopRadius,
Size,
};

static const QgsPropertiesDefinition &propertyDefinitions();
Expand Down
8 changes: 8 additions & 0 deletions src/3d/symbols/qgspoint3dsymbol.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,6 +88,10 @@ void QgsPoint3DSymbol::writeXml( QDomElement &elem, const QgsReadWriteContext &c

elem.appendChild( symbolElem );
}

QDomElement elemDDP = doc.createElement( QStringLiteral( "data-defined-properties" ) );
mDataDefinedProperties.writeXml( elemDDP, propertyDefinitions() );
elem.appendChild( elemDDP );
}

void QgsPoint3DSymbol::readXml( const QDomElement &elem, const QgsReadWriteContext &context )
Expand All @@ -114,6 +118,10 @@ void QgsPoint3DSymbol::readXml( const QDomElement &elem, const QgsReadWriteConte
const QDomElement symbolElem = elem.firstChildElement( QStringLiteral( "symbol" ) );

setBillboardSymbol( QgsSymbolLayerUtils::loadSymbol< QgsMarkerSymbol >( symbolElem, context ) );

const QDomElement elemDDP = elem.firstChildElement( QStringLiteral( "data-defined-properties" ) );
if ( !elemDDP.isNull() )
mDataDefinedProperties.readXml( elemDDP, propertyDefinitions() );
}

QList<Qgis::GeometryType> QgsPoint3DSymbol::compatibleGeometryTypes() const
Expand Down
Loading
Loading