sharpetronics/QGIS
1
0
Fork 0
mirror of https://github.com/qgis/QGIS.git synced 2025-04-14 00:07:35 -04:00
Code Issues Packages Projects Releases Wiki Activity

Removed unused QgsLayerTreeModelLegendNode::SymbolLegacyRuleKeyRole

Browse Source
This commit is contained in:
Nyall Dawson 2016-12-02 10:07:32 +10:00
parent 6d0203d612
commit 7de1cc2f13
5 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
doc/api_break.dox
View File

@ -1016,6 +1016,11 @@ QgsLayerTreeModel {#qgis_api_break_3_0_QgsLayerTreeMode}
- setAutoCollapseSymbologyNodes() was removed. Use setAutoCollapseLegendNodes() instead.
- autoCollapseSymbologyNodes() was removed. Use autoCollapseLegendNodes() instead.
QgsLayerTreeModelLegendNode {#qgis_api_break_3_0_QgsLayerTreeModelLegendNode}
---------------------------
- The SymbolLegacyRuleKeyRole role was removed. Use RuleKeyRole instead.
QgsLayerTreeNode {#qgis_api_break_3_0_QgsLayerTreeNode}
----------------

1
python/core/layertree/qgslayertreemodellegendnode.sip
View File

@ -20,7 +20,6 @@ class QgsLayerTreeModelLegendNode : QObject
enum LegendNodeRoles
{
RuleKeyRole, //!< rule key of the node (QString)
SymbolLegacyRuleKeyRole, //!< for QgsSymbolLegendNode only - legacy rule key (void ptr, to be cast to QgsSymbol ptr)
ParentRuleKeyRole //!< rule key of the parent legend node - for legends with tree hierarchy (QString). Added in 2.8
};

9
src/core/layertree/qgslayertreemodel.cpp
View File

@ -1130,16 +1130,19 @@ QList<QgsLayerTreeModelLegendNode*> QgsLayerTreeModel::filterLegendNodes( const
{
Q_FOREACH ( QgsLayerTreeModelLegendNode* node, nodes )
{
QgsSymbol* ruleKey = reinterpret_cast< QgsSymbol* >( node->data( QgsSymbolLegendNode::SymbolLegacyRuleKeyRole ).value<void*>() );
QString ruleKey = node->data( QgsSymbolLegendNode::RuleKeyRole ).toString();
bool checked = mLegendFilterUsesExtent || node->data( Qt::CheckStateRole ).toInt() == Qt::Checked;
if ( ruleKey && checked )
if ( checked )
{
QString ruleKey = node->data( QgsSymbolLegendNode::RuleKeyRole ).toString();
if ( QgsVectorLayer* vl = qobject_cast<QgsVectorLayer*>( node->layerNode()->layer() ) )
{
if ( mLegendFilterHitTest->legendKeyVisible( ruleKey, vl ) )
filtered << node;
}
else
{
filtered << node;
}
}
else // unknown node type or unchecked
filtered << node;

4
src/core/layertree/qgslayertreemodellegendnode.cpp
View File

@ -311,10 +311,6 @@ QVariant QgsSymbolLegendNode::data( int role ) const
{
return mItem.ruleKey();
}
else if ( role == SymbolLegacyRuleKeyRole )
{
return QVariant::fromValue<void*>( mItem.legacyRuleKey() );
}
else if ( role == ParentRuleKeyRole )
{
return mItem.parentRuleKey();

1
src/core/layertree/qgslayertreemodellegendnode.h
View File

@ -49,7 +49,6 @@ class CORE_EXPORT QgsLayerTreeModelLegendNode : public QObject
enum LegendNodeRoles
{
RuleKeyRole = Qt::UserRole, //!< Rule key of the node (QString)
SymbolLegacyRuleKeyRole, //!< For QgsSymbolLegendNode only - legacy rule key (void ptr, to be cast to QgsSymbol ptr)
ParentRuleKeyRole //!< Rule key of the parent legend node - for legends with tree hierarchy (QString). Added in 2.8
};