The model "last used parameter values" setting should live outside

the undo stack We don't want to roll these back if users are undo/redoing changes
qgis · Mar 10, 2020 · c4df4dc · c4df4dc
1 parent e7b5c26
commit c4df4dc
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 0 deletions.
diff --git a/src/gui/processing/models/qgsmodelundocommand.cpp b/src/gui/processing/models/qgsmodelundocommand.cpp
@@ -39,7 +39,13 @@ int QgsModelUndoCommand::id() const
 void QgsModelUndoCommand::undo()
 {
   QUndoCommand::undo();
+
+  // some settings must live "outside" the undo stack
+  const QVariantMap params = mModel->designerParameterValues();
+
   mModel->loadVariant( mBeforeState );
+
+  mModel->setDesignerParameterValues( params );
 }
 
 void QgsModelUndoCommand::redo()
@@ -50,7 +56,13 @@ void QgsModelUndoCommand::redo()
     return;
   }
   QUndoCommand::redo();
+
+  // some settings must live "outside" the undo stack
+  const QVariantMap params = mModel->designerParameterValues();
+
   mModel->loadVariant( mAfterState );
+
+  mModel->setDesignerParameterValues( params );
 }
 
 bool QgsModelUndoCommand::mergeWith( const QUndoCommand *other )

diff --git a/tests/src/gui/testprocessinggui.cpp b/tests/src/gui/testprocessinggui.cpp
@@ -318,6 +318,15 @@ void TestProcessingGui::testModelUndo()
   QCOMPARE( model.childAlgorithm( QStringLiteral( "alg1" ) ).description(), QStringLiteral( "alg1" ) );
   command.redo();
   QCOMPARE( model.childAlgorithm( QStringLiteral( "alg1" ) ).description(), QStringLiteral( "new desc" ) );
+
+  // the last used parameter values setting should not be affected by undo stack changes
+  QVariantMap params;
+  params.insert( QStringLiteral( "a" ), 1 );
+  model.setDesignerParameterValues( params );
+  command.undo();
+  QCOMPARE( model.designerParameterValues(), params );
+  command.redo();
+  QCOMPARE( model.designerParameterValues(), params );
 }
 
 void TestProcessingGui::testSetGetConfig()