Skip to content

Commit

Permalink
small code styling and comments adjustments
Browse files Browse the repository at this point in the history
  • Loading branch information
VitorVieiraZ committed Oct 30, 2024
1 parent 00f86c3 commit 27f3c93
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 3 deletions.
5 changes: 3 additions & 2 deletions app/attributes/attributecontroller.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -232,10 +232,11 @@ void AttributeController::flatten(
QStringList expressions;
QString expression = field.constraints().constraintExpression();

// Retrieving field name/alias expression
QgsEditFormConfig editFormConfig = layer->editFormConfig();
QString fieldName = field.name();
QgsPropertyCollection fieldProperties = editFormConfig.dataDefinedFieldProperties( fieldName );

// Retrieving field name expression
QgsProperty nameProperty = fieldProperties.property( QgsEditFormConfig::DataDefinedProperty::Alias );
QString nameExpressionString = nameProperty.expressionString();
QgsExpression nameExpression( nameExpressionString );
Expand Down Expand Up @@ -948,7 +949,7 @@ void AttributeController::recalculateDerivedItems( bool isFormValueChange, bool
}
}

// Evaluate form items alias/name
// Evaluate form items name
{
QMap<QUuid, std::shared_ptr<FormItem>>::iterator formItemsIterator = mFormItems.begin();
while ( formItemsIterator != mFormItems.end() )
Expand Down
2 changes: 1 addition & 1 deletion app/attributes/attributedata.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ FormItem::FormItem( const QUuid &id,
, mParentTabId( parentTabId )
, mType( type )
, mName( name )
, mNameExpression( nameExpression ) //mNameExpression
, mNameExpression( nameExpression )
, mShowName( showName )
, mIsEditable( isEditable )
, mEditableExpression( editableExpression )
Expand Down

0 comments on commit 27f3c93

Please sign in to comment.