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

Editor plugin: Bugfixing

Browse Source
This commit is contained in:
Jakub Melka
2024-06-09 18:29:38 +02:00
parent f78fb54607
commit b43b4c1874
6 changed files with 80 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Pdf4QtLibWidgets/sources/pdfpagecontenteditortools.cpp
View File

@@ -166,7 +166,7 @@ void PDFCreatePCElementRectangleTool::drawPage(QPainter* painter,
m_element->setPageIndex(pageIndex);
m_element->setRectangle(rectangle);
m_element->drawPage(painter, pageIndex, compiledPage, layoutGetter, pagePointToDevicePointMatrix, errors);
m_element->drawPage(painter, m_scene, pageIndex, compiledPage, layoutGetter, pagePointToDevicePointMatrix, errors);
}
const PDFPageContentElement* PDFCreatePCElementRectangleTool::getElement() const
@@ -262,7 +262,7 @@ void PDFCreatePCElementLineTool::drawPage(QPainter* painter,
m_element->setLine(line);
}
m_element->drawPage(painter, pageIndex, compiledPage, layoutGetter, pagePointToDevicePointMatrix, errors);
m_element->drawPage(painter, m_scene, pageIndex, compiledPage, layoutGetter, pagePointToDevicePointMatrix, errors);
}
const PDFPageContentElement* PDFCreatePCElementLineTool::getElement() const
@@ -366,7 +366,7 @@ void PDFCreatePCElementImageTool::drawPage(QPainter* painter,
painter->drawRect(rectangle);
}
m_element->drawPage(painter, pageIndex, compiledPage, layoutGetter, pagePointToDevicePointMatrix, errors);
m_element->drawPage(painter, m_scene, pageIndex, compiledPage, layoutGetter, pagePointToDevicePointMatrix, errors);
}
const PDFPageContentElement* PDFCreatePCElementImageTool::getElement() const
@@ -556,7 +556,7 @@ void PDFCreatePCElementFreehandCurveTool::drawPage(QPainter* painter,
return;
}
m_element->drawPage(painter, pageIndex, compiledPage, layoutGetter, pagePointToDevicePointMatrix, errors);
m_element->drawPage(painter, m_scene, pageIndex, compiledPage, layoutGetter, pagePointToDevicePointMatrix, errors);
}
const PDFPageContentElement* PDFCreatePCElementFreehandCurveTool::getElement() const

40
Pdf4QtLibWidgets/sources/pdfpagecontentelements.cpp
View File

@@ -270,6 +270,7 @@ void PDFPageContentElementRectangle::setRectangle(const QRectF& newRectangle)
}
void PDFPageContentElementRectangle::drawPage(QPainter* painter,
const pdf::PDFPageContentScene* scene,
PDFInteger pageIndex,
const PDFPrecompiledPage* compiledPage,
PDFTextLayoutGetter& layoutGetter,
@@ -279,6 +280,7 @@ void PDFPageContentElementRectangle::drawPage(QPainter* painter,
Q_UNUSED(compiledPage);
Q_UNUSED(layoutGetter);
Q_UNUSED(errors);
Q_UNUSED(scene);
if (pageIndex != getPageIndex())
{
@@ -663,7 +665,7 @@ void PDFPageContentScene::drawElements(QPainter* painter,
continue;
}
element->drawPage(painter, pageIndex, compiledPage, layoutGetter, pagePointToDevicePointMatrix, errors);
element->drawPage(painter, this, pageIndex, compiledPage, layoutGetter, pagePointToDevicePointMatrix, errors);
}
}
@@ -977,6 +979,7 @@ PDFPageContentElementLine* PDFPageContentElementLine::clone() const
}
void PDFPageContentElementLine::drawPage(QPainter* painter,
const pdf::PDFPageContentScene* scene,
PDFInteger pageIndex,
const PDFPrecompiledPage* compiledPage,
PDFTextLayoutGetter& layoutGetter,
@@ -986,6 +989,7 @@ void PDFPageContentElementLine::drawPage(QPainter* painter,
Q_UNUSED(compiledPage);
Q_UNUSED(layoutGetter);
Q_UNUSED(errors);
Q_UNUSED(scene);
if (pageIndex != getPageIndex())
{
@@ -1159,15 +1163,17 @@ PDFPageContentImageElement* PDFPageContentImageElement::clone() const
}
void PDFPageContentImageElement::drawPage(QPainter* painter,
PDFInteger pageIndex,
const PDFPrecompiledPage* compiledPage,
PDFTextLayoutGetter& layoutGetter,
const QTransform& pagePointToDevicePointMatrix,
QList<PDFRenderError>& errors) const
const pdf::PDFPageContentScene* scene,
PDFInteger pageIndex,
const PDFPrecompiledPage* compiledPage,
PDFTextLayoutGetter& layoutGetter,
const QTransform& pagePointToDevicePointMatrix,
QList<PDFRenderError>& errors) const
{
Q_UNUSED(compiledPage);
Q_UNUSED(layoutGetter);
Q_UNUSED(errors);
Q_UNUSED(scene);
if (pageIndex != getPageIndex() || !getRectangle().isValid())
{
@@ -1286,6 +1292,7 @@ PDFPageContentElementDot* PDFPageContentElementDot::clone() const
}
void PDFPageContentElementDot::drawPage(QPainter* painter,
const pdf::PDFPageContentScene* scene,
PDFInteger pageIndex,
const PDFPrecompiledPage* compiledPage,
PDFTextLayoutGetter& layoutGetter,
@@ -1295,6 +1302,7 @@ void PDFPageContentElementDot::drawPage(QPainter* painter,
Q_UNUSED(compiledPage);
Q_UNUSED(layoutGetter);
Q_UNUSED(errors);
Q_UNUSED(scene);
if (pageIndex != getPageIndex())
{
@@ -1374,6 +1382,7 @@ PDFPageContentElementFreehandCurve* PDFPageContentElementFreehandCurve::clone()
}
void PDFPageContentElementFreehandCurve::drawPage(QPainter* painter,
const pdf::PDFPageContentScene* scene,
PDFInteger pageIndex,
const PDFPrecompiledPage* compiledPage,
PDFTextLayoutGetter& layoutGetter,
@@ -1383,6 +1392,7 @@ void PDFPageContentElementFreehandCurve::drawPage(QPainter* painter,
Q_UNUSED(compiledPage);
Q_UNUSED(layoutGetter);
Q_UNUSED(errors);
Q_UNUSED(scene);
if (pageIndex != getPageIndex())
{
@@ -2334,7 +2344,7 @@ void PDFPageContentElementManipulator::drawPage(QPainter* painter,
for (const auto& manipulatedElement : m_manipulatedElements)
{
manipulatedElement->drawPage(painter, pageIndex, compiledPage, layoutGetter, pagePointToDevicePointMatrix, errors);
manipulatedElement->drawPage(painter, m_scene, pageIndex, compiledPage, layoutGetter, pagePointToDevicePointMatrix, errors);
}
}
}
@@ -2399,6 +2409,7 @@ PDFPageContentElementTextBox* PDFPageContentElementTextBox::clone() const
}
void PDFPageContentElementTextBox::drawPage(QPainter* painter,
const pdf::PDFPageContentScene* scene,
PDFInteger pageIndex,
const PDFPrecompiledPage* compiledPage,
PDFTextLayoutGetter& layoutGetter,
@@ -2408,6 +2419,7 @@ void PDFPageContentElementTextBox::drawPage(QPainter* painter,
Q_UNUSED(compiledPage);
Q_UNUSED(layoutGetter);
Q_UNUSED(errors);
Q_UNUSED(scene);
if (pageIndex != getPageIndex())
{
@@ -2580,6 +2592,7 @@ PDFPageContentElementEdited* PDFPageContentElementEdited::clone() const
}
void PDFPageContentElementEdited::drawPage(QPainter* painter,
const pdf::PDFPageContentScene* scene,
PDFInteger pageIndex,
const PDFPrecompiledPage* compiledPage,
PDFTextLayoutGetter& layoutGetter,
@@ -2593,13 +2606,22 @@ void PDFPageContentElementEdited::drawPage(QPainter* painter,
Q_UNUSED(layoutGetter);
Q_UNUSED(errors);
QRectF clipRect = m_element->getBoundingBox();
painter->setWorldTransform(QTransform(pagePointToDevicePointMatrix), true);
painter->setPen(Qt::SolidLine);
painter->setBrush(Qt::NoBrush);
painter->setFont(QApplication::font());
painter->setRenderHint(QPainter::Antialiasing);
painter->setClipRect(clipRect, Qt::IntersectClip);
const pdf::PDFPage* page = scene->getDocument()->getCatalog()->getPage(pageIndex);
QRectF mediaBox = page->getMediaBox();
if (mediaBox.isValid())
{
QPainterPath path;
path.addPolygon(mediaBox);
painter->setClipPath(path, Qt::IntersectClip);
}
painter->setTransform(m_element->getTransform(), true);
if (const PDFEditedPageContentElementImage* imageElement = m_element->asImage())

15
Pdf4QtLibWidgets/sources/pdfpagecontentelements.h
View File

@@ -55,6 +55,7 @@ public:
virtual PDFPageContentElement* clone() const = 0;
virtual void drawPage(QPainter* painter,
const PDFPageContentScene* scene,
PDFInteger pageIndex,
const PDFPrecompiledPage* compiledPage,
PDFTextLayoutGetter& layoutGetter,
@@ -167,6 +168,7 @@ public:
void setRectangle(const QRectF& newRectangle);
virtual void drawPage(QPainter* painter,
const PDFPageContentScene* scene,
PDFInteger pageIndex,
const PDFPrecompiledPage* compiledPage,
PDFTextLayoutGetter& layoutGetter,
@@ -202,6 +204,7 @@ public:
};
virtual void drawPage(QPainter* painter,
const PDFPageContentScene* scene,
PDFInteger pageIndex,
const PDFPrecompiledPage* compiledPage,
PDFTextLayoutGetter& layoutGetter,
@@ -236,6 +239,7 @@ public:
virtual PDFPageContentElementDot* clone() const override;
virtual void drawPage(QPainter* painter,
const PDFPageContentScene* scene,
PDFInteger pageIndex,
const PDFPrecompiledPage* compiledPage,
PDFTextLayoutGetter& layoutGetter,
@@ -266,6 +270,7 @@ public:
virtual PDFPageContentElementFreehandCurve* clone() const override;
virtual void drawPage(QPainter* painter,
const PDFPageContentScene* scene,
PDFInteger pageIndex,
const PDFPrecompiledPage* compiledPage,
PDFTextLayoutGetter& layoutGetter,
@@ -302,6 +307,7 @@ public:
virtual PDFPageContentImageElement* clone() const override;
virtual void drawPage(QPainter* painter,
const PDFPageContentScene* scene,
PDFInteger pageIndex,
const PDFPrecompiledPage* compiledPage,
PDFTextLayoutGetter& layoutGetter,
@@ -341,6 +347,7 @@ public:
void setRectangle(const QRectF& newRectangle) { m_rectangle = newRectangle; }
virtual void drawPage(QPainter* painter,
const PDFPageContentScene* scene,
PDFInteger pageIndex,
const PDFPrecompiledPage* compiledPage,
PDFTextLayoutGetter& layoutGetter,
@@ -383,7 +390,13 @@ public:
virtual ~PDFPageContentElementEdited();
virtual PDFPageContentElementEdited* clone() const override;
virtual void drawPage(QPainter* painter, PDFInteger pageIndex, const PDFPrecompiledPage* compiledPage, PDFTextLayoutGetter& layoutGetter, const QTransform& pagePointToDevicePointMatrix, QList<PDFRenderError>& errors) const override;
virtual void drawPage(QPainter* painter,
const PDFPageContentScene* scene,
PDFInteger pageIndex,
const PDFPrecompiledPage* compiledPage,
PDFTextLayoutGetter& layoutGetter,
const QTransform& pagePointToDevicePointMatrix,
QList<PDFRenderError>& errors) const override;
virtual uint getManipulationMode(const QPointF& point, PDFReal snapPointDistanceThreshold) const override;
virtual void performManipulation(uint mode, const QPointF& offset) override;
virtual QRectF getBoundingBox() const override;