Merge pull request #5783 from pblottiere/ref_rel_perf_218

pblottiere · web-flow · commit f4b007ec1a61 · 2017-12-15T07:19:15.000Z
[2.18] QgsRelationReferenceWidget slowness
diff --git a/src/app/qgsoptions.cpp b/src/app/qgsoptions.cpp
@@ -928,7 +928,8 @@ QgsOptions::QgsOptions( QWidget *parent, Qt::WindowFlags fl )
   mVariableEditor->reloadContext();
   mVariableEditor->setEditableScopeIndex( 0 );
 
-
+  const QString key = "/QgsRelationReferenceWidget/cacheSize";
+  mSettings->setValue( key, mSettings->value( key, 200000 ) );
 
   mAdvancedSettingsEditor->setSettingsObject( mSettings );
 
diff --git a/src/gui/editorwidgets/qgsrelationreferencewidget.cpp b/src/gui/editorwidgets/qgsrelationreferencewidget.cpp
@@ -479,7 +479,8 @@ void QgsRelationReferenceWidget::init()
 
     QSet<QString> requestedAttrs;
 
-    QgsVectorLayerCache* layerCache = new QgsVectorLayerCache( mReferencedLayer, 100000, this );
+    const int cacheSize = QSettings().value( "/QgsRelationReferenceWidget/cacheSize" ).toInt();
+    QgsVectorLayerCache* layerCache = new QgsVectorLayerCache( mReferencedLayer, cacheSize, this );
 
     if ( !mFilterFields.isEmpty() )
     {
@@ -583,8 +584,14 @@ void QgsRelationReferenceWidget::init()
       }
     }
 
-    QVariant featId = mFeature.isValid() ? mFeature.id() : QVariant( QVariant::Int );
-    mComboBox->setCurrentIndex( mComboBox->findData( featId, QgsAttributeTableModel::FeatureIdRole ) );
+    if ( mFeature.isValid() )
+    {
+      mComboBox->setCurrentIndex( mComboBox->findData( mFeature.id(), QgsAttributeTableModel::FeatureIdRole ) );
+    }
+    else
+    {
+      mComboBox->setCurrentIndex( -1 );
+    }
 
     // Only connect after iterating, to have only one iterator on the referenced table at once
     connect( mComboBox, SIGNAL( currentIndexChanged( int ) ), this, SLOT( comboReferenceChanged( int ) ) );
diff --git a/src/gui/editorwidgets/qgsrelationreferencewidgetwrapper.cpp b/src/gui/editorwidgets/qgsrelationreferencewidgetwrapper.cpp
@@ -71,7 +71,7 @@ void QgsRelationReferenceWidgetWrapper::initWidget( QWidget* editor )
     if ( ctx->relation().name() == relation.name() )
     {
       mWidget->setEmbedForm( false );
-      mWidget->setReadOnlySelector( false );
+      mWidget->setReadOnlySelector( true );
       mWidget->setAllowMapIdentification( false );
     }
     ctx = ctx->parentContext();

Original file line number	Diff line number	Diff line change
`@@ -71,7 +71,7 @@ void QgsRelationReferenceWidgetWrapper::initWidget( QWidget* editor )`
`71`	`71`	`if ( ctx->relation().name() == relation.name() )`
`72`	`72`	`{`
`73`	`73`	`mWidget->setEmbedForm( false );`
`74`		`- mWidget->setReadOnlySelector( false );`
	`74`	`+ mWidget->setReadOnlySelector( true );`
`75`	`75`	`mWidget->setAllowMapIdentification( false );`
`76`	`76`	`}`
`77`	`77`	`ctx = ctx->parentContext();`