sharpetronics/QGIS
1
0
Fork 0
mirror of https://github.com/qgis/QGIS.git synced 2025-02-28 00:17:30 -05:00
Code Issues Packages Projects Releases Wiki Activity

check if visibilityexpression is enabled (#8141)

Browse Source 
before adding the containers to the mContainerVisibilityInformation

fix: #20045
This commit is contained in:
signedav 2018-10-08 22:10:52 +02:00 committed by Denis Rouzaud
parent 425fe74908
commit f5d2b88dba
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/gui/qgsattributeform.cpp
View File

@ -818,7 +818,6 @@ void QgsAttributeForm::updateConstraints( QgsEditorWidgetWrapper *eww )
void QgsAttributeForm::updateContainersVisibility() void QgsAttributeForm::updateContainersVisibility()
{ {
mExpressionContext << QgsExpressionContextUtils::formScope( QgsFeature( mFeature ), mContext.attributeFormModeString() ); mExpressionContext << QgsExpressionContextUtils::formScope( QgsFeature( mFeature ), mContext.attributeFormModeString() );
const QVector<ContainerInformation *> infos = mContainerVisibilityInformation; const QVector<ContainerInformation *> infos = mContainerVisibilityInformation;
@ -1198,7 +1197,10 @@ void QgsAttributeForm::init()
tabWidget = nullptr; tabWidget = nullptr;
WidgetInfo widgetInfo = createWidgetFromDef( widgDef, formWidget, mLayer, mContext ); WidgetInfo widgetInfo = createWidgetFromDef( widgDef, formWidget, mLayer, mContext );
layout->addWidget( widgetInfo.widget, row, column, 1, 2 ); layout->addWidget( widgetInfo.widget, row, column, 1, 2 );
registerContainerInformation( new ContainerInformation( widgetInfo.widget, containerDef->visibilityExpression().data() ) ); if ( containerDef->visibilityExpression().enabled() )
{
registerContainerInformation( new ContainerInformation( widgetInfo.widget, containerDef->visibilityExpression().data() ) );
}
column += 2; column += 2;
} }
else else
@ -1744,7 +1746,10 @@ QgsAttributeForm::WidgetInfo QgsAttributeForm::createWidgetFromDef( const QgsAtt
if ( childDef->type() == QgsAttributeEditorElement::AeTypeContainer ) if ( childDef->type() == QgsAttributeEditorElement::AeTypeContainer )
{ {
QgsAttributeEditorContainer *containerDef = static_cast<QgsAttributeEditorContainer *>( childDef ); QgsAttributeEditorContainer *containerDef = static_cast<QgsAttributeEditorContainer *>( childDef );
registerContainerInformation( new ContainerInformation( widgetInfo.widget, containerDef->visibilityExpression().data() ) ); if ( containerDef->visibilityExpression().enabled() )
{
registerContainerInformation( new ContainerInformation( widgetInfo.widget, containerDef->visibilityExpression().data() ) );
}
} }
if ( widgetInfo.labelText.isNull() ) if ( widgetInfo.labelText.isNull() )