Actually fix total number of pages with ranges

This commit is contained in:
Anton Thomasson 2021-02-18 20:07:40 +01:00
parent 86501b45d9
commit e5b105a3c6

View file

@ -56,13 +56,20 @@ void ConvertWorker::convertPdf(QNetworkRequest request, QString filename, QTempo
emit failed(tr("Failed to get info about PDF file")); emit failed(tr("Failed to get info about PDF file"));
} }
if(PageRangeLow==0)
{
PageRangeLow=1;
}
if(PageRangeHigh==0) if(PageRangeHigh==0)
{ {
PageRangeHigh=pages; PageRangeHigh=pages;
} }
// Actual number of pages to print // Actual number of pages to print
pages = PageRangeHigh-PageRangeLow; pages = PageRangeHigh-PageRangeLow+1;
qDebug() << "PageRangeLow" << PageRangeLow << "PageRangeHigh" << PageRangeHigh << "pages" << pages;
bool urf = false; bool urf = false;
bool ps = false; bool ps = false;
@ -132,10 +139,9 @@ void ConvertWorker::convertPdf(QNetworkRequest request, QString filename, QTempo
{ {
PdfToPsArgs.append("-duplex"); PdfToPsArgs.append("-duplex");
} }
if(PageRangeLow != 0)
{ PdfToPsArgs << QStringList {"-f", QString::number(PageRangeLow), "-l", QString::number(PageRangeHigh)};
PdfToPsArgs << QStringList {"-f", QString::number(PageRangeLow), "-l", QString::number(PageRangeHigh)};
}
PdfToPsArgs << QStringList {"-paper", ShortPaperSize, filename, "-"}; PdfToPsArgs << QStringList {"-paper", ShortPaperSize, filename, "-"};
qDebug() << "pdftops args is " << PdfToPsArgs; qDebug() << "pdftops args is " << PdfToPsArgs;
@ -172,10 +178,9 @@ void ConvertWorker::convertPdf(QNetworkRequest request, QString filename, QTempo
pdftocairo->setProgram("pdftocairo"); pdftocairo->setProgram("pdftocairo");
QStringList PdfToCairoArgs = {"-pdf"}; QStringList PdfToCairoArgs = {"-pdf"};
if(PageRangeLow != 0)
{ PdfToCairoArgs << QStringList {"-f", QString::number(PageRangeLow), "-l", QString::number(PageRangeHigh)};
PdfToCairoArgs << QStringList {"-f", QString::number(PageRangeLow), "-l", QString::number(PageRangeHigh)};
}
PdfToCairoArgs << QStringList {"-paper", ShortPaperSize, filename, "-"}; PdfToCairoArgs << QStringList {"-paper", ShortPaperSize, filename, "-"};
qDebug() << "pdftocairo args is " << PdfToCairoArgs; qDebug() << "pdftocairo args is " << PdfToCairoArgs;
@ -212,10 +217,9 @@ void ConvertWorker::convertPdf(QNetworkRequest request, QString filename, QTempo
QProcess* pdftocairo = new QProcess(this); QProcess* pdftocairo = new QProcess(this);
pdftocairo->setProgram("pdftocairo"); pdftocairo->setProgram("pdftocairo");
QStringList PdfToCairoArgs; QStringList PdfToCairoArgs;
if(PageRangeLow != 0)
{ PdfToCairoArgs << QStringList {"-f", QString::number(PageRangeLow), "-l", QString::number(PageRangeHigh)};
PdfToCairoArgs << QStringList {"-f", QString::number(PageRangeLow), "-l", QString::number(PageRangeHigh)};
}
PdfToCairoArgs << QStringList {"-pdf", "-paper", ShortPaperSize, filename, "-"}; PdfToCairoArgs << QStringList {"-pdf", "-paper", ShortPaperSize, filename, "-"};
pdftocairo->setArguments(PdfToCairoArgs); pdftocairo->setArguments(PdfToCairoArgs);