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

Jump to bottom

A couple of attribute form optimizations #4587

Merged
merged 2 commits into from
Sep 19, 2023
Merged

A couple of attribute form optimizations #4587

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b3d0a41
Remove long-gone need for keeping track of inserted items in the attr…
nirvn Sep 19, 2023
c86a2d7
Only append an attribute form container item when its children have b…
nirvn Sep 19, 2023
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
45 changes: 19 additions & 26 deletions src/core/attributeformmodelbase.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -189,6 +189,7 @@ void AttributeFormModelBase::resetModel()
#endif

invisibleRootItem()->setColumnCount( 1 );
QList<QStandardItem *> containers;
if ( hasTabs )
{
const QList<QgsAttributeEditorElement *> children { root->children() };
Expand All @@ -212,26 +213,29 @@ void AttributeFormModelBase::resetModel()
item->setData( true, AttributeFormModel::CurrentlyVisible );
item->setData( true, AttributeFormModel::ConstraintHardValid );
item->setData( true, AttributeFormModel::ConstraintSoftValid );
invisibleRootItem()->appendRow( item );
setHasTabs( true );

QString visibilityExpression;
if ( container->visibilityExpression().enabled() )
{
mVisibilityExpressions.append( qMakePair( container->visibilityExpression().data(), QVector<QStandardItem *>() << item ) );
mVisibilityExpressions.append( qMakePair( container->visibilityExpression().data(), item ) );
visibilityExpression = container->visibilityExpression().data().expression();
}

QVector<QStandardItem *> dummy;
buildForm( container, item, visibilityExpression, dummy, currentTab, columnCount );
buildForm( container, item, visibilityExpression, containers, currentTab, columnCount );
invisibleRootItem()->appendRow( item );
setHasTabs( true );
currentTab++;
}
}
}
else
{
QVector<QStandardItem *> dummy;
buildForm( invisibleRootContainer(), invisibleRootItem(), QString(), dummy );
buildForm( invisibleRootContainer(), invisibleRootItem(), QString(), containers );
}

for ( QStandardItem *container : std::as_const( containers ) )
{
container->setData( container->index(), AttributeFormModel::GroupIndex );
}
}
}
Expand Down Expand Up @@ -344,7 +348,7 @@ void AttributeFormModelBase::updateAttributeValue( QStandardItem *item )
}
}

void AttributeFormModelBase::buildForm( QgsAttributeEditorContainer *container, QStandardItem *parent, const QString &parentVisibilityExpressions, QVector<QStandardItem *> &items, int currentTabIndex, int columnCount )
void AttributeFormModelBase::buildForm( QgsAttributeEditorContainer *container, QStandardItem *parent, const QString &parentVisibilityExpressions, QList<QStandardItem *> &containers, int currentTabIndex, int columnCount )
{
const QList<QgsAttributeEditorElement *> children { container->children() };
for ( QgsAttributeEditorElement *element : children )
Expand Down Expand Up @@ -391,14 +395,12 @@ void AttributeFormModelBase::buildForm( QgsAttributeEditorContainer *container,
if ( innerContainer->backgroundColor().isValid() )
item->setData( innerContainer->backgroundColor(), AttributeFormModel::GroupColor );

items.append( item );
buildForm( innerContainer, item, visibilityExpression, containers, 0, innerColumnCount );
parent->appendRow( item );
item->setData( item->index(), AttributeFormModel::GroupIndex );
containers << item;

QVector<QStandardItem *> newItems;
buildForm( innerContainer, item, visibilityExpression, newItems, 0, innerColumnCount );
if ( !visibilityExpression.isEmpty() )
mVisibilityExpressions.append( qMakePair( QgsExpression( visibilityExpression ), QVector<QStandardItem *>() << item ) );
mVisibilityExpressions.append( qMakePair( QgsExpression( visibilityExpression ), item ) );
break;
}

Expand Down Expand Up @@ -454,8 +456,6 @@ void AttributeFormModelBase::buildForm( QgsAttributeEditorContainer *container,

mConstraints.insert( item, field.constraints() );

items.append( item );

parent->appendRow( item );
break;
}
Expand Down Expand Up @@ -483,8 +483,6 @@ void AttributeFormModelBase::buildForm( QgsAttributeEditorContainer *container,
item->setData( true, AttributeFormModel::ConstraintSoftValid );
item->setData( true, AttributeFormModel::AttributeAllowEdit );

items.append( item );

parent->appendRow( item );
break;
}
Expand All @@ -507,7 +505,6 @@ void AttributeFormModelBase::buildForm( QgsAttributeEditorContainer *container,

updateAttributeValue( item );

items.append( item );
parent->appendRow( item );
break;
}
Expand All @@ -530,7 +527,6 @@ void AttributeFormModelBase::buildForm( QgsAttributeEditorContainer *container,

updateAttributeValue( item );

items.append( item );
parent->appendRow( item );
break;
}
Expand All @@ -550,7 +546,6 @@ void AttributeFormModelBase::buildForm( QgsAttributeEditorContainer *container,

updateAttributeValue( item );

items.append( item );
parent->appendRow( item );
break;
}
Expand Down Expand Up @@ -730,13 +725,11 @@ void AttributeFormModelBase::updateVisibilityAndConstraints( int fieldIndex )
exp.prepare( &mExpressionContext );

bool visible = exp.evaluate( &mExpressionContext ).toInt();
for ( QStandardItem *item : std::as_const( it.second ) )
QStandardItem *item = it.second;
if ( item->data( AttributeFormModel::CurrentlyVisible ).toBool() != visible )
{
if ( item->data( AttributeFormModel::CurrentlyVisible ).toBool() != visible )
{
item->setData( visible, AttributeFormModel::CurrentlyVisible );
visibilityChanged = true;
}
item->setData( visible, AttributeFormModel::CurrentlyVisible );
visibilityChanged = true;
}
}
}
Expand Down
4 changes: 2 additions & 2 deletions src/core/attributeformmodelbase.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ class AttributeFormModelBase : public QStandardItemModel
void buildForm( QgsAttributeEditorContainer *container,
QStandardItem *parent,
const QString &parentVisibilityExpressions,
QVector<QStandardItem *> &items,
QList<QStandardItem *> &containers,
int currentTabIndex = 0,
int columnCount = 1 );

Expand Down Expand Up @@ -121,7 +121,7 @@ class AttributeFormModelBase : public QStandardItemModel
std::unique_ptr<QgsAttributeEditorContainer> mTemporaryContainer;
bool mHasTabs = false;

typedef QPair<QgsExpression, QVector<QStandardItem *>> VisibilityExpression;
typedef QPair<QgsExpression, QStandardItem *> VisibilityExpression;
QList<VisibilityExpression> mVisibilityExpressions;
QMap<QStandardItem *, QgsFieldConstraints> mConstraints;
QMap<QStandardItem *, QString> mEditorWidgetCodes;
Expand Down
Loading