use columnname in more spots

Author: JorisGoosen

CommonData/dataset.cpp

@@ -831,7 +831,7 @@ QVariant DataSet::data(const QModelIndex &index, int role) const
 			iAmActive,
 			iAmActive,
 			iAmActive && !belowMeIsActive,
-			iAmActive && index.column() == columnCount() - 1 //always draw left line and right line only if last col
+			iAmActive //&& index.column() == columnCount() - 1 //always draw left line and right line only if last col
 		);
 	}
 	}

Desktop/data/datasetpackage.cpp

@@ -898,15 +898,15 @@ std::string DataSetPackage::getColumnName(size_t columnIndex) const
 
 
 
-void DataSetPackage::labelMoveRows(size_t colIdx, std::vector<qsizetype> rows, bool up)
+void DataSetPackage::labelMoveRows(QString colIdx, std::vector<qsizetype> rows, bool up)
 {
 	Column	*	column		= _dataSet->column(colIdx);
 	column->labelsMoveRows(rows, up);
 }
 
-void DataSetPackage::labelReverse(size_t colIdx)
+void DataSetPackage::labelReverse(QString colIdx)
 {
-	Column		*	column	= _dataSet->columns()[colIdx];
+	Column		*	column	= _dataSet->column(colIdx);
 
 	column->labelsReverse();
 }

Desktop/data/datasetpackage.h

@@ -225,8 +225,8 @@ class DataSetPackage : public QObject
 
 
 				bool						labelNeedsFilter(					size_t				columnIndex)				const;
-				void						labelMoveRows(						size_t				columnIndex, std::vector<qsizetype> rows, bool up);
-				void						labelReverse(						size_t				columnIndex);
+				void						labelMoveRows(						QString				columnIndex, std::vector<qsizetype> rows, bool up);
+				void						labelReverse(						QString				columnIndex);
 				void						resetAllFilters();
 				std::vector<bool>			filterVector();
 				void						setFilterVectorWithoutModelUpdate(std::vector<bool> newFilterVector) { if(_dataSet) _dataSet->shownFilter()->setFilterVector(newFilterVector); }

Desktop/data/undostack.cpp

@@ -549,7 +549,7 @@ FilterLabelCommand::FilterLabelCommand(QAbstractItemModel *model, int labelIndex
 	_columnModel = qobject_cast<ColumnModel*>(model);
 	if (_columnModel)
 	{
-		_colId = _columnModel->chosenColumn();
+		_colId = _columnModel->columnNameQ();
 		QString label = _model->data(_model->index(_labelIndex, 0)).toString();
 		if (checked)
 			setText(QObject::tr("Filter rows having label '%1' in column '%2'").arg(label).arg(columnName()));
@@ -565,13 +565,13 @@ FilterLabelCommand::FilterLabelCommand(QAbstractItemModel *model, int labelIndex
 
 void FilterLabelCommand::undo()
 {
-	_columnModel->setChosenColumn(_colId);
+	_columnModel->setChosenColumnByName(_colId);
 	_model->setData(_model->index(_labelIndex, 0), !_checked, int(dataPkgRoles::filter));
 }
 
 void FilterLabelCommand::redo()
 {
-	_columnModel->setChosenColumn(_colId);
+	_columnModel->setChosenColumnByName(_colId);
 	_model->setData(_model->index(_labelIndex, 0), _checked, int(dataPkgRoles::filter));
 }
 
@@ -581,7 +581,7 @@ MoveLabelCommand::MoveLabelCommand(QAbstractItemModel *model, const std::vector<
 
     if (_columnModel)
     {
-        _colId = _columnModel->chosenColumn();
+		_colId = _columnModel->columnNameQ();
 		_labels.clear();
 
 		QStringList allLabels = tq(_columnModel->column()->nonEmptyLevelsStrings());
@@ -641,7 +641,7 @@ ReverseLabelCommand::ReverseLabelCommand(QAbstractItemModel *model)
 	_columnModel = qobject_cast<ColumnModel*>(model);
 	if (_columnModel)
 	{
-		_colId = _columnModel->chosenColumn();
+		_colId = _columnModel->columnNameQ();
 		setText(QObject::tr("Reverse labels of column '%1'").arg(columnName()));
 	}
 	else
@@ -658,7 +658,7 @@ void ReverseLabelCommand::undo()
 
 void ReverseLabelCommand::redo()
 {
-	_columnModel->setChosenColumn(_colId);
+	_columnModel->setChosenColumnByName(_colId);
 	DataSetPackage::pkg()->labelReverse(_colId); //through DataSetPackage to make sure signals get sent
 }
 
@@ -902,19 +902,19 @@ UndoModelCommandSingleColumn::UndoModelCommandSingleColumn(QAbstractItemModel *m
 	if(!_columnModel)
 		throw std::runtime_error("UndoModelCommandSingleColumn needs to get passed a ColumnModel!");
 
-    _colId = _columnModel->chosenColumn();
+	_colId = _columnModel->columnNameQ();
 }
 
 void UndoModelCommandSingleColumn::redo()
 {
     if(_columnModel)
-        _columnModel->setChosenColumn(_colId);
+		_columnModel->setChosenColumnByName(_colId);
 }
 
 void UndoModelCommandSingleColumn::undo()
 {
     UndoModelCommandMultipleColumns::undo();
 
     if(_columnModel)
-        _columnModel->setChosenColumn(_colId);
+		_columnModel->setChosenColumnByName(_colId);
 }

Desktop/data/undostack.h

@@ -68,8 +68,8 @@ class FilterLabelCommand: public UndoModelCommand
 
 private:
 	ColumnModel*			_columnModel = nullptr;
-	int						_colId		= -1,
-							_labelIndex = -1;
+	QString					_colId		= "";
+	int						_labelIndex = -1;
 	bool					_checked	= false;
 };
 
@@ -83,7 +83,7 @@ class ReverseLabelCommand: public UndoModelCommand
 
 private:
 	ColumnModel*			_columnModel = nullptr;
-	int						_colId		= -1;
+	QString					_colId		= "";
 };
 
 class SetJsonFilterCommand: public UndoModelCommand
@@ -185,7 +185,7 @@ class UndoModelCommandSingleColumn : public UndoModelCommandMultipleColumns
     void    undo() override;
 
 protected:
-    int						_colId		= -1;
+	QString			_colId		= "";
 	ColumnModel * _columnModel = nullptr;
 };