remove max previewimage memory usage
Tento commit je obsažen v:
rodič
582abc333f
revize
4aed15f7a4
@ -19,88 +19,71 @@ struct Renderer
|
||||
double scaleX;
|
||||
double scaleY;
|
||||
QHash<QString, Poppler::Document *> documentcache;
|
||||
qsizetype maxTotalPreviewImageMemUsage;
|
||||
std::atomic<qsizetype> currentTotalPreviewImageMemUsage { 0 };
|
||||
QVector<QString> wordsToHighlight;
|
||||
Renderer(double scaleX, double scaleY, qsizetype maxPreviewImageMemUsage, QVector<QString> wordsToHighlight)
|
||||
Renderer(double scaleX, double scaleY, 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
|
||||
concurrentmap, thus, it's ok for it to be half-broken*/
|
||||
Renderer(const Renderer &o)
|
||||
{
|
||||
this->scaleX = o.scaleX;
|
||||
this->scaleY = o.scaleY;
|
||||
this->maxTotalPreviewImageMemUsage = o.maxTotalPreviewImageMemUsage;
|
||||
this->wordsToHighlight = o.wordsToHighlight;
|
||||
}
|
||||
|
||||
~Renderer()
|
||||
{
|
||||
qDeleteAll(documentcache);
|
||||
}
|
||||
|
||||
|
||||
Poppler::Document *document(QString path)
|
||||
{
|
||||
if(documentcache.contains(path))
|
||||
return documentcache.value(path);
|
||||
|
||||
Poppler::Document *result = Poppler::Document::load(path);
|
||||
if(result == nullptr)
|
||||
{
|
||||
//TODO: some kind of user feedback would be nice
|
||||
return nullptr;
|
||||
}
|
||||
result->setRenderHint(Poppler::Document::TextAntialiasing);
|
||||
QMutexLocker locker(&cacheMutex);
|
||||
documentcache.insert(path, result);
|
||||
return result;
|
||||
if(documentcache.contains(path))
|
||||
{
|
||||
return documentcache.value(path);
|
||||
}
|
||||
Poppler::Document *result = Poppler::Document::load(path);
|
||||
if(result == nullptr)
|
||||
{
|
||||
//TODO: some kind of user feedback would be nice
|
||||
return nullptr;
|
||||
}
|
||||
result->setRenderHint(Poppler::Document::TextAntialiasing);
|
||||
QMutexLocker locker(&cacheMutex);
|
||||
documentcache.insert(path, result);
|
||||
return result;
|
||||
}
|
||||
|
||||
|
||||
|
||||
PdfPreview operator()(const PdfPreview &preview)
|
||||
{
|
||||
PdfPreview result = preview;
|
||||
if(currentTotalPreviewImageMemUsage.load() < maxTotalPreviewImageMemUsage)
|
||||
{
|
||||
Poppler::Document *doc = document(preview.documentPath);
|
||||
if(doc == nullptr)
|
||||
{
|
||||
return preview;
|
||||
}
|
||||
if(doc->isLocked())
|
||||
{
|
||||
return preview;
|
||||
}
|
||||
int p = (int)preview.page - 1;
|
||||
if(p < 0)
|
||||
{
|
||||
p = 0;
|
||||
}
|
||||
Poppler::Page *pdfPage = doc->page(p);
|
||||
QImage img = pdfPage->renderToImage(scaleX, scaleY);
|
||||
for(QString & word : wordsToHighlight)
|
||||
{
|
||||
QList<QRectF> rects = pdfPage->search(word, Poppler::Page::CaseInsensitive);
|
||||
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();
|
||||
}
|
||||
return result;
|
||||
}
|
||||
PdfPreview operator()(const PdfPreview &preview)
|
||||
{
|
||||
PdfPreview result = preview;
|
||||
Poppler::Document *doc = document(preview.documentPath);
|
||||
if(doc == nullptr)
|
||||
{
|
||||
return preview;
|
||||
}
|
||||
if(doc->isLocked())
|
||||
{
|
||||
return preview;
|
||||
}
|
||||
int p = (int)preview.page - 1;
|
||||
if(p < 0)
|
||||
{
|
||||
p = 0;
|
||||
}
|
||||
Poppler::Page *pdfPage = doc->page(p);
|
||||
QImage img = pdfPage->renderToImage(scaleX, scaleY);
|
||||
for(QString & word : wordsToHighlight)
|
||||
{
|
||||
QList<QRectF> rects = pdfPage->search(word, Poppler::Page::CaseInsensitive);
|
||||
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;
|
||||
return result;
|
||||
}
|
||||
};
|
||||
|
||||
|
||||
@ -126,7 +109,6 @@ QFuture<PdfPreview> PdfWorker::generatePreviews(const QVector<SearchResult> path
|
||||
double scaleY = QGuiApplication::primaryScreen()->physicalDotsPerInchY() * scalefactor;
|
||||
|
||||
QSettings setting;
|
||||
qsizetype maxPreviewImageMemUsage = setting.value("maxpreviewimagesmemory", 1024 * 1024 * 1024).toLongLong();
|
||||
return QtConcurrent::mapped(previews, Renderer(scaleX, scaleY, maxPreviewImageMemUsage, wordsToHighlight));
|
||||
return QtConcurrent::mapped(previews, Renderer(scaleX, scaleY, wordsToHighlight));
|
||||
}
|
||||
|
||||
|
Načítá se…
Odkázat v novém úkolu
Zablokovat Uživatele