try to keep selected data type when toggling "Create virtual field"

checkbox in the field calculator (fix #36679) Reset to the first item only if compatible data type not found
qgis · Aug 16, 2020 · 97e9754 · 97e9754
1 parent 1a76a09
commit 97e9754
Showing 1 changed file with 14 additions and 2 deletions.
diff --git a/src/gui/vector/qgsfieldcalculator.cpp b/src/gui/vector/qgsfieldcalculator.cpp
@@ -349,6 +349,8 @@ void QgsFieldCalculator::populateOutputFieldTypes()
     return;
   }
 
+  int oldDataType = mOutputFieldTypeComboBox->currentData( Qt::UserRole + FTC_TYPE_ROLE_IDX ).toInt();
+
   mOutputFieldTypeComboBox->blockSignals( true );
 
   // Standard subset of fields in case of virtual
@@ -382,8 +384,18 @@ void QgsFieldCalculator::populateOutputFieldTypes()
     mOutputFieldTypeComboBox->setItemData( i, static_cast<int>( typelist[i].mSubType ), Qt::UserRole + FTC_SUBTYPE_IDX );
   }
   mOutputFieldTypeComboBox->blockSignals( false );
-  mOutputFieldTypeComboBox->setCurrentIndex( 0 );
-  mOutputFieldTypeComboBox_activated( 0 );
+
+  int idx = mOutputFieldTypeComboBox->findData( oldDataType, Qt::UserRole + FTC_TYPE_ROLE_IDX );
+  if ( idx != -1 )
+  {
+    mOutputFieldTypeComboBox->setCurrentIndex( idx );
+    mOutputFieldTypeComboBox_activated( idx );
+  }
+  else
+  {
+    mOutputFieldTypeComboBox->setCurrentIndex( 0 );
+    mOutputFieldTypeComboBox_activated( 0 );
+  }
 }
 
 void QgsFieldCalculator::mNewFieldGroupBox_toggled( bool on )