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

[processing] Also fix expression preview results in Aggregate algorithm

Browse Source
This commit is contained in:
Nyall Dawson 2020-07-23 09:26:47 +10:00
parent 69f73e3a74
commit cc0cfbe02b
5 changed files with 54 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
python/gui/auto_generated/processing/qgsprocessingaggregatewidgets.sip.in
View File

@ -166,6 +166,22 @@ Returns the selection model
void setSourceFields( const QgsFields &sourceFields );
%Docstring
Set source fields of the underlying mapping model to ``sourceFields``
%End
void setSourceLayer( QgsVectorLayer *layer );
%Docstring
Sets a source ``layer`` to use when generating expression previews in the widget.
.. versionadded:: 3.16
%End
QgsVectorLayer *sourceLayer();
%Docstring
Returns the source layer for use when generating expression previews.
Returned value may be ``None``.
.. versionadded:: 3.16
%End
void scrollTo( const QModelIndex &index ) const;

15
src/gui/processing/qgsprocessingaggregatewidgets.cpp
View File

@ -257,6 +257,9 @@ bool QgsAggregateMappingModel::moveUpOrDown( const QModelIndex &index, bool up )
void QgsAggregateMappingModel::setSourceFields( const QgsFields &sourceFields )
{
mSourceFields = sourceFields;
if ( mExpressionContextGenerator )
mExpressionContextGenerator->setSourceFields( mSourceFields );
QStringList usedFields;
beginResetModel();
mMapping.clear();
@ -356,7 +359,7 @@ QgsAggregateMappingWidget::QgsAggregateMappingWidget( QWidget *parent,
mModel = new QgsAggregateMappingModel( sourceFields, this );
mTableView->setModel( mModel );
mTableView->setItemDelegateForColumn( static_cast<int>( QgsAggregateMappingModel::ColumnDataIndex::SourceExpression ), new QgsFieldMappingWidget::ExpressionDelegate( mTableView ) );
mTableView->setItemDelegateForColumn( static_cast<int>( QgsAggregateMappingModel::ColumnDataIndex::SourceExpression ), new QgsFieldMappingWidget::ExpressionDelegate( this ) );
mTableView->setItemDelegateForColumn( static_cast<int>( QgsAggregateMappingModel::ColumnDataIndex::Aggregate ), new QgsAggregateMappingWidget::AggregateDelegate( mTableView ) );
mTableView->setItemDelegateForColumn( static_cast<int>( QgsAggregateMappingModel::ColumnDataIndex::DestinationType ), new QgsFieldMappingWidget::TypeDelegate( mTableView ) );
updateColumns();
@ -394,6 +397,16 @@ void QgsAggregateMappingWidget::setSourceFields( const QgsFields &sourceFields )
model()->setSourceFields( sourceFields );
}
void QgsAggregateMappingWidget::setSourceLayer( QgsVectorLayer *layer )
{
mSourceLayer = layer;
}
QgsVectorLayer *QgsAggregateMappingWidget::sourceLayer()
{
return mSourceLayer;
}
void QgsAggregateMappingWidget::scrollTo( const QModelIndex &index ) const
{
mTableView->scrollTo( index );

18
src/gui/processing/qgsprocessingaggregatewidgets.h
View File

@ -18,6 +18,7 @@
#include <QAbstractTableModel>
#include <QStyledItemDelegate>
#include <QPointer>
#include "qgsfields.h"
#include "qgsexpressioncontextgenerator.h"
@ -175,6 +176,22 @@ class GUI_EXPORT QgsAggregateMappingWidget : public QgsPanelWidget
//! Set source fields of the underlying mapping model to \a sourceFields
void setSourceFields( const QgsFields &sourceFields );
/**
* Sets a source \a layer to use when generating expression previews in the widget.
*
* \since QGIS 3.16
*/
void setSourceLayer( QgsVectorLayer *layer );
/**
* Returns the source layer for use when generating expression previews.
*
* Returned value may be NULLPTR.
*
* \since QGIS 3.16
*/
QgsVectorLayer *sourceLayer();
/**
* Scroll the fields view to \a index
*/
@ -211,6 +228,7 @@ class GUI_EXPORT QgsAggregateMappingWidget : public QgsPanelWidget
QTableView *mTableView = nullptr;
QAbstractTableModel *mModel = nullptr;
QPointer< QgsVectorLayer > mSourceLayer;
void updateColumns();
//! Returns selected row indexes in ascending order
std::list<int> selectedRows( );

1
src/gui/processing/qgsprocessingaggregatewidgetwrapper.cpp
View File

@ -71,6 +71,7 @@ void QgsProcessingAggregatePanelWidget::setLayer( QgsVectorLayer *layer )
return;
mLayer = layer;
mFieldsView->setSourceLayer( mLayer );
if ( mModel->rowCount() == 0 )
{
loadFieldsFromLayer();

5
src/gui/qgsfieldmappingwidget.cpp
View File

@ -274,6 +274,11 @@ QWidget *QgsFieldMappingWidget::ExpressionDelegate::createEditor( QWidget *paren
if ( mappingWidget->sourceLayer() )
editor->setLayer( mappingWidget->sourceLayer() );
}
else if ( QgsAggregateMappingWidget *aggregateWidget = qobject_cast< QgsAggregateMappingWidget *>( ExpressionDelegate::parent() ) )
{
if ( aggregateWidget->sourceLayer() )
editor->setLayer( aggregateWidget->sourceLayer() );
}
editor->setField( index.model()->data( index, Qt::DisplayRole ).toString() );
connect( editor,