michael/quill
1
0
Fork 0
mirror of https://github.com/Quill-OS/quill.git synced 2024-10-31 21:33:22 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

PDF scaling implemented and working

Browse source
This commit is contained in:
Nicolas Mailloux 2021-09-04 13:46:39 -04:00
parent 5c274e21ec
commit 62e9ddc6e3
2 changed files with 12 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
reader.cpp
View file

@ -33,6 +33,7 @@ reader::reader(QWidget *parent) :
if(global::reader::bookIsEpub == true) {
is_epub = true;
}
mupdf::convertRelativeValues = false;
wordwidgetLock = false;
ui->setupUi(this);
@ -1562,12 +1563,6 @@ void reader::convertMuPdfVars(int fileType) {
* 0: ePUB
* 1: PDF
*/
bool convertRelativeValuesNative;
if(mupdf::convertRelativeValues == true) {
// Safer approach; local bool gets destroyed when getting out of scope
convertRelativeValuesNative = true;
mupdf::convertRelativeValues = false;
}
if(fileType == 0) {
setPageStyle(0);
mupdf::epub::fontSize = 12;
@ -1590,10 +1585,10 @@ void reader::convertMuPdfVars(int fileType) {
setPageStyle(1);
mupdf::pdf::width = defaultPdfPageWidth;
mupdf::pdf::height = defaultPdfPageHeight;
if(convertRelativeValuesNative == true) {
if(mupdf::convertRelativeValues == true) {
// For scaling
mupdf::pdf::width_qstr = QString::number(mupdf::pdf::relativeHeight);
mupdf::pdf::height_qstr = QString::number(mupdf::pdf::relativeWidth);
mupdf::pdf::width_qstr = QString::number(mupdf::pdf::relativeWidth);
mupdf::pdf::height_qstr = QString::number(mupdf::pdf::relativeHeight);
}
else {
// Default
@ -1612,6 +1607,9 @@ void reader::convertMuPdfVars(int fileType) {
}
mupdf::pdf::pdfPageNumber_qstr = QString::number(mupdf::pdf::pdfPageNumber);
}
if(mupdf::convertRelativeValues == true) {
mupdf::convertRelativeValues = false;
}
}
void reader::setPageStyle(int fileType) {
@ -1652,15 +1650,15 @@ void reader::setPageStyle(int fileType) {
}
}
void reader::delay(int seconds) {
void reader::delay(int mseconds) {
// https://stackoverflow.com/questions/3752742/how-do-i-create-a-pause-wait-function-using-qt
QTime dieTime= QTime::currentTime().addSecs(seconds);
QTime dieTime= QTime::currentTime().addMSecs(mseconds);
while (QTime::currentTime() < dieTime)
QCoreApplication::processEvents(QEventLoop::AllEvents, 100);
}
void reader::on_text_selectionChanged() {
delay(0.1);
delay(100);
if(wordwidgetLock != true) {
QTextCursor cursor = ui->text->textCursor();
selected_text = cursor.selectedText();
@ -1955,6 +1953,7 @@ void reader::setupPng() {
// Note: Output file is supposed to be '/run/page.png', but somehow mutool puts it in '/run/page1.png'
QPixmap pixmap("/run/page1.png");
// Initialized above
graphicsScene->clear();
graphicsScene->addPixmap(pixmap);
ui->graphicsView->items().clear();
ui->graphicsView->setScene(graphicsScene);
@ -2021,6 +2020,7 @@ void reader::on_pdfScaleSlider_valueChanged(int value)
}
}
mupdf::convertRelativeValues = true;
setup_book(book_file, mupdf::pdf::pdfPageNumber, true);
setupPng();
}
@ -2039,7 +2039,6 @@ void reader::on_decreaseScaleBtn_clicked()
}
}
void reader::on_increaseScaleBtn_clicked()
{
int sliderCurrentValue;

7
reader.ui
View file

@ -756,13 +756,6 @@
</property>
</widget>
</item>
<item>
<widget class="Line" name="line_19">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
</widget>
</item>
</layout>
</widget>
<widget class="QWidget" name="page_16"/>