In merge attributes dialog, don't show editor widgets in table

nyalldawson · nyalldawson · commit adf5d793c777 · 2018-04-04T05:27:12.000+10:00
This was originally done to allow the table to show mapped values
such as value maps/relations. But it creates the false impression
that these values are editable, since the editor widgets are
not read only.

Instead, use the field formatter to create a value representation
string and make the body of the table read-only instead.
diff --git a/src/app/qgsmergeattributesdialog.cpp b/src/app/qgsmergeattributesdialog.cpp
@@ -29,6 +29,8 @@
 #include "qgseditorwidgetregistry.h"
 #include "qgssettings.h"
 #include "qgsgui.h"
+#include "qgsfieldformatter.h"
+#include "qgsfieldformatterregistry.h"
 
 #include <limits>
 #include <QComboBox>
@@ -141,8 +143,6 @@ void QgsMergeAttributesDialog::createTableWidgetContents()
   QStringList verticalHeaderLabels; //the id column is in the
   verticalHeaderLabels << tr( "Id" );
 
-  QgsAttributeEditorContext context;
-
   for ( int i = 0; i < mFeatureList.size(); ++i )
   {
     verticalHeaderLabels << FID_TO_STRING( mFeatureList[i].id() );
@@ -153,16 +153,13 @@ void QgsMergeAttributesDialog::createTableWidgetContents()
     {
       int idx = mTableWidget->horizontalHeaderItem( j )->data( FieldIndex ).toInt();
 
-      QTableWidgetItem *attributeValItem = new QTableWidgetItem( attrs.at( idx ).toString() );
+      const QgsEditorWidgetSetup setup = mFields.at( idx ).editorWidgetSetup();
+      const QgsFieldFormatter *formatter = QgsApplication::fieldFormatterRegistry()->fieldFormatter( setup.type() );
+      QString stringVal = formatter->representValue( mVectorLayer, idx, setup.config(), QVariant(), attrs.at( idx ) );
+
+      QTableWidgetItem *attributeValItem = new QTableWidgetItem( stringVal );
       attributeValItem->setFlags( Qt::ItemIsEnabled | Qt::ItemIsSelectable );
       mTableWidget->setItem( i + 1, j, attributeValItem );
-      QgsEditorWidgetWrapper *eww = QgsGui::editorWidgetRegistry()->create( mVectorLayer, idx, nullptr, mTableWidget, context );
-      if ( eww )
-      {
-        eww->setValue( attrs.at( idx ) );
-        mTableWidget->setCellWidget( i + 1, j, eww->widget() );
-        mTableWidget->setCellWidget( i + 1, j, eww->widget() );
-      }
     }
   }
 
@@ -317,14 +314,10 @@ void QgsMergeAttributesDialog::refreshMergedValue( int col )
   }
 
   //insert string into table widget
-  QTableWidgetItem *newTotalItem = new QTableWidgetItem();
-  newTotalItem->setData( Qt::DisplayRole, mergeResult );
-  newTotalItem->setFlags( Qt::ItemIsEnabled | Qt::ItemIsSelectable | Qt::ItemIsEditable );
-
-  //block signals to prevent table widget switching combo box to "manual" entry
-  mTableWidget->blockSignals( true );
-  mTableWidget->setItem( mTableWidget->rowCount() - 1, col, newTotalItem );
-  mTableWidget->blockSignals( false );
+  mUpdating = true; // prevent combobox changing to "manual" value
+  QTableWidgetItem *item = mTableWidget->item( mTableWidget->rowCount() - 1, col );
+  item->setData( Qt::DisplayRole, mergeResult );
+  mUpdating = false;
 }
 
 QVariant QgsMergeAttributesDialog::featureAttribute( QgsFeatureId featureId, int col )
@@ -337,9 +330,8 @@ QVariant QgsMergeAttributesDialog::featureAttribute( QgsFeatureId featureId, int
 
   if ( i < mFeatureList.size() )
   {
-    QgsEditorWidgetWrapper *wrapper = QgsEditorWidgetWrapper::fromWidget( mTableWidget->cellWidget( i + 1, col ) );
-    if ( wrapper )
-      return wrapper->value();
+    const QgsFeature f = mFeatureList.at( i );
+    return f.attributes().at( fieldIdx );
   }
 
   return QVariant( mVectorLayer->fields().at( fieldIdx ).type() );
@@ -498,6 +490,9 @@ void QgsMergeAttributesDialog::mRemoveFeatureFromSelectionButton_clicked()
 
 void QgsMergeAttributesDialog::tableWidgetCellChanged( int row, int column )
 {
+  if ( mUpdating )
+    return;
+
   if ( row < mTableWidget->rowCount() - 1 )
   {
     //only looking for edits in the final row
diff --git a/src/app/qgsmergeattributesdialog.h b/src/app/qgsmergeattributesdialog.h
@@ -102,6 +102,7 @@ class APP_EXPORT QgsMergeAttributesDialog: public QDialog, private Ui::QgsMergeA
 
     QgsFields mFields;
     QSet<int> mHiddenAttributes;
+    bool mUpdating = false;
 
     static const QList< QgsStatisticalSummary::Statistic > DISPLAY_STATS;
 
