crtxcr/looqs
1
0
Forc 0
Cód Saincheisteanna Iarratais Tarraingthe 1 Scaoileann Vicí Gníomhaíocht

search: Avoid redundant results by placing pages into vector instead of returning searchresult for each page

Brabhsáil Foinse
Tá an tiomantas seo le fáil i:
Albert S.
2019-04-26 15:31:42 +02:00
tuismitheoir 950749e1e4
tiomantas 8c027566e3
D'athraigh 5 comhad le 40 breiseanna agus 32 scriosta
Íoslódáil an comhad paiste Íoslódáil Comhad Diff Leathnaigh gach comhaid Laghdaigh gach comhaid

23
gui/mainwindow.cpp
Féach ar an gComhad

@ -106,12 +106,12 @@ void MainWindow::pdfPreviewReceived(PdfPreview preview)
label->setPixmap(QPixmap::fromImage(preview.previewImage));
ui->scrollAreaWidgetContents->layout()->addWidget(label);
ui->pdfProcessBar->setValue(++processedPdfPreviews);
connect(label, &ClickLabel::clicked,
[=]()
{
QSettings settings;
QString command = settings.value("pdfviewer").toString();
qDebug() << command;
if(command != "" && command.contains("%p") && command.contains("%f"))
{
command = command.replace("%f", preview.documentPath);
@ -149,21 +149,17 @@ void MainWindow::handleSearchResults(const QVector<SearchResult> &results)
this->pdfSearchResults.clear();
ui->treeResultsList->clear();
ui->lblSearchResults->setText("Results: " + QString::number(results.size()));
QString lastpath = "";
for(const SearchResult &result : results)
{
if(lastpath != result.fileData.absPath)
{
QFileInfo pathInfo(result.fileData.absPath);
QString fileName = pathInfo.fileName();
QTreeWidgetItem *item = new QTreeWidgetItem(ui->treeResultsList);
QFileInfo pathInfo(result.fileData.absPath);
QString fileName = pathInfo.fileName();
QTreeWidgetItem *item = new QTreeWidgetItem(ui->treeResultsList);
QDateTime dt = QDateTime::fromSecsSinceEpoch(result.fileData.mtime);
item->setIcon(0, iconProvider.icon(pathInfo));
item->setText(0, fileName);
item->setText(1, result.fileData.absPath);
item->setText(2, dt.toString(Qt::ISODate));
}
QDateTime dt = QDateTime::fromSecsSinceEpoch(result.fileData.mtime);
item->setIcon(0, iconProvider.icon(pathInfo));
item->setText(0, fileName);
item->setText(1, result.fileData.absPath);
item->setText(2, dt.toString(Qt::ISODate));
// TODO: this must be user defined or done more intelligently
if(this->pdfSearchResults.size() < 300)
@ -173,7 +169,6 @@ void MainWindow::handleSearchResults(const QVector<SearchResult> &results)
this->pdfSearchResults.append(result);
}
}
lastpath = result.fileData.absPath;
}
ui->treeResultsList->resizeColumnToContents(0);
ui->treeResultsList->resizeColumnToContents(1);

27
gui/pdfworker.cpp
Féach ar an gComhad

@ -2,6 +2,7 @@
#include <QApplication>
#include <QScreen>
#include <QDebug>
#include <QScopedPointer>
#include "pdfworker.h"
PdfWorker::PdfWorker()
@ -41,18 +42,22 @@ void PdfWorker::generatePreviews(QVector<SearchResult> paths, double scalefactor
{
continue;
}
int p = (int)sr.page - 1;
if(p < 0)
p = 0;
Poppler::Page *pdfpage = doc->page(p);
QImage image = pdfpage->renderToImage(QGuiApplication::primaryScreen()->physicalDotsPerInchX() * scalefactor,
QGuiApplication::primaryScreen()->physicalDotsPerInchY() * scalefactor);
for(unsigned int page : sr.pages)
{
int p = (int)page - 1;
if(p < 0)
p = 0;
Poppler::Page *pdfPage = doc->page(p);
QImage image =
pdfPage->renderToImage(QGuiApplication::primaryScreen()->physicalDotsPerInchX() * scalefactor,
QGuiApplication::primaryScreen()->physicalDotsPerInchY() * scalefactor);
PdfPreview preview;
preview.previewImage = image;
preview.documentPath = sr.fileData.absPath;
preview.page = sr.page;
emit previewReady(preview);
PdfPreview preview;
preview.previewImage = image;
preview.documentPath = sr.fileData.absPath;
preview.page = page;
emit previewReady(preview);
}
}
isFreeMutex.lock();
isFree.wakeOne();