new future: highlight searched words in pdf preview

This commit is contained in:
Albert S. 2019-08-18 23:23:11 +02:00
parent 404f05b89f
commit fd4a0ff9ae
4 changed files with 36 additions and 8 deletions

View File

@ -16,7 +16,6 @@
#include "clicklabel.h"
#include "../shared/sqlitesearch.h"
#include "../shared/qssgeneralexception.h"
#include "../shared/qssquery.h"
MainWindow::MainWindow(QWidget *parent) :
QMainWindow(parent),
ui(new Ui::MainWindow)
@ -158,7 +157,8 @@ void MainWindow::lineEditReturnPressed()
searchWatcher.waitForFinished();
QFuture<QVector<SearchResult>> searchFuture = QtConcurrent::run([&, q]() {
SqliteSearch searcher(db);
return searcher.search(QSSQuery::build(q));
this->currentQuery = QSSQuery::build(q);
return searcher.search(this->currentQuery);
});
searchWatcher.setFuture(searchFuture);
@ -210,8 +210,21 @@ void MainWindow::makePdfPreview()
processedPdfPreviews = 0;
QString scaleText = ui->comboScale->currentText();
scaleText.chop(1);
QVector<QString> wordsToHighlight;
for(const Token &token : this->currentQuery.getTokens())
{
if(token.type == FILTER_CONTENT_CONTAINS)
{
auto splitted = token.value.split(" ");
for(QString &str : splitted)
{
wordsToHighlight.append(str);
}
}
}
PdfWorker worker;
this->pdfWorkerWatcher.setFuture(worker.generatePreviews(this->pdfSearchResults, scaleText.toInt() / 100.));
this->pdfWorkerWatcher.setFuture(worker.generatePreviews(this->pdfSearchResults, wordsToHighlight, scaleText.toInt() / 100.));
ui->pdfProcessBar->setMaximum(this->pdfWorkerWatcher.progressMaximum());
ui->pdfProcessBar->setMinimum(this->pdfWorkerWatcher.progressMinimum());

View File

@ -9,6 +9,7 @@
#include <QFutureWatcher>
#include <QSqlDatabase>
#include "pdfworker.h"
#include "../shared/qssquery.h"
namespace Ui {
class MainWindow;
}
@ -39,6 +40,7 @@ private:
unsigned int processedPdfPreviews;
void handleSearchResults(const QVector<SearchResult> &results);
void handleSearchError(QString error);
QSSQuery currentQuery;
private slots:
void lineEditReturnPressed();
void treeSearchItemActivated(QTreeWidgetItem *item, int i);

View File

@ -6,6 +6,7 @@
#include <QMutexLocker>
#include <QtConcurrent/QtConcurrent>
#include <QtConcurrent/QtConcurrentMap>
#include <QPainter>
#include <atomic>
#include "pdfworker.h"
@ -20,12 +21,13 @@ struct Renderer
QHash<QString, Poppler::Document *> documentcache;
qsizetype maxTotalPreviewImageMemUsage;
std::atomic<qsizetype> currentTotalPreviewImageMemUsage { 0 };
Renderer(double scaleX, double scaleY, qsizetype maxPreviewImageMemUsage)
QVector<QString> wordsToHighlight;
Renderer(double scaleX, double scaleY, qsizetype maxPreviewImageMemUsage, QVector<QString> wordsToHighlight)
{
this->scaleX = scaleX;
this->scaleY = scaleY;
this->maxTotalPreviewImageMemUsage = maxPreviewImageMemUsage;
this->wordsToHighlight = wordsToHighlight;
}
/*we need this one because std::atomic has none, but this is only a functor for
@ -35,6 +37,7 @@ struct Renderer
this->scaleX = o.scaleX;
this->scaleY = o.scaleY;
this->maxTotalPreviewImageMemUsage = o.maxTotalPreviewImageMemUsage;
this->wordsToHighlight = o.wordsToHighlight;
}
~Renderer()
@ -83,6 +86,16 @@ struct Renderer
}
Poppler::Page *pdfPage = doc->page(p);
QImage img = pdfPage->renderToImage(scaleX, scaleY);
for(QString & word : wordsToHighlight)
{
QList<QRectF> rects = pdfPage->search(word);
for(QRectF &rect : rects)
{
QPainter painter(&img);
painter.scale(scaleX / 72.0, scaleY / 72.0);
painter.fillRect(rect, QColor(255, 255, 0, 64));
}
}
result.previewImage = img;
currentTotalPreviewImageMemUsage += img.sizeInBytes();
}
@ -92,7 +105,7 @@ struct Renderer
QFuture<PdfPreview> PdfWorker::generatePreviews(const QVector<SearchResult> paths, double scalefactor)
QFuture<PdfPreview> PdfWorker::generatePreviews(const QVector<SearchResult> paths, QVector<QString> wordsToHighlight, double scalefactor)
{
QVector<PdfPreview> previews;
@ -114,6 +127,6 @@ QFuture<PdfPreview> PdfWorker::generatePreviews(const QVector<SearchResult> path
QSettings setting;
qsizetype maxPreviewImageMemUsage = setting.value("maxpreviewimagesmemory", 1024 * 1024 * 1024).toLongLong();
return QtConcurrent::mapped(previews, Renderer(scaleX, scaleY, maxPreviewImageMemUsage));
return QtConcurrent::mapped(previews, Renderer(scaleX, scaleY, maxPreviewImageMemUsage, wordsToHighlight));
}

View File

@ -17,7 +17,7 @@ class PdfWorker : public QObject
{
Q_OBJECT
public:
QFuture<PdfPreview> generatePreviews(const QVector<SearchResult> paths, double scalefactor);
QFuture<PdfPreview> generatePreviews(const QVector<SearchResult> paths, QVector<QString> wordsToHighlight, double scalefactor);
};
#endif // PDFWORKER_H