new future: highlight searched words in pdf preview
This commit is contained in:
vanhempi
cff481a57e
commit
22bcc888b9
@ -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)
|
||||
{
|
||||
ui->setupUi(this);
|
||||
@ -164,7 +163,8 @@ void MainWindow::lineEditReturnPressed()
|
||||
[&, q]()
|
||||
{
|
||||
SqliteSearch searcher(db);
|
||||
return searcher.search(QSSQuery::build(q));
|
||||
this->currentQuery = QSSQuery::build(q);
|
||||
return searcher.search(this->currentQuery);
|
||||
});
|
||||
searchWatcher.setFuture(searchFuture);
|
||||
}
|
||||
@ -215,8 +215,22 @@ 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());
|
||||
}
|
||||
|
@ -9,6 +9,7 @@
|
||||
#include <QFutureWatcher>
|
||||
#include <QSqlDatabase>
|
||||
#include "pdfworker.h"
|
||||
#include "../shared/qssquery.h"
|
||||
namespace Ui
|
||||
{
|
||||
class MainWindow;
|
||||
@ -41,6 +42,7 @@ class MainWindow : public QMainWindow
|
||||
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);
|
||||
|
@ -6,6 +6,7 @@
|
||||
#include <QMutexLocker>
|
||||
#include <QtConcurrent/QtConcurrent>
|
||||
#include <QtConcurrent/QtConcurrentMap>
|
||||
#include <QPainter>
|
||||
#include <atomic>
|
||||
#include "pdfworker.h"
|
||||
|
||||
@ -19,12 +20,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
|
||||
@ -34,6 +36,7 @@ struct Renderer
|
||||
this->scaleX = o.scaleX;
|
||||
this->scaleY = o.scaleY;
|
||||
this->maxTotalPreviewImageMemUsage = o.maxTotalPreviewImageMemUsage;
|
||||
this->wordsToHighlight = o.wordsToHighlight;
|
||||
}
|
||||
|
||||
~Renderer()
|
||||
@ -79,6 +82,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();
|
||||
}
|
||||
@ -86,7 +99,8 @@ 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;
|
||||
|
||||
@ -106,5 +120,5 @@ 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));
|
||||
}
|
||||
|
@ -16,7 +16,8 @@ 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
|
||||
|
Ladataan…
Viittaa uudesa ongelmassa
Block a user