crtxcr/looqs
1
0
Fork 0
Code Issues Pull Requests 1 Releases Wiki Activity

pdf preview: proper highlighting for quoted (inside ") queries

Browse Source
This commit is contained in:
Albert S.
2019-08-19 19:43:05 +02:00
parent 3d241ad30a
commit 83535960f9
2 changed files with 12 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
gui/mainwindow.cpp
View File

@@ -212,14 +212,22 @@ void MainWindow::makePdfPreview()
scaleText.chop(1); scaleText.chop(1);
QVector<QString> wordsToHighlight; QVector<QString> wordsToHighlight;
QRegularExpression extractor(R"#("([^"]*)"|(\w+))#");
for(const Token &token : this->currentQuery.getTokens()) for(const Token &token : this->currentQuery.getTokens())
{ {
if(token.type == FILTER_CONTENT_CONTAINS) if(token.type == FILTER_CONTENT_CONTAINS)
{ {
auto splitted = token.value.split(" "); QRegularExpressionMatchIterator i = extractor.globalMatch(token.value);
for(QString &str : splitted) while(i.hasNext())
{ {
wordsToHighlight.append(str); QRegularExpressionMatch m = i.next();
QString value = m.captured(1);
if(value.isEmpty())
{
value = m.captured(2);
}
wordsToHighlight.append(value);
} }
} }
} }

2
gui/pdfworker.cpp
View File

@@ -88,7 +88,7 @@ struct Renderer
QImage img = pdfPage->renderToImage(scaleX, scaleY); QImage img = pdfPage->renderToImage(scaleX, scaleY);
for(QString & word : wordsToHighlight) for(QString & word : wordsToHighlight)
{ {
QList<QRectF> rects = pdfPage->search(word); QList<QRectF> rects = pdfPage->search(word, Poppler::Page::CaseInsensitive);
for(QRectF &rect : rects) for(QRectF &rect : rects)
{ {
QPainter painter(&img); QPainter painter(&img);