fenix/PDF4QT
1
0
Fork 0
mirror of https://github.com/JakubMelka/PDF4QT.git synced 2025-06-05 21:59:17 +02:00
Code Issues Packages Projects Releases Wiki Activity

Bugfix: Draw form fields

Browse Source
This commit is contained in:
Jakub Melka
2024-06-27 18:31:45 +02:00
parent 8166d9f8f4
commit a4feda2d06
9 changed files with 18 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Pdf4QtLibCore/sources/pdfannotation.cpp
View File

@ -1427,10 +1427,12 @@ void PDFAnnotationManager::drawPage(QPainter* painter,
const PDFPrecompiledPage* compiledPage, const PDFPrecompiledPage* compiledPage,
PDFTextLayoutGetter& layoutGetter, PDFTextLayoutGetter& layoutGetter,
const QTransform& pagePointToDevicePointMatrix, const QTransform& pagePointToDevicePointMatrix,
const PDFColorConvertor& convertor,
QList<PDFRenderError>& errors) const QList<PDFRenderError>& errors) const
{ {
Q_UNUSED(compiledPage); Q_UNUSED(compiledPage);
Q_UNUSED(layoutGetter); Q_UNUSED(layoutGetter);
Q_UNUSED(convertor);
const PDFPage* page = m_document->getCatalog()->getPage(pageIndex); const PDFPage* page = m_document->getCatalog()->getPage(pageIndex);
Q_ASSERT(page); Q_ASSERT(page);

1
Pdf4QtLibCore/sources/pdfannotation.h
View File

@ -1474,6 +1474,7 @@ public:
const PDFPrecompiledPage* compiledPage, const PDFPrecompiledPage* compiledPage,
PDFTextLayoutGetter& layoutGetter, PDFTextLayoutGetter& layoutGetter,
const QTransform& pagePointToDevicePointMatrix, const QTransform& pagePointToDevicePointMatrix,
const PDFColorConvertor& convertor,
QList<PDFRenderError>& errors) const; QList<PDFRenderError>& errors) const;
/// Set document /// Set document

9
Pdf4QtLibCore/sources/pdfrenderer.cpp
View File

@ -241,10 +241,13 @@ QImage PDFRasterizer::render(PDFInteger pageIndex,
QSize size, QSize size,
PDFRenderer::Features features, PDFRenderer::Features features,
const PDFAnnotationManager* annotationManager, const PDFAnnotationManager* annotationManager,
const PDFCMS* cms,
PageRotation extraRotation) PageRotation extraRotation)
{ {
QImage image(size, QImage::Format_ARGB32_Premultiplied); QImage image(size, QImage::Format_ARGB32_Premultiplied);
PDFColorConvertor convertor = cms->getColorConvertor();
PDFRenderer::applyFeaturesToColorConvertor(features, convertor);
QTransform matrix = PDFRenderer::createPagePointToDevicePointMatrix(page, QRect(QPoint(0, 0), size), extraRotation); QTransform matrix = PDFRenderer::createPagePointToDevicePointMatrix(page, QRect(QPoint(0, 0), size), extraRotation);
if (m_rendererEngine == RendererEngine::Blend2D_MultiThread || if (m_rendererEngine == RendererEngine::Blend2D_MultiThread ||
@ -259,7 +262,7 @@ QImage PDFRasterizer::render(PDFInteger pageIndex,
{ {
QList<PDFRenderError> errors; QList<PDFRenderError> errors;
PDFTextLayoutGetter textLayoutGetter(nullptr, pageIndex); PDFTextLayoutGetter textLayoutGetter(nullptr, pageIndex);
annotationManager->drawPage(&painter, pageIndex, compiledPage, textLayoutGetter, matrix, errors); annotationManager->drawPage(&painter, pageIndex, compiledPage, textLayoutGetter, matrix, convertor, errors);
} }
} }
else else
@ -274,7 +277,7 @@ QImage PDFRasterizer::render(PDFInteger pageIndex,
{ {
QList<PDFRenderError> errors; QList<PDFRenderError> errors;
PDFTextLayoutGetter textLayoutGetter(nullptr, pageIndex); PDFTextLayoutGetter textLayoutGetter(nullptr, pageIndex);
annotationManager->drawPage(&painter, pageIndex, compiledPage, textLayoutGetter, matrix, errors); annotationManager->drawPage(&painter, pageIndex, compiledPage, textLayoutGetter, matrix, convertor, errors);
} }
} }
@ -381,7 +384,7 @@ void PDFRasterizerPool::render(const std::vector<PDFInteger>& pageIndices,
pageTimer.restart(); pageTimer.restart();
PDFRasterizer* rasterizer = acquire(); PDFRasterizer* rasterizer = acquire();
qint64 pageWaitTime = pageTimer.restart(); qint64 pageWaitTime = pageTimer.restart();
QImage image = rasterizer->render(pageIndex, page, &precompiledPage, imageSizeGetter(page), m_features, &annotationManager, PageRotation::None); QImage image = rasterizer->render(pageIndex, page, &precompiledPage, imageSizeGetter(page), m_features, &annotationManager, cms.data(), PageRotation::None);
qint64 pageRenderTime = pageTimer.elapsed(); qint64 pageRenderTime = pageTimer.elapsed();
release(rasterizer); release(rasterizer);

2
Pdf4QtLibCore/sources/pdfrenderer.h
View File

@ -164,6 +164,7 @@ public:
/// \param size Size of the target image /// \param size Size of the target image
/// \param features Renderer features /// \param features Renderer features
/// \param annotationManager Annotation manager (can be nullptr) /// \param annotationManager Annotation manager (can be nullptr)
/// \param cms Color management system
/// \param extraRotation Extra page rotation /// \param extraRotation Extra page rotation
QImage render(PDFInteger pageIndex, QImage render(PDFInteger pageIndex,
const PDFPage* page, const PDFPage* page,
@ -171,6 +172,7 @@ public:
QSize size, QSize size,
PDFRenderer::Features features, PDFRenderer::Features features,
const PDFAnnotationManager* annotationManager, const PDFAnnotationManager* annotationManager,
const PDFCMS* cms,
PageRotation extraRotation); PageRotation extraRotation);
private: private:

3
Pdf4QtLibWidgets/sources/pdfdrawspacecontroller.cpp
View File

@ -958,7 +958,8 @@ QImage PDFDrawWidgetProxy::drawThumbnailImage(PDFInteger pageIndex, int pixelSiz
if (compiledPage && compiledPage->isValid()) if (compiledPage && compiledPage->isValid())
{ {
// Rasterize the image. // Rasterize the image.
image = m_rasterizer->render(pageIndex, page, compiledPage, imageSize, m_features, m_widget->getAnnotationManager(), PageRotation::None); PDFCMSPointer cms = getCMSManager()->getCurrentCMS();
image = m_rasterizer->render(pageIndex, page, compiledPage, imageSize, m_features, m_widget->getAnnotationManager(), cms.data(), PageRotation::None);
} }
if (image.isNull()) if (image.isNull())

3
Pdf4QtLibWidgets/sources/pdfwidgetannotation.cpp
View File

@ -534,9 +534,10 @@ void PDFWidgetAnnotationManager::drawPage(QPainter* painter,
const PDFPrecompiledPage* compiledPage, const PDFPrecompiledPage* compiledPage,
PDFTextLayoutGetter& layoutGetter, PDFTextLayoutGetter& layoutGetter,
const QTransform& pagePointToDevicePointMatrix, const QTransform& pagePointToDevicePointMatrix,
const PDFColorConvertor& convertor,
QList<PDFRenderError>& errors) const QList<PDFRenderError>& errors) const
{ {
BaseClass::drawPage(painter, pageIndex, compiledPage, layoutGetter, pagePointToDevicePointMatrix, errors); BaseClass::drawPage(painter, pageIndex, compiledPage, layoutGetter, pagePointToDevicePointMatrix, convertor, errors);
} }
} // namespace pdf } // namespace pdf

1
Pdf4QtLibWidgets/sources/pdfwidgetannotation.h
View File

@ -55,6 +55,7 @@ public:
const PDFPrecompiledPage* compiledPage, const PDFPrecompiledPage* compiledPage,
PDFTextLayoutGetter& layoutGetter, PDFTextLayoutGetter& layoutGetter,
const QTransform& pagePointToDevicePointMatrix, const QTransform& pagePointToDevicePointMatrix,
const PDFColorConvertor& convertor,
QList<PDFRenderError>& errors) const override; QList<PDFRenderError>& errors) const override;
/// Returns tooltip generated from annotation /// Returns tooltip generated from annotation

2
Pdf4QtLibWidgets/sources/pdfwidgetformmanager.cpp
View File

@ -701,7 +701,7 @@ void PDFWidgetFormManager::updateFormWidgetEditors()
setFocusToEditor(nullptr); setFocusToEditor(nullptr);
clearEditors(); clearEditors();
for (PDFFormWidget widget : getWidgets()) for (const PDFFormWidget& widget : getWidgets())
{ {
const PDFFormField* formField = widget.getParent(); const PDFFormField* formField = widget.getParent();
switch (formField->getFieldType()) switch (formField->getFieldType())

2
Pdf4QtPageMaster/pageitemdelegate.cpp
View File

@ -191,7 +191,7 @@ QPixmap PageItemDelegate::getPageImagePixmap(const PageGroupItem* item, QRect re
renderer.compile(&compiledPage, pageIndex); renderer.compile(&compiledPage, pageIndex);
QSize imageSize = rect.size() * m_dpiScaleRatio; QSize imageSize = rect.size() * m_dpiScaleRatio;
QImage pageImage = m_rasterizer->render(pageIndex, page, &compiledPage, imageSize, pdf::PDFRenderer::getDefaultFeatures(), nullptr, groupItem.pageAdditionalRotation); QImage pageImage = m_rasterizer->render(pageIndex, page, &compiledPage, imageSize, pdf::PDFRenderer::getDefaultFeatures(), nullptr, cms.data(), groupItem.pageAdditionalRotation);
pixmap = QPixmap::fromImage(qMove(pageImage)); pixmap = QPixmap::fromImage(qMove(pageImage));
} }
} }