Wrong variable setting after Column Insert before

Fixes jasp-stats/jasp-test-release#2512
jasp-stats · Dec 4, 2023 · b6af3d2 · b6af3d2
1 parent 0306a94
commit b6af3d2
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 0 deletions.
diff --git a/Desktop/data/columnmodel.cpp b/Desktop/data/columnmodel.cpp
@@ -90,6 +90,7 @@ ColumnModel::ColumnModel(DataSetTableModel* dataSetTableModel)
 	connect(DataSetPackage::pkg(),	&DataSetPackage::columnDataTypeChanged,			this, &ColumnModel::columnDataTypeChanged		);
 	connect(DataSetPackage::pkg(),	&DataSetPackage::labelsReordered,				this, &ColumnModel::refresh						);
 	connect(DataSetPackage::pkg(),	&DataSetPackage::columnsBeingRemoved,			this, &ColumnModel::checkRemovedColumns			);
+	connect(DataSetPackage::pkg(),	&DataSetPackage::columnsInserted,				this, &ColumnModel::checkInsertedColumns		);
 	connect(DataSetPackage::pkg(),	&DataSetPackage::datasetChanged,				this, &ColumnModel::checkCurrentColumn			);
 	connect(DataSetPackage::pkg(),	&DataSetPackage::workspaceEmptyValuesChanged,	this, &ColumnModel::emptyValuesChanged			);
 
@@ -560,6 +561,15 @@ void ColumnModel::changeSelectedColumn(QPoint selectionStart)
 		setChosenColumn(selectionStart.x());
 }
 
+void ColumnModel::checkInsertedColumns(const QModelIndex &, int first, int)
+{
+	if (_currentColIndex >= first)
+	{
+		_currentColIndex = -1; // Force the setting of new column.
+		setChosenColumn(first);
+	}
+}
+
 void ColumnModel::checkRemovedColumns(int columnIndex, int count)
 {
 	int currentCol = chosenColumn();

diff --git a/Desktop/data/columnmodel.h b/Desktop/data/columnmodel.h
@@ -112,6 +112,7 @@ public slots:
 	void refresh();
 	void changeSelectedColumn(QPoint selectionStart);
 	void checkRemovedColumns(int columnIndex, int count);
+	void checkInsertedColumns(const QModelIndex & parent, int first, int last);
 	void openComputedColumn(const QString & name);
 	void checkCurrentColumn( QStringList changedColumns, QStringList missingColumns, QMap<QString, QString>	changeNameColumns, bool rowCountChanged, bool hasNewColumns);
 	void setCompactMode(bool newCompactMode);