Skip to content

Commit 0c7faef

Browse files
JorisGoosenJorisGoosen
committed
compileert weer
1 parent 39553b6 commit 0c7faef

File tree

6 files changed

+60
-58
lines changed

6 files changed

+60
-58
lines changed

‎Desktop/data/datasetpackage.cpp‎

Lines changed: 25 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -821,7 +821,7 @@ void DataSetPackage::setColumnCustomEmptyValues(size_t columnIndex, const string
821821
}
822822
}
823823

824-
void DataSetPackage::columnsReverseValues(intset columnIndexes)
824+
void DataSetPackage::columnsReverseValues(stringset columnIndexes)
825825
{
826826
columnsApply(columnIndexes, [&](Column * column)
827827
{
@@ -830,20 +830,20 @@ void DataSetPackage::columnsReverseValues(intset columnIndexes)
830830
});
831831
}
832832

833-
void DataSetPackage::columnsSetAutoSortForColumns(std::map<int,bool> sortPerColumn)
833+
void DataSetPackage::columnsSetAutoSortForColumns(std::map<std::string,bool> sortPerColumn)
834834
{
835-
intset cols;
835+
stringset cols;
836836
for(auto colSort : sortPerColumn)
837837
cols.insert(colSort.first);
838838

839839
columnsApply(cols, [&](Column * column, int colIdx)
840840
{
841-
column->setAutoSortByValue(sortPerColumn[colIdx]);
841+
column->setAutoSortByValue(sortPerColumn[column->name()]);
842842
return true;
843843
});
844844

845845
if(cols.size() == 1)
846-
emit chooseColumn(*cols.begin());
846+
emit chooseColumn(dataSet()->getColumnIndex(*cols.begin()));
847847
}
848848

849849
void DataSetPackage::columnsApply(intset columnIndexes, std::function<bool(Column * column, int col)> applyThis)
@@ -876,6 +876,26 @@ void DataSetPackage::columnsApply(intset columnIndexes, std::function<bool(Colum
876876
columnsApply(columnIndexes, [&](Column * column, int){ return applyThis(column); });
877877
}
878878

879+
void DataSetPackage::columnsApply(stringset columnNames, std::function<bool(Column * column)> applyThis)
880+
{
881+
intset columnIndexes;
882+
883+
for(auto & n : columnNames)
884+
columnIndexes.insert(getColumnIndex(n));
885+
886+
columnsApply(columnIndexes, [&](Column * column, int){ return applyThis(column); });
887+
}
888+
889+
void DataSetPackage::columnsApply(stringset columnNames, std::function<bool(Column * column, int colIndex)> applyThis)
890+
{
891+
intset columnIndexes;
892+
893+
for(auto & n : columnNames)
894+
columnIndexes.insert(getColumnIndex(n));
895+
896+
columnsApply(columnIndexes, applyThis);
897+
}
898+
879899
columnType DataSetPackage::getColumnType(size_t columnIndex) const
880900
{
881901
return _dataSet && _dataSet->column(columnIndex) ? _dataSet->column(columnIndex)->type() : columnType::unknown;

‎Desktop/data/datasetpackage.h‎

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -217,8 +217,8 @@ class DataSetPackage : public QObject
217217
void setColumnComputeFilter( size_t columnIndex, const std::string &newFilter);
218218
void setColumnHasCustomEmptyValues( size_t columnIndex, bool hasCustomEmptyValue);
219219
void setColumnCustomEmptyValues( size_t columnIndex, const stringset & customEmptyValues);
220-
void columnsReverseValues( intset columnIndex);
221-
void columnsSetAutoSortForColumns( std::map<int,bool> columnutoSort);
220+
void columnsReverseValues( stringset columnName);
221+
void columnsSetAutoSortForColumns( std::map<std::string,bool> columnAutoSort);
222222
qsizetype getMaximumColumnWidthInCharacters( int columnIndex) const;
223223
Json::Value serializeColumn( const std::string & columnName) const;
224224
void deserializeColumn( const std::string & columnName, const Json::Value& col);
@@ -249,6 +249,7 @@ class DataSetPackage : public QObject
249249

250250
void resetVariableTypes();
251251

252+
252253
signals:
253254
void datasetChanged( QStringList changedColumns,
254255
QStringList missingColumns,
@@ -317,8 +318,10 @@ public slots:
317318

318319
private:
319320
bool isThisTheSameThreadAsEngineSync();
320-
void columnsApply(intset columnIndexes, std::function<bool (Column *)> applyThis);
321-
void columnsApply(intset columnIndexes, std::function<bool (Column *, int)> applyThis);
321+
void columnsApply(intset columnIndxs, std::function<bool (Column *)> applyThis);
322+
void columnsApply(stringset columnNames, std::function<bool (Column *)> applyThis);
323+
void columnsApply(intset columnIndxs, std::function<bool (Column *, int)> applyThis);
324+
void columnsApply(stringset columnNames, std::function<bool (Column *, int)> applyThis);
322325

323326
private:
324327
static DataSetPackage * _singleton;

‎Desktop/data/filtermodel.cpp‎

Lines changed: 6 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -34,23 +34,6 @@ void FilterModel::applyRFilter(QString newRFilter)
3434
UndoStack::singleton()->pushCommand(new SetRFilterCommand(filter(), newRFilter));
3535
}
3636

37-
38-
void FilterModel::processFilterResult()
39-
{
40-
if(!filter())
41-
return;
42-
43-
filter()->checkFilterResults();
44-
}
45-
46-
void FilterModel::processFilterErrorMsg()
47-
{
48-
if(!filter())
49-
return;
50-
51-
filter()->checkFilterResults();
52-
}
53-
5437
void FilterModel::computeColumnSucceeded(QString columnName, QString, bool dataChanged)
5538
{
5639
if(dataChanged && filter()->columnUsed(columnName))
@@ -82,9 +65,6 @@ void FilterModel::setFilterVisible(bool newFilterVisible)
8265
_filterVisible = newFilterVisible;
8366

8467
emit filterVisibleChanged();
85-
86-
if(_filterVisible)
87-
setGeneratedFilter(tq(_labelFilterGenerator->generateFilter()));
8868
}
8969

9070
bool FilterModel::showEasyFilter() const
@@ -99,3 +79,9 @@ void FilterModel::setShowEasyFilter(bool newShowEasyFilter)
9979
_showEasyFilter = newShowEasyFilter;
10080
emit showEasyFilterChanged();
10181
}
82+
83+
void FilterModel::reset()
84+
{
85+
_showEasyFilter = true;
86+
_filterVisible = false;
87+
}

‎Desktop/data/filtermodel.h‎

Lines changed: 16 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
#include <QObject>
66
#include <QString>
77

8+
89
class Filter;
910
class UndoStack;
1011

@@ -26,27 +27,31 @@ class FilterModel : public QObject
2627
bool hasFilter() const;
2728

2829
Q_INVOKABLE bool isJustGeneratedFilter() const;
30+
bool filterVisible() const;
31+
void setFilterVisible(bool newFilterVisible);
32+
33+
bool showEasyFilter() const;
34+
void setShowEasyFilter(bool newShowEasyFilter);
35+
void reset();
2936

3037
signals:
3138
void filterDropDownListChanged();
3239
void filterChanged();
33-
34-
bool filterVisible() const;
35-
void setFilterVisible(bool newFilterVisible);
36-
37-
bool showEasyFilter() const;
38-
void setShowEasyFilter(bool newShowEasyFilter);
40+
void filterVisibleChanged();
41+
void showEasyFilterChanged();
42+
void processFilterResult();
43+
void processFilterErrorMsg();
44+
3945

4046
public slots:
4147
void applyConstructorJson( QString constructorJson);
4248
void applyRFilter( QString rFilter);
4349
void computeColumnSucceeded(QString columnName, QString warning, bool dataChanged);
4450

45-
signals:
46-
void filterVisibleChanged();
47-
void showEasyFilterChanged();
48-
void processFilterResult();
49-
void processFilterErrorMsg();
51+
52+
private:
53+
bool _filterVisible = false,
54+
_showEasyFilter = true;
5055

5156
};
5257

‎Desktop/data/undostack.cpp‎

Lines changed: 4 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -261,14 +261,9 @@ void SetColumnTypeCommand::redo()
261261

262262

263263
ColumnReverseValuesCommand::ColumnReverseValuesCommand(QAbstractItemModel *model, stringset cols)
264-
: UndoModelCommand(model), _cols{cols}
264+
: UndoModelCommandMultipleColumns(model, cols)
265265
{
266-
QStringList columnNames;
267-
268-
for(int col : _cols)
269-
columnNames.push_back(columnName(col));
270-
271-
setText(QObject::tr("Reverse values of column(s) '%1'").arg(columnNames.join(", ")));
266+
setText(QObject::tr("Reverse values of column(s) '%1'").arg(tql(cols).join(", ")));
272267
}
273268

274269
void ColumnReverseValuesCommand::redo()
@@ -279,14 +274,10 @@ void ColumnReverseValuesCommand::redo()
279274
ColumnToggleAutoSortByValuesCommand::ColumnToggleAutoSortByValuesCommand(QAbstractItemModel *model, stringset cols)
280275
: UndoModelCommandMultipleColumns(model, cols)
281276
{
282-
QStringList columnNames;
277+
QStringList columnNames = tql(cols);
283278

284279
for(const std::string & col : cols)
285-
{
286280
_colsNewAutoSort[col] = DataSetPackage::pkg()->dataSet()->column(col) && !DataSetPackage::pkg()->dataSet()->column(col)->autoSortByValue();
287-
288-
columnNames.push_back(tq(col));
289-
}
290281

291282
setText(QObject::tr("Toggle autosorting labels by values for column(s) '%1'").arg(columnNames.join(", ")));
292283
}
@@ -890,7 +881,7 @@ QString UndoModelCommand::rowName(int rowIndex) const
890881

891882

892883
UndoModelCommandSingleColumn::UndoModelCommandSingleColumn(QAbstractItemModel *model)
893-
: UndoModelCommandMultipleColumns(model, {qobject_cast<ColumnModel*>(model)->chosenColumn()} )
884+
: UndoModelCommandMultipleColumns(model, {fq(qobject_cast<ColumnModel*>(model)->columnNameQ())} )
894885
{
895886
_columnModel = qobject_cast<ColumnModel*>(model);
896887

‎Desktop/data/undostack.h‎

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -298,19 +298,16 @@ class ColumnToggleAutoSortByValuesCommand : public UndoModelCommandMultipleColum
298298
void redo() override;
299299

300300
private:
301-
std::map<int, bool> _colsNewAutoSort;
301+
std::map<std::string, bool> _colsNewAutoSort;
302302
};
303303

304-
class ColumnReverseValuesCommand : public UndoModelCommand
304+
class ColumnReverseValuesCommand : public UndoModelCommandMultipleColumns
305305
{
306306
public:
307307
ColumnReverseValuesCommand(QAbstractItemModel *model, stringset cols);
308308

309309
void undo() override { redo(); }
310310
void redo() override;
311-
312-
private:
313-
intset _cols;
314311
};
315312

316313
class InsertColumnCommand : public UndoModelCommand

0 commit comments

Comments
 (0)