mirror/openmw-tes3mp
1
0
Fork 1
mirror of https://github.com/TES3MP/openmw-tes3mp.git synced 2025-01-21 11:23:51 +00:00
Code Issues Releases Wiki Activity

Use default sort until a more generic sort that uses numeric order can be implemented.

Browse source
This commit is contained in:
cc9cii 2014-10-08 07:59:21 +11:00
parent e1197e75bc
commit 4fd7537155
1 changed files with 1 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
apps/opencs/model/world/idtableproxymodel.cpp
View file

@ -51,21 +51,5 @@ void CSMWorld::IdTableProxyModel::setFilter (const boost::shared_ptr<CSMFilter::
bool CSMWorld::IdTableProxyModel::lessThan(const QModelIndex &left, const QModelIndex &right) const bool CSMWorld::IdTableProxyModel::lessThan(const QModelIndex &left, const QModelIndex &right) const
{ {
if(headerData(left.column(), Qt::Horizontal).toString() != "ID")
return QSortFilterProxyModel::lessThan(left, right);
QRegExp cellPattern = QRegExp("^#(\\D?\\d+) +(\\D?\\d+)");
int leftResult = cellPattern.indexIn(sourceModel()->data(left).toString());
int leftX = cellPattern.cap(1).toInt();
int leftY = cellPattern.cap(2).toInt();
int rightResult = cellPattern.indexIn(sourceModel()->data(right).toString());
int rightX = cellPattern.cap(1).toInt();
int rightY = cellPattern.cap(2).toInt();
if(leftResult != -1 && rightResult != -1)
return(leftX < rightX) || (leftX == rightX && leftY <= rightY);
else
return QSortFilterProxyModel::lessThan(left, right); return QSortFilterProxyModel::lessThan(left, right);
} }