mirror/OpenMW
1
0
Fork 0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-01-29 09:32:45 +00:00
Code Issues Projects Releases Wiki Activity

Create the QRegularExpression in the TextNode constructor instead of for

Browse Source 
each row in the filtered table.
On a table of more than 1M entries it speeds up filtering almost tenfold (from 35s to 4s).
This commit is contained in:
fredzio 2023-04-07 15:07:35 +02:00
parent bd003f109e
commit 8717e8e487
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
apps/opencs/model/filter/textnode.cpp
View File

@ -13,6 +13,8 @@
CSMFilter::TextNode::TextNode(int columnId, const std::string& text)
: mColumnId(columnId)
, mText(text)
, mRegExp(QRegularExpression::anchoredPattern(QString::fromUtf8(mText.c_str())),
QRegularExpression::CaseInsensitiveOption)
{
}
@ -57,9 +59,7 @@ bool CSMFilter::TextNode::test(const CSMWorld::IdTableBase& table, int row, cons
return false;
/// \todo make pattern syntax configurable
QRegularExpression regExp(QRegularExpression::anchoredPattern(QString::fromUtf8(mText.c_str())),
QRegularExpression::CaseInsensitiveOption);
QRegularExpressionMatch match = regExp.match(string);
QRegularExpressionMatch match = mRegExp.match(string);
return match.hasMatch();
}

3
apps/opencs/model/filter/textnode.hpp
View File

@ -5,6 +5,8 @@
#include <string>
#include <vector>
#include <QRegularExpression>
#include <apps/opencs/model/world/idtablebase.hpp>
#include "leafnode.hpp"
@ -15,6 +17,7 @@ namespace CSMFilter
{
int mColumnId;
std::string mText;
QRegularExpression mRegExp;
public:
TextNode(int columnId, const std::string& text);