diff options
Diffstat (limited to 'src/core/printing/printer_worker.cpp')
-rw-r--r-- | src/core/printing/printer_worker.cpp | 82 |
1 files changed, 11 insertions, 71 deletions
diff --git a/src/core/printing/printer_worker.cpp b/src/core/printing/printer_worker.cpp index 411e326c3..6032f2211 100644 --- a/src/core/printing/printer_worker.cpp +++ b/src/core/printing/printer_worker.cpp @@ -1,41 +1,5 @@ -/**************************************************************************** -** -** Copyright (C) 2018 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of the QtWebEngine module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and The Qt Company. For licensing terms -** and conditions see https://www.qt.io/terms-conditions. For further -** information use the contact form at https://www.qt.io/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 3 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL3 included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 3 requirements -** will be met: https://www.gnu.org/licenses/lgpl-3.0.html. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 2.0 or (at your option) the GNU General -** Public license version 3 or any later version approved by the KDE Free -** Qt Foundation. The licenses are as published by the Free Software -** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3 -** included in the packaging of this file. Please review the following -** information to ensure the GNU General Public License requirements will -** be met: https://www.gnu.org/licenses/gpl-2.0.html and -** https://www.gnu.org/licenses/gpl-3.0.html. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ +// Copyright (C) 2018 The Qt Company Ltd. +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only #include "printer_worker.h" @@ -63,22 +27,8 @@ void PrinterWorker::print() PdfiumDocumentWrapperQt pdfiumWrapper(m_data->constData(), m_data->size()); - const QPageRanges ranges = m_device->pageRanges(); - int toPage = ranges.firstPage(); - int fromPage = ranges.lastPage(); - bool ascendingOrder = true; - - if (fromPage == 0 && toPage == 0) { - fromPage = 1; - toPage = pdfiumWrapper.pageCount(); - } - fromPage = qMax(1, fromPage); - toPage = qMin(pdfiumWrapper.pageCount(), toPage); - - if (!m_firstPageFirst) { - qSwap(fromPage, toPage); - ascendingOrder = false; - } + const int fromPage = m_firstPageFirst ? 0 : pdfiumWrapper.pageCount() - 1; + const int toPage = m_firstPageFirst ? pdfiumWrapper.pageCount() : -1; int pageCopies = 1; if (m_collateCopies) { @@ -94,15 +44,13 @@ void PrinterWorker::print() if (printedDocuments > 0) m_device->newPage(); - int currentPageIndex = fromPage; - - for (int i = 0; true; i++) { - QSizeF documentSize = (pdfiumWrapper.pageSize(currentPageIndex - 1) * resolution); + for (int i = fromPage; i != toPage; m_firstPageFirst ? i++ : i--) { + QSizeF documentSize = (pdfiumWrapper.pageSize(i) * resolution); bool isLandscape = documentSize.width() > documentSize.height(); m_device->setPageOrientation(isLandscape ? QPageLayout::Landscape : QPageLayout::Portrait); - QRectF pageRect = m_device->pageLayout().pageSize().rectPixels(m_deviceResolution); - documentSize = documentSize.scaled(pageRect.size(), Qt::KeepAspectRatio); + QRectF paintRect = m_device->pageLayout().paintRectPixels(m_deviceResolution); + documentSize = documentSize.scaled(paintRect.size(), Qt::KeepAspectRatio); // setPageOrientation has to be called before qpainter.begin() or before // qprinter.newPage() so correct metrics is used, therefore call begin now for only @@ -113,29 +61,21 @@ void PrinterWorker::print() return; } - if (i > 0) + if (i != fromPage) m_device->newPage(); for (int printedPages = 0; printedPages < pageCopies; printedPages++) { if (printedPages > 0) m_device->newPage(); - QImage currentImage = pdfiumWrapper.pageAsQImage( - currentPageIndex - 1, documentSize.width(), documentSize.height()); + QImage currentImage = + pdfiumWrapper.pageAsQImage(i, documentSize.width(), documentSize.height()); if (currentImage.isNull()) { Q_EMIT resultReady(false); return; } painter.drawImage(0, 0, currentImage); } - - if (currentPageIndex == toPage) - break; - - if (ascendingOrder) - currentPageIndex++; - else - currentPageIndex--; } } painter.end(); |