In CFA, assign the same variable to different factors

QMLComponents/components/JASP/Controls/FactorsForm.qml

@@ -23,6 +23,7 @@ FactorsFormBase
 	property int    factorListHeight:				(jaspTheme.defaultVariablesFormHeight - factorButtons.height) / 3 - factorsFormColumn.spacing
 	property int	assignAvailableVariablesToList:	allowInteraction ? (initNumberFactors - 1) : -1 // If interaction is used, set automatically the available variables to the last assigned variables list
 	property bool	allowTypeChange:				false
+	property alias	keepAvailableVariables:			availableVariablesList.keepVariablesWhenMoved
 
 	AvailableVariablesList
 	{

QMLComponents/controls/variableslistbase.cpp

@@ -338,7 +338,11 @@ void VariablesListBase::_setRelations()
 
 				// When the assigned model is of type interaction or it has multiple columns, then the available model should keep its terms when they are moved to the assigned model
 				if (_listViewType == ListViewType::Interaction || (columns() > 1 && _listViewType != ListViewType::RepeatedMeasures))
-					availableModel->setKeepTerms(true);
+				{
+					VariablesListBase* listControl = qobject_cast<VariablesListBase*>(availableModel->listView());
+					if (listControl)
+						listControl->setKeepVariablesWhenMoved(true);
+				}
 			}
 		}
 	}

QMLComponents/controls/variableslistbase.h

@@ -34,6 +34,7 @@ class VariablesListBase : public JASPListControl, public BoundControl
 	Q_PROPERTY( int					columns							READ columns						WRITE setColumns						NOTIFY columnsChanged						)
 	Q_PROPERTY( QStringList			dropKeys						READ dropKeys						WRITE setDropKeys						NOTIFY dropKeysChanged						)
 	Q_PROPERTY( QString				interactionHighOrderCheckBox	READ interactionHighOrderCheckBox	WRITE setInteractionHighOrderCheckBox	NOTIFY interactionHighOrderCheckBoxChanged	)
+	Q_PROPERTY( bool				keepVariablesWhenMoved			READ keepVariablesWhenMoved			WRITE setKeepVariablesWhenMoved			NOTIFY keepVariablesWhenMovedChanged		)
 
 public:
 	VariablesListBase(QQuickItem* parent = nullptr);
@@ -60,12 +61,14 @@ class VariablesListBase : public JASPListControl, public BoundControl
 	const QString			&	interactionHighOrderCheckBox()															const				{ return _interactionHighOrderCheckBox;				}
 	bool						addRowControl(const QString& key, JASPControl* control)											override;
 	void						moveItems(QList<int> &indexes, ListModelDraggable* dropModel, int dropItemIndex = -1);
+	bool						keepVariablesWhenMoved()																const				{ return _keepVariablesWhenMoved;					}
 
 signals:
 	void listViewTypeChanged();
 	void columnsChanged();
 	void dropKeysChanged();
 	void interactionHighOrderCheckBoxChanged();
+	void keepVariablesWhenMovedChanged();
 
 public slots:
 	void setVariableType(int index, int type);
@@ -81,6 +84,7 @@ protected slots:
 	GENERIC_SET_FUNCTION(ListViewType,					_listViewType,					listViewTypeChanged,					ListViewType	)
 	GENERIC_SET_FUNCTION(Columns,						_columns,						columnsChanged,							int				)
 	GENERIC_SET_FUNCTION(InteractionHighOrderCheckBox,	_interactionHighOrderCheckBox,	interactionHighOrderCheckBoxChanged,	QString			)
+	GENERIC_SET_FUNCTION(KeepVariablesWhenMoved,		_keepVariablesWhenMoved,		keepVariablesWhenMovedChanged,			bool			)
 
 	void						_setInitialized(const Json::Value& value = Json::nullValue)	override;
 	void						setDropKeys(const QStringList& dropKeys);
@@ -93,6 +97,7 @@ protected slots:
 	ListModelDraggable*			_draggableModel	= nullptr;
 	ListViewType				_listViewType	= ListViewType::AssignedVariables;
 	BoundControl*				_boundControl	= nullptr;
+	bool						_keepVariablesWhenMoved = false;
 
 private:
 	int							_columns				= 1;

QMLComponents/models/listmodeldraggable.cpp

@@ -19,6 +19,7 @@
 #include "listmodeldraggable.h"
 #include "analysisform.h"
 #include "controls/jasplistcontrol.h"
+#include "controls/variableslistbase.h"
 
 ListModelDraggable::ListModelDraggable(JASPListControl* listView)
 	: ListModel(listView)
@@ -29,6 +30,12 @@ ListModelDraggable::~ListModelDraggable()
 {
 }
 
+bool ListModelDraggable::keepTerms() const
+{
+	VariablesListBase* variablesList = qobject_cast<VariablesListBase*>(listView());
+	return variablesList ? variablesList->keepVariablesWhenMoved() : false;
+}
+
 Terms ListModelDraggable::termsFromIndexes(const QList<int> &indexes) const
 {
 	Terms result;

QMLComponents/models/listmodeldraggable.h

@@ -32,10 +32,9 @@ class ListModelDraggable : public ListModel
 	ListModelDraggable(JASPListControl* listView);
 	~ListModelDraggable();
 
-	bool					keepTerms() const									{ return _keepTerms;	}
+	bool					keepTerms() const;
 	JASPControl::DropMode	dropMode()	const									{ return _dropMode; }
 
-	void					setKeepTerms(bool keep)								{ _keepTerms = keep; }
 	void					setDropMode(JASPControl::DropMode dropMode)			{ _dropMode = dropMode; }
 
 	virtual QList<int>		indexesFromTerms(	const Terms		& terms)		const;
@@ -46,7 +45,6 @@ class ListModelDraggable : public ListModel
 	virtual Terms			termsFromIndexes(	const QList<int>& indexes)		const;
 
 protected:
-	bool						_keepTerms								= false;
 	JASPControl::DropMode		_dropMode								= JASPControl::DropMode::DropNone;
 
 	bool						isAllowed(const Term &term) const;