Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Final cleanup
  • Loading branch information
elpaso committed Apr 14, 2020
1 parent f2f7244 commit 3ab72da
Show file tree
Hide file tree
Showing 3 changed files with 1 addition and 24 deletions.
11 changes: 1 addition & 10 deletions src/gui/qgsattributeform.cpp
Expand Up @@ -2102,16 +2102,7 @@ QgsAttributeForm::WidgetInfo QgsAttributeForm::createWidgetFromDef( const QgsAtt
}

newWidgetInfo.showLabel = widgetDef->showLabel();
// THIS IS NEVER HIT!
/*
const QgsPropertyCollection properties { widgetDef->dataDefinedProperties() };
if ( properties.hasProperty( QgsEditFormConfig::DataDefinedProperty::Alias ) )
{
const QgsProperty labelProperty { properties.property( QgsEditFormConfig::DataDefinedProperty::Alias ) };
newWidgetInfo.labelExpression = labelProperty.asExpression() ;
newWidgetInfo.labelExpressionIsActive = labelProperty.isActive() ;
}
*/

return newWidgetInfo;
}

Expand Down
2 changes: 0 additions & 2 deletions src/gui/qgsattributeform.h
Expand Up @@ -351,8 +351,6 @@ class GUI_EXPORT QgsAttributeForm : public QWidget
{
QWidget *widget = nullptr;
QString labelText;
QString labelExpression;
bool labelExpressionIsActive;
QString toolTip;
QString hint;
bool labelOnTop = false;
Expand Down
12 changes: 0 additions & 12 deletions src/gui/vector/qgsattributesformproperties.cpp
Expand Up @@ -893,18 +893,6 @@ void QgsAttributesFormProperties::apply()
{
QTreeWidgetItem *tabItem = mFormLayoutTree->invisibleRootItem()->child( t );
QgsAttributeEditorElement *editorElement { createAttributeEditorWidget( tabItem, nullptr, false ) };
/*
// Store data defined field properties
if ( editorElement->type() == QgsAttributeEditorElement::AttributeEditorType::AeTypeField )
{
const QgsAttributeEditorField *fieldElement { static_cast<QgsAttributeEditorField *>( editorElement ) };
const QString fieldName { mLayer->fields().at( fieldElement->idx() ).name() };
if ( editFormConfig.dataDefinedFieldProperties( fieldName ).count() > 0 )
{
editorElement->setDataDefinedProperties( editFormConfig.dataDefinedFieldProperties( fieldName ) );
}
}
*/
editFormConfig.addTab( editorElement );
}

Expand Down

0 comments on commit 3ab72da

Please sign in to comment.