Handle conditional visibility of data defined size legend nodes #57461
Conversation
uclaros
added
the
Bug
Tests failed for Qt 6One or more tests failed using the build from commit 108aa23 legend_data_defined_size_separated (testDataDefinedSizeSeparated)legend_data_defined_size_separatedTest failed at _verifyImage at tests/src/core/testqgslegendrenderer.cpp:225 Rendered image did not match tests/testdata/control_images/legend/expected_legend_data_defined_size_separated/expected_legend_data_defined_size_separated.png (found 3540 pixels different) legend_data_defined_size_filter_by_map (testDataDefinedSizeCollapsedFilterByMap)legend_data_defined_size_filter_by_mapTest failed at _verifyImage at tests/src/core/testqgslegendrenderer.cpp:225 Rendered image did not match tests/testdata/control_images/legend/expected_legend_data_defined_size_filter_by_map/expected_legend_data_defined_size_filter_by_map.png (found 347 pixels different) legend_data_defined_size_filter_by_map (testDataDefinedSizeSeparatedFilterByMap)legend_data_defined_size_filter_by_mapTest failed at _verifyImage at tests/src/core/testqgslegendrenderer.cpp:225 Rendered image did not match tests/testdata/control_images/legend/expected_legend_data_defined_size_filter_by_map/expected_legend_data_defined_size_filter_by_map.png (found 347 pixels different) The full test report (included comparison of rendered vs expected images) can be found here. Further documentation on the QGIS test infrastructure can be found in the Developer's Guide. |
| @@ -126,7 +126,8 @@ QgsLegendSymbolList QgsDataDefinedSizeLegend::legendSymbolList() const | |||
| QgsLegendSymbolList lst; | |||
| if ( !mTitleLabel.isEmpty() ) | |||
| { | |||
| QgsLegendSymbolItem title( nullptr, mTitleLabel, QString() ); | |||
| // we're abusing the ruleKey field here so we can later identify the resulting legend nodes as data defined size related | |||
| QgsLegendSymbolItem title( nullptr, mTitleLabel, QStringLiteral( "data-defined-size" ) ); | |||
There was a problem hiding this comment.
instead of the abuse, how about we add a QMap< int, QVariant > userData to QgsLegendSymbolItem, and adapt QgsSymbolLegendNode::data to return those values for unknown roles.
There was a problem hiding this comment.
We could have a new role in QgsLayerTreeModelLegendNode::CustomRole for that, instead of handling all unknown roles.
But, why a QMap< int, QVariant >? What would you store there (in this case and/or in future uses of it)?
There was a problem hiding this comment.
We could have a new role in QgsLayerTreeModelLegendNode::CustomRole for that, instead of handling all unknown roles.
That also works. I was just thinking ahead if allowing custom roles in QgsLegendSymbolItem would also be useful in future.
But, why a QMap< int, QVariant >? What would you store there (in this case and/or in future uses of it)?
The int keys would correspond to a role from QgsLayerTreeModelLegendNode (either public or private). I'd find a QMap approach slightly preferable to having separate members for every property we decide to add in future.
Description
This PR Fixes #50301
The solution is a little hacky.
Would it make more sense to have
QgsDataDefinedSizeLegendNodeclass also handle the rendering of the data defined size label and also individual classes, instead of having separateQgsSymbolLegendNodes for them?