nmelone/GoldenCheetah
1
0
Fork 0
mirror of https://github.com/GoldenCheetah/GoldenCheetah.git synced 2026-02-13 08:08:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

Natural sort order for workouts in train mode (#4667)

Browse Source 
* Switched from lexicographical to natural sort order in the workouttree
* Example before:
  * week 1 day 1
  * week 1 day 3
  * week 10 day 2
  * week 2 day 2
* Example after:
  * week 1 day 1
  * week 1 day 3
  * week 2 day 2
  * week 10 day 2
This commit is contained in:
Joachim Kohlhammer
2025-07-03 09:44:31 +02:00
committed by GitHub
parent 80cbc11a0f
commit b5fe5a32c1
2 changed files with 15 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/Train/MultiFilterProxyModel.cpp
View File

@@ -26,6 +26,8 @@ MultiFilterProxyModel::MultiFilterProxyModel
(QObject *parent)
: QSortFilterProxyModel(parent), _filters()
{
_collator.setCaseSensitivity(Qt::CaseInsensitive);
_collator.setNumericMode(true);
}
@@ -82,3 +84,13 @@ MultiFilterProxyModel::filterAcceptsRow
}
return true;
}
bool
MultiFilterProxyModel::lessThan
(const QModelIndex &left, const QModelIndex &right) const
{
QString leftText = left.data().toString();
QString rightText = right.data().toString();
return _collator.compare(leftText, rightText) < 0;
}

3
src/Train/MultiFilterProxyModel.h
View File

@@ -21,6 +21,7 @@
#include <QSortFilterProxyModel>
#include <QCollator>
#include <QList>
#include "ModelFilter.h"
@@ -40,9 +41,11 @@ public:
protected:
virtual bool filterAcceptsRow(int sourceRow, const QModelIndex &sourceParent) const override;
virtual bool lessThan(const QModelIndex &left, const QModelIndex &right) const override;
private:
QList<ModelFilter*> _filters;
QCollator _collator;
};
#endif // MultiFilterProxyModel_H