Skip to content

Commit 1d86010

Browse files
JorisGoosenJorisGoosen
committed
compileert niet
1 parent 2ca39b7 commit 1d86010

File tree

9 files changed

+41
-33
lines changed

9 files changed

+41
-33
lines changed

‎CommonData/dataset.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1306,11 +1306,11 @@ void DataSet::resetFilterCounters()
13061306
}
13071307

13081308

1309-
bool DataSet::setColumnTypes(intset columnIndexes, columnType newColumnType)
1309+
bool DataSet::setColumnTypes(stringset columnIndexes, columnType newColumnType)
13101310
{
13111311
bool somethingChanged = false;
13121312

1313-
for(int columnIndex : columnIndexes)
1313+
for(const std::string & columnIndex : columnIndexes)
13141314
{
13151315
Column *col = column(columnIndex);
13161316

‎CommonData/dataset.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -183,7 +183,7 @@ public slots:
183183
void handleColumnTypeChanged( const Column * column);
184184
void handleColumnsAboutToBeRemoved(const QModelIndex &parent, int first, int last) { emit columnsBeingRemoved(first, (last-first)+1); }
185185

186-
bool setColumnTypes(intset columnIndexes, columnType newColumnType);
186+
bool setColumnTypes(stringset columnIndexes, columnType newColumnType);
187187

188188

189189
public:

‎Desktop/data/columnmodel.cpp‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -378,7 +378,7 @@ void ColumnModel::setColumnType(QString type)
378378
if (_virtual)
379379
_dummyColumn.type = cType;
380380
else if(column())
381-
undoStack()->pushCommand(new SetColumnTypeCommand(this, {chosenColumn()}, int(cType)));
381+
undoStack()->pushCommand(new SetColumnTypeCommand(this, {fq(columnNameQ())}, int(cType)));
382382
}
383383

384384
std::vector<size_t> ColumnModel::getSortedSelection() const
@@ -457,13 +457,13 @@ void ColumnModel::reverseValues()
457457
return;
458458

459459
_lastSelected = -1;
460-
undoStack()->pushCommand(new ColumnReverseValuesCommand(this, {chosenColumn()}));
460+
undoStack()->pushCommand(new ColumnReverseValuesCommand(this, {fq(columnNameQ())}));
461461
}
462462

463463
void ColumnModel::toggleAutoSortByValues()
464464
{
465465
_lastSelected = -1;
466-
undoStack()->pushCommand(new ColumnToggleAutoSortByValuesCommand(this, {chosenColumn()}));
466+
undoStack()->pushCommand(new ColumnToggleAutoSortByValuesCommand(this, {fq(columnNameQ())}));
467467
}
468468

469469
bool ColumnModel::setData(const QModelIndex & index, const QVariant & value, int role)

‎Desktop/data/datasetpackage.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -438,7 +438,7 @@ void DataSetPackage::resetAllFilters()
438438
_dataSet->resetAllFilters();
439439
}
440440

441-
bool DataSetPackage::setColumnTypes(intset columnIndexes, columnType newColumnType)
441+
bool DataSetPackage::setColumnTypes(stringset columnIndexes, columnType newColumnType)
442442
{
443443
if (_dataSet == nullptr)
444444
return true;

‎Desktop/data/datasetpackage.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -194,7 +194,7 @@ class DataSetPackage : public QObject
194194
bool isColumnInvalidated( size_t colIndex) const;
195195

196196

197-
bool setColumnTypes(intset columnIndexes, columnType newColumnType);
197+
bool setColumnTypes(stringset columnIndexes, columnType newColumnType);
198198

199199

200200
int columnsFilteredCount();

‎Desktop/data/expanddataproxymodel.cpp‎

Lines changed: 15 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
#include "expanddataproxymodel.h"
22
#include "datasettablemodel.h"
33
#include "dataenums.h"
4+
#include "qutils.h"
45

56
ExpandDataProxyModel::ExpandDataProxyModel(QObject *parent)
67
: QIdentityProxyModel{parent}
@@ -272,21 +273,32 @@ void ExpandDataProxyModel::pasteSpreadsheet(int row, int col, const std::vector<
272273
undoStack()->endMacro(new PasteSpreadsheetCommand(sourceModel(), row, col, values, labels, selected, colNames));
273274
}
274275

276+
stringset ExpandDataProxyModel::columnIndexesToNames(intset columnIndexes)
277+
{
278+
stringset colNames;
279+
280+
for(int i : columnIndexes)
281+
colNames.insert(fq(headerData(i, Qt::Horizontal, int(dataPkgRoles::name)).toString()));
282+
283+
return colNames;
284+
}
285+
275286
int ExpandDataProxyModel::setColumnType(intset columnIndexes, int columnType)
276287
{
277-
undoStack()->pushCommand(new SetColumnTypeCommand(sourceModel(), columnIndexes, columnType));
288+
289+
undoStack()->pushCommand(new SetColumnTypeCommand(sourceModel(), columnIndexesToNames(columnIndexes), columnType));
278290

279291
return columnType; //it always works
280292
}
281293

282294
void ExpandDataProxyModel::columnReverseValues(intset columnIndexes)
283295
{
284-
undoStack()->pushCommand(new ColumnReverseValuesCommand(sourceModel(), columnIndexes));
296+
undoStack()->pushCommand(new ColumnReverseValuesCommand(sourceModel(), columnIndexesToNames(columnIndexes)));
285297
}
286298

287299
void ExpandDataProxyModel::columnautoSortByValues(intset columnIndexes)
288300
{
289-
undoStack()->pushCommand(new ColumnToggleAutoSortByValuesCommand(sourceModel(), columnIndexes));
301+
undoStack()->pushCommand(new ColumnToggleAutoSortByValuesCommand(sourceModel(), columnIndexesToNames(columnIndexes)));
290302
}
291303

292304
void ExpandDataProxyModel::copyColumns(int startCol, const std::vector<Json::Value>& copiedColumns)

‎Desktop/data/expanddataproxymodel.h‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,7 @@ class ExpandDataProxyModel : public QIdentityProxyModel
4747
QString redoText() { return undoStack()->redoText(); }
4848
void resize(int row, int col, bool onlyExpand = true, const QString& undoText = QString());
4949

50+
stringset columnIndexesToNames(intset columnIndexes);
5051
signals:
5152
void undoChanged();
5253

‎Desktop/data/undostack.cpp‎

Lines changed: 11 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -248,15 +248,10 @@ void PasteSpreadsheetCommand::redo()
248248

249249

250250

251-
SetColumnTypeCommand::SetColumnTypeCommand(QAbstractItemModel *model, intset cols, int colType)
251+
SetColumnTypeCommand::SetColumnTypeCommand(QAbstractItemModel *model, stringset cols, int colType)
252252
: UndoModelCommandMultipleColumns(model, cols), _newColType{colType}
253253
{
254-
QStringList columnNames;
255-
256-
for(int col : _cols)
257-
columnNames.push_back(columnName(col));
258-
259-
setText(QObject::tr("Set type to '%1' for column(s) '%2'").arg(columnTypeToQString(columnType(colType)), columnNames.join(", ")));
254+
setText(QObject::tr("Set type to '%1' for column(s) '%2'").arg(columnTypeToQString(columnType(colType)), tql(_cols).join(", ")));
260255
}
261256

262257
void SetColumnTypeCommand::redo()
@@ -265,7 +260,7 @@ void SetColumnTypeCommand::redo()
265260
}
266261

267262

268-
ColumnReverseValuesCommand::ColumnReverseValuesCommand(QAbstractItemModel *model, intset cols)
263+
ColumnReverseValuesCommand::ColumnReverseValuesCommand(QAbstractItemModel *model, stringset cols)
269264
: UndoModelCommand(model), _cols{cols}
270265
{
271266
QStringList columnNames;
@@ -281,16 +276,16 @@ void ColumnReverseValuesCommand::redo()
281276
DataSetPackage::pkg()->columnsReverseValues(_cols);
282277
}
283278

284-
ColumnToggleAutoSortByValuesCommand::ColumnToggleAutoSortByValuesCommand(QAbstractItemModel *model, intset cols)
279+
ColumnToggleAutoSortByValuesCommand::ColumnToggleAutoSortByValuesCommand(QAbstractItemModel *model, stringset cols)
285280
: UndoModelCommandMultipleColumns(model, cols)
286281
{
287282
QStringList columnNames;
288283

289-
for(int col : cols)
284+
for(const std::string & col : cols)
290285
{
291286
_colsNewAutoSort[col] = DataSetPackage::pkg()->dataSet()->column(col) && !DataSetPackage::pkg()->dataSet()->column(col)->autoSortByValue();
292287

293-
columnNames.push_back(columnName(col));
288+
columnNames.push_back(tq(col));
294289
}
295290

296291
setText(QObject::tr("Toggle autosorting labels by values for column(s) '%1'").arg(columnNames.join(", ")));
@@ -301,12 +296,12 @@ void ColumnToggleAutoSortByValuesCommand::redo()
301296
DataSetPackage::pkg()->columnsSetAutoSortForColumns(_colsNewAutoSort);
302297
}
303298

304-
UndoModelCommandMultipleColumns::UndoModelCommandMultipleColumns(QAbstractItemModel *model, intset cols)
305-
: UndoModelCommand(model), _cols{cols}
299+
UndoModelCommandMultipleColumns::UndoModelCommandMultipleColumns(QAbstractItemModel *model, stringset cols)
300+
: UndoModelCommand(model), _cols(cols)
306301
{
307302
JASPTIMER_SCOPE(UndoModelCommandMultipleColumns::UndoModelCommandMultipleColumns);
308303

309-
for(int col : _cols)
304+
for(const std::string & col : _cols)
310305
_serializedColumns[col] = DataSetPackage::pkg()->dataSet()->column(col) ? DataSetPackage::pkg()->dataSet()->column(col)->serialize() : Json::nullValue;
311306
}
312307

@@ -316,10 +311,10 @@ void UndoModelCommandMultipleColumns::undo()
316311

317312
QStringList changed;
318313

319-
for(int col : _cols)
314+
for(const std::string & col : _cols)
320315
if(!_serializedColumns[col].isNull())
321316
{
322-
Column * column = DataSetPackage::pkg()->dataSet()->column(size_t(col));
317+
Column * column = DataSetPackage::pkg()->dataSet()->column(col);
323318
QString oldName = tq(column->name());
324319
column ->deserialize(_serializedColumns[col]);
325320
column ->data()->emitColumnChanged(oldName);

‎Desktop/data/undostack.h‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -165,15 +165,15 @@ class SetDataCommand : public UndoModelCommand
165165
class UndoModelCommandMultipleColumns : public UndoModelCommand
166166
{
167167
public:
168-
UndoModelCommandMultipleColumns(QAbstractItemModel *model, intset cols);
168+
UndoModelCommandMultipleColumns(QAbstractItemModel *model, stringset cols);
169169

170170
void undo() override;
171171

172172
protected:
173-
intset _cols;
173+
stringset _cols;
174174

175175
private:
176-
std::map<int, Json::Value> _serializedColumns;
176+
std::map<std::string, Json::Value> _serializedColumns;
177177
};
178178

179179
class UndoModelCommandSingleColumn : public UndoModelCommandMultipleColumns
@@ -282,7 +282,7 @@ class PasteSpreadsheetCommand : public UndoModelCommand
282282
class SetColumnTypeCommand : public UndoModelCommandMultipleColumns
283283
{
284284
public:
285-
SetColumnTypeCommand(QAbstractItemModel *model, intset cols, int colType);
285+
SetColumnTypeCommand(QAbstractItemModel *model, stringset cols, int colType);
286286

287287
void redo() override;
288288

@@ -293,7 +293,7 @@ class SetColumnTypeCommand : public UndoModelCommandMultipleColumns
293293
class ColumnToggleAutoSortByValuesCommand : public UndoModelCommandMultipleColumns
294294
{
295295
public:
296-
ColumnToggleAutoSortByValuesCommand(QAbstractItemModel *model, intset cols);
296+
ColumnToggleAutoSortByValuesCommand(QAbstractItemModel *model, stringset cols);
297297

298298
void redo() override;
299299

@@ -304,7 +304,7 @@ class ColumnToggleAutoSortByValuesCommand : public UndoModelCommandMultipleColum
304304
class ColumnReverseValuesCommand : public UndoModelCommand
305305
{
306306
public:
307-
ColumnReverseValuesCommand(QAbstractItemModel *model, intset cols);
307+
ColumnReverseValuesCommand(QAbstractItemModel *model, stringset cols);
308308

309309
void undo() override { redo(); }
310310
void redo() override;

0 commit comments

Comments
 (0)