less columnindex more columnname

Author: JorisGoosen

CommonData/dataset.cpp

@@ -982,8 +982,8 @@ QVariant DataSet::headerData(int section, Qt::Orientation orientation, int role)
 		case int(dataPkgRoles::maxRowHeaderString):				return QString::number(rowCount())		+ "XXX";
 		case Qt::TextAlignmentRole:								return QVariant(Qt::AlignCenter);
 		case int(dataPkgRoles::filter):							return		!col ? false							: col->hasLabelFilter() || getColumnInDragNDropShownFilter(col);
-		case Qt::DisplayRole:									return tq(	!col ? "?"								: col->name());
-		
+		case Qt::DisplayRole:									[[fallthrough]];
+		case int(dataPkgRoles::name):							return tq(	!col ? "?"								: col->name());
 		case int(dataPkgRoles::labelsHasFilter):				return		!col ? false							: col->hasLabelFilter();
 		case int(dataPkgRoles::columnIsComputed):				return		!col ? false							: col->isComputed() && col->codeType() != computedColumnType::analysisNotComputed;
 		case int(dataPkgRoles::computedColumnError):			return tq(	!col ? "?"								: col->error());

Desktop/data/columnmodel.cpp

@@ -543,7 +543,7 @@ void ColumnModel::setChosenColumnByName(const QString chosenNameQ, int colIndex)
 	// Always set the chosen column even if it is the same one: the ColumnModel might be not reset correctly when the dataset is closed.
 
 	//If the user deletes the name the column ought to be removed because we cannot have columns without a name!
-	int deleteMe = column() && column()->name() == "" ? _columnIndex : -1;
+	std::string deleteMe = column() && column()->name() == "" ? column()->name() : "";
 
 	emit beforeChangingColumn(chosenNameQ);
 
@@ -566,18 +566,17 @@ void ColumnModel::setChosenColumnByName(const QString chosenNameQ, int colIndex)
 
 	refresh();
 
-	if(deleteMe >= 0)
+	if(deleteMe != "")
 		chosenColumn->data()->removeColumn(deleteMe);
 }
 
 void ColumnModel::setChosenColumn(int columnIndex)
 {
-	DataSet * data	= DataSetPackage::pkg()->dataSet();
-	Column  * col	= data->column(columnIndex);
+	QString name = emit columnNameForIndex(columnIndex);
 
-	if(col)
+	if(name != "")
 	{
-		setChosenColumnByName(col->nameQ());
+		setChosenColumnByName(name);
 		return;
 	}
 
@@ -635,7 +634,7 @@ QVariant ColumnModel::headerData(int section, Qt::Orientation orientation, int r
 	case Qt::TextAlignmentRole:										return QVariant(Qt::AlignCenter);
 	}
 
-	return QVariant();
+	return QIdentityProxyModel::headerData(section, orientation, role);
 }
 
 int ColumnModel::rowCount(const QModelIndex & p) const
@@ -739,9 +738,8 @@ void ColumnModel::checkCurrentColumn(QStringList, QStringList missingColumns, QM
 		if (hasNewColumns && _virtual && DataSetPackage::pkg()->dataSet()->columnCount() >= _columnIndex)
 		{
 			// The current column is not virtual anymore: reset it
-			int colId = _columnIndex;
 			_columnIndex = -1;
-			setChosenColumn(colId);
+			setChosenColumnByName(colName);
 		}
 	}
 }

Desktop/data/columnmodel.h

@@ -174,6 +174,7 @@ public slots:
 	void autoSortChanged();
 	void hasSeveralNumericValuesChanged();
 	void computeFilterChanged();
+	QString columnNameForIndex(int index);
 
 private:
 	std::vector<size_t>		getSortedSelection()					const;

Desktop/data/datasettablemodel.cpp

@@ -117,7 +117,9 @@ void DataSetTableModel::setColumnFilter(const QString &newColumnFilter)
 {
 	if (_columnFilter == newColumnFilter)
 		return;
+
 	_columnFilter = newColumnFilter;
-	emit columnFilterChanged();
+	emit columnFilterChanged(_columnFilter);
+
 	invalidateColumnsFilter();
 }

Desktop/data/datasettablemodel.h

@@ -39,7 +39,7 @@ class DataSetTableModel : public QSortFilterProxyModel
 				int			columnsFilteredCount()					const				{ return DataSetPackage::pkg()->columnsFilteredCount();								}
 	Q_INVOKABLE bool		isColumnNameFree(QString name)								{ return DataSetPackage::pkg()->isColumnNameFree(name);								}
 				QString		columnFilter() const;
-	Q_INVOKABLE QString		columnName(int column)					const;
+
 	Q_INVOKABLE void		setColumnName(int col, QString name);
 	Q_INVOKABLE QVariant	getColumnTypesWithIcons()				const				{ return DataSetPackage::pkg()->getColumnTypesWithIcons();							}
 				void		setColumnFilter(const QString &newColumnFilter);
@@ -62,11 +62,12 @@ class DataSetTableModel : public QSortFilterProxyModel
 	void					labelChanged(QString columnName, QString originalLabel, QString newLabel);
 	void					labelsReordered(QString columnName);
 	void					emptyValuesChanged();
-	void					columnFilterChanged();
+	void					columnFilterChanged(QString);
 	void					renameColumnDialog(int columnIndex);
 
 
 public slots:
+	QString					columnName(int column)					const;
 	void					setShowInactive(bool showInactive);
 	void					handleDataSetChange();
 				//void		onDataChanged(const QModelIndex &topLeft, const QModelIndex &bottomRight, const QVector<int> &roles) { if( roles.count(int(dataPkgRoles::filter)) > 0) invalidateFilter(); }

Desktop/mainwindow.cpp

@@ -106,7 +106,9 @@ MainWindow::MainWindow(QApplication * application) : QObject(application), _appl
 	_datasetTableModel		= new DataSetTableModel();
 	_dataSetModelVarInfo	= new DataSetTableModel(false);
 	_columnModel			= new ColumnModel();
-	
+
+	connect(_datasetTableModel, &DataSetTableModel::columnFilterChanged, _dataSetModelVarInfo, &DataSetTableModel::setColumnFilter);
+
 	initLog(); //initLog needs _preferences and _engineSync!
 
 	Log::log() << "JASP " << AppInfo::version.asString() << " from commit " << AppInfo::gitCommit << " and branch " << AppInfo::gitBranch << " is continuing initialization." << std::endl;
@@ -456,6 +458,8 @@ void MainWindow::makeConnections()
 	connect(_resultsJsInterface,	&ResultsJsInterface::resultsPageLoadedSignal,		_languageModel,			&LanguageModel::resultsPageLoaded,							Qt::QueuedConnection);
 	connect(_resultsJsInterface,	&ResultsJsInterface::showRSyntaxInResults,			_analyses,				&Analyses::showRSyntaxInResults								);
 
+	connect(_columnModel,			&ColumnModel::columnNameForIndex,					_datasetTableModel,		&DataSetTableModel::columnName								);
+
 	connect(_analyses,				&Analyses::countChanged,							this,					&MainWindow::analysesCountChangedHandler					);
 	connect(_analyses,				&Analyses::analysisResultsChanged,					this,					&MainWindow::analysisResultsChangedHandler					);
 	connect(_analyses,				&Analyses::analysisImageSaved,						this,					&MainWindow::analysisImageSavedHandler						);