mirror of https://github.com/JakubMelka/PDF4QT.git
Refactoring, element rendering
This commit is contained in:
parent
379fddcc83
commit
34f64c3a85
|
@ -50,20 +50,20 @@ void EditorPlugin::setWidget(pdf::PDFWidget* widget)
|
|||
|
||||
BaseClass::setWidget(widget);
|
||||
|
||||
QAction* activateAction = new QAction(QIcon(":/pdfplugins/editorplugin/activate.svg"), tr("Edit page content"), this);
|
||||
QAction* createTextAction = new QAction(QIcon(":/pdfplugins/editorplugin/create-text.svg"), tr("Create Text Label"), this);
|
||||
QAction* createFreehandCurveAction = new QAction(QIcon(":/pdfplugins/editorplugin/create-freehand-curve.svg"), tr("Create Freehand Curve"), this);
|
||||
QAction* createAcceptMarkAction = new QAction(QIcon(":/pdfplugins/editorplugin/create-yes-mark.svg"), tr("Create Accept Mark"), this);
|
||||
QAction* createRejectMarkAction = new QAction(QIcon(":/pdfplugins/editorplugin/create-no-mark.svg"), tr("Create Reject Mark"), this);
|
||||
QAction* createRectangleAction = new QAction(QIcon(":/pdfplugins/editorplugin/create-rectangle.svg"), tr("Create Rectangle"), this);
|
||||
QAction* createRoundedRectangleAction = new QAction(QIcon(":/pdfplugins/editorplugin/create-rounded-rectangle.svg"), tr("Create Rounded Rectangle"), this);
|
||||
QAction* createHorizontalLineAction = new QAction(QIcon(":/pdfplugins/editorplugin/create-horizontal-line.svg"), tr("Create Horizontal Line"), this);
|
||||
QAction* createVerticalLineAction = new QAction(QIcon(":/pdfplugins/editorplugin/create-vertical-line.svg"), tr("Create Vertical Line"), this);
|
||||
QAction* createLineAction = new QAction(QIcon(":/pdfplugins/editorplugin/create-line.svg"), tr("Create Line"), this);
|
||||
QAction* createDotAction = new QAction(QIcon(":/pdfplugins/editorplugin/create-dot.svg"), tr("Create Dot"), this);
|
||||
QAction* createSvgImageAction = new QAction(QIcon(":/pdfplugins/editorplugin/create-svg-image.svg"), tr("Create SVG Image"), this);
|
||||
QAction* clearAction = new QAction(QIcon(":/pdfplugins/editorplugin/clear.svg"), tr("Clear All Graphics"), this);
|
||||
QAction* certificatesAction = new QAction(QIcon(":/pdfplugins/editorplugin/certificates.svg"), tr("Certificates Manager"), this);
|
||||
QAction* activateAction = new QAction(QIcon(":/pdfplugins/editorplugin/activate.svg"), tr("&Edit page content"), this);
|
||||
QAction* createTextAction = new QAction(QIcon(":/pdfplugins/editorplugin/create-text.svg"), tr("Create &Text Label"), this);
|
||||
QAction* createFreehandCurveAction = new QAction(QIcon(":/pdfplugins/editorplugin/create-freehand-curve.svg"), tr("Create &Freehand Curve"), this);
|
||||
QAction* createAcceptMarkAction = new QAction(QIcon(":/pdfplugins/editorplugin/create-yes-mark.svg"), tr("Create &Accept Mark"), this);
|
||||
QAction* createRejectMarkAction = new QAction(QIcon(":/pdfplugins/editorplugin/create-no-mark.svg"), tr("Create &Reject Mark"), this);
|
||||
QAction* createRectangleAction = new QAction(QIcon(":/pdfplugins/editorplugin/create-rectangle.svg"), tr("Create R&ectangle"), this);
|
||||
QAction* createRoundedRectangleAction = new QAction(QIcon(":/pdfplugins/editorplugin/create-rounded-rectangle.svg"), tr("&Create Rounded Rectangle"), this);
|
||||
QAction* createHorizontalLineAction = new QAction(QIcon(":/pdfplugins/editorplugin/create-horizontal-line.svg"), tr("Create &Horizontal Line"), this);
|
||||
QAction* createVerticalLineAction = new QAction(QIcon(":/pdfplugins/editorplugin/create-vertical-line.svg"), tr("Create &Vertical Line"), this);
|
||||
QAction* createLineAction = new QAction(QIcon(":/pdfplugins/editorplugin/create-line.svg"), tr("Create L&ine"), this);
|
||||
QAction* createDotAction = new QAction(QIcon(":/pdfplugins/editorplugin/create-dot.svg"), tr("Create &Dot"), this);
|
||||
QAction* createSvgImageAction = new QAction(QIcon(":/pdfplugins/editorplugin/create-svg-image.svg"), tr("Create &SVG Image"), this);
|
||||
QAction* clearAction = new QAction(QIcon(":/pdfplugins/editorplugin/clear.svg"), tr("Clear A&ll Graphics"), this);
|
||||
QAction* certificatesAction = new QAction(QIcon(":/pdfplugins/editorplugin/certificates.svg"), tr("Certificates &Manager"), this);
|
||||
|
||||
activateAction->setObjectName("editortool_activateAction");
|
||||
createTextAction->setObjectName("editortool_createTextAction");
|
||||
|
@ -175,6 +175,11 @@ std::vector<QAction*> EditorPlugin::getActions() const
|
|||
return result;
|
||||
}
|
||||
|
||||
QString EditorPlugin::getPluginMenuName() const
|
||||
{
|
||||
return tr("Edi&tor");
|
||||
}
|
||||
|
||||
void EditorPlugin::onSceneChanged(bool graphicsOnly)
|
||||
{
|
||||
if (!graphicsOnly)
|
||||
|
@ -458,27 +463,13 @@ void EditorPlugin::updateEditedPages()
|
|||
m_editedPageContent[pageIndex] = processor.takeEditedPageContent();
|
||||
|
||||
size_t elementCount = m_editedPageContent[pageIndex].getElementCount();
|
||||
for (size_t i = 0; i <elementCount; ++i)
|
||||
for (size_t i = 0; i < elementCount; ++i)
|
||||
{
|
||||
pdf::PDFEditedPageContentElement* element = m_editedPageContent[pageIndex].getElement(i);
|
||||
|
||||
pdf::PDFPageContentElementEdited* editedElement = new pdf::PDFPageContentElementEdited(element);
|
||||
editedElement->setPageIndex(pageIndex);
|
||||
m_scene.addElement(editedElement);
|
||||
}
|
||||
/*
|
||||
std::vector<pdf::PDFEditedPageContent::ContentTextInfo> textInfos = m_editedPageContent[pageIndex].getTextInfos();
|
||||
for (const pdf::PDFEditedPageContent::ContentTextInfo& textInfo : textInfos)
|
||||
{
|
||||
if (textInfo.boundingRectangle.isEmpty())
|
||||
{
|
||||
continue;
|
||||
}
|
||||
|
||||
pdf::PDFPageContentElementEditedContentTextBox* textBox = new pdf::PDFPageContentElementEditedContentTextBox();
|
||||
textBox->setPageIndex(pageIndex);
|
||||
textBox->setRectangle(textInfo.boundingRectangle);
|
||||
textBox->setContentId(textInfo.id);
|
||||
|
||||
m_scene.addElement(textBox);
|
||||
}*/
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
@ -47,6 +47,7 @@ public:
|
|||
virtual void setWidget(pdf::PDFWidget* widget) override;
|
||||
virtual void setDocument(const pdf::PDFModifiedDocument& document) override;
|
||||
virtual std::vector<QAction*> getActions() const override;
|
||||
virtual QString getPluginMenuName() const override;
|
||||
|
||||
private:
|
||||
void onSceneChanged(bool graphicsOnly);
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
// Copyright (C) 2023 Jakub Melka
|
||||
// Copyright (C) 2023-2024 Jakub Melka
|
||||
//
|
||||
// This file is part of PDF4QT.
|
||||
//
|
||||
|
@ -61,11 +61,14 @@ void PDFPageContentEditorProcessor::performInterceptInstruction(Operator current
|
|||
{
|
||||
if (m_contentElementText && !m_contentElementText->isEmpty())
|
||||
{
|
||||
m_contentElementText->setTextPath(std::move(m_textPath));
|
||||
m_contentElementText->setBoundingBox(m_textBoundingRect);
|
||||
m_content.addContentElement(std::move(m_contentElementText));
|
||||
}
|
||||
m_contentElementText.reset();
|
||||
|
||||
m_textBoundingRect = QRectF();
|
||||
m_textPath = QPainterPath();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
@ -87,6 +90,7 @@ void PDFPageContentEditorProcessor::performPathPainting(const QPainterPath& path
|
|||
QPainterPath mappedPath = getCurrentWorldMatrix().map(path);
|
||||
QRectF boundingRect = mappedPath.boundingRect();
|
||||
m_textBoundingRect = m_textBoundingRect.united(boundingRect);
|
||||
m_textPath.addPath(mappedPath);
|
||||
}
|
||||
else
|
||||
{
|
||||
|
@ -122,8 +126,9 @@ bool PDFPageContentEditorProcessor::performOriginalImagePainting(const PDFImage&
|
|||
{
|
||||
Q_UNUSED(image);
|
||||
|
||||
QRectF boundingBox = getCurrentWorldMatrix().mapRect(QRectF(0.0, 0.0, 1.0, 1.0));
|
||||
PDFObject imageObject = PDFObject::createStream(std::make_shared<PDFStream>(*stream));
|
||||
m_content.addContentImage(*getGraphicState(), std::move(imageObject), QImage());
|
||||
m_content.addContentImage(*getGraphicState(), std::move(imageObject), QImage(), boundingBox);
|
||||
|
||||
return false;
|
||||
}
|
||||
|
@ -419,9 +424,9 @@ void PDFEditedPageContent::addContentPath(PDFPageContentProcessorState state, QP
|
|||
m_contentElements.emplace_back(new PDFEditedPageContentElementPath(std::move(state), std::move(path), strokePath, fillPath));
|
||||
}
|
||||
|
||||
void PDFEditedPageContent::addContentImage(PDFPageContentProcessorState state, PDFObject imageObject, QImage image)
|
||||
void PDFEditedPageContent::addContentImage(PDFPageContentProcessorState state, PDFObject imageObject, QImage image, QRectF boundingBox)
|
||||
{
|
||||
m_contentElements.emplace_back(new PDFEditedPageContentElementImage(std::move(state), std::move(imageObject), std::move(image)));
|
||||
m_contentElements.emplace_back(new PDFEditedPageContentElementImage(std::move(state), std::move(imageObject), std::move(image), boundingBox));
|
||||
}
|
||||
|
||||
void PDFEditedPageContent::addContentElement(std::unique_ptr<PDFEditedPageContentElement> element)
|
||||
|
@ -510,10 +515,11 @@ void PDFEditedPageContentElementPath::setFillPath(bool newFillPath)
|
|||
m_fillPath = newFillPath;
|
||||
}
|
||||
|
||||
PDFEditedPageContentElementImage::PDFEditedPageContentElementImage(PDFPageContentProcessorState state, PDFObject imageObject, QImage image) :
|
||||
PDFEditedPageContentElementImage::PDFEditedPageContentElementImage(PDFPageContentProcessorState state, PDFObject imageObject, QImage image, QRectF boundingBox) :
|
||||
PDFEditedPageContentElement(std::move(state)),
|
||||
m_imageObject(std::move(imageObject)),
|
||||
m_image(std::move(image))
|
||||
m_image(std::move(image)),
|
||||
m_boundingBox(boundingBox)
|
||||
{
|
||||
|
||||
}
|
||||
|
@ -525,7 +531,12 @@ PDFEditedPageContentElement::Type PDFEditedPageContentElementImage::getType() co
|
|||
|
||||
PDFEditedPageContentElementImage* PDFEditedPageContentElementImage::clone() const
|
||||
{
|
||||
return new PDFEditedPageContentElementImage(getState(), getImageObject(), getImage());
|
||||
return new PDFEditedPageContentElementImage(getState(), getImageObject(), getImage(), getBoundingBox());
|
||||
}
|
||||
|
||||
QRectF PDFEditedPageContentElementImage::getBoundingBox() const
|
||||
{
|
||||
return m_boundingBox;
|
||||
}
|
||||
|
||||
PDFObject PDFEditedPageContentElementImage::getImageObject() const
|
||||
|
@ -554,9 +565,14 @@ PDFEditedPageContentElementText::PDFEditedPageContentElementText(PDFPageContentP
|
|||
|
||||
}
|
||||
|
||||
PDFEditedPageContentElementText::PDFEditedPageContentElementText(PDFPageContentProcessorState state, std::vector<Item> items) :
|
||||
PDFEditedPageContentElementText::PDFEditedPageContentElementText(PDFPageContentProcessorState state,
|
||||
std::vector<Item> items,
|
||||
QPainterPath textPath,
|
||||
QRectF boundingBox) :
|
||||
PDFEditedPageContentElement(state),
|
||||
m_items(std::move(items))
|
||||
m_items(std::move(items)),
|
||||
m_boundingBox(boundingBox),
|
||||
m_textPath(std::move(textPath))
|
||||
{
|
||||
|
||||
}
|
||||
|
@ -568,7 +584,7 @@ PDFEditedPageContentElement::Type PDFEditedPageContentElementText::getType() con
|
|||
|
||||
PDFEditedPageContentElementText* PDFEditedPageContentElementText::clone() const
|
||||
{
|
||||
return new PDFEditedPageContentElementText(getState(), getItems());
|
||||
return new PDFEditedPageContentElementText(getState(), getItems(), getTextPath(), getBoundingBox());
|
||||
}
|
||||
|
||||
void PDFEditedPageContentElementText::addItem(Item item)
|
||||
|
@ -586,4 +602,24 @@ void PDFEditedPageContentElementText::setItems(const std::vector<Item>& newItems
|
|||
m_items = newItems;
|
||||
}
|
||||
|
||||
QRectF PDFEditedPageContentElementText::getBoundingBox() const
|
||||
{
|
||||
return m_boundingBox;
|
||||
}
|
||||
|
||||
void PDFEditedPageContentElementText::setBoundingBox(const QRectF& newBoundingBox)
|
||||
{
|
||||
m_boundingBox = newBoundingBox;
|
||||
}
|
||||
|
||||
QPainterPath PDFEditedPageContentElementText::getTextPath() const
|
||||
{
|
||||
return m_textPath;
|
||||
}
|
||||
|
||||
void PDFEditedPageContentElementText::setTextPath(QPainterPath newTextPath)
|
||||
{
|
||||
m_textPath = newTextPath;
|
||||
}
|
||||
|
||||
} // namespace pdf
|
||||
|
|
|
@ -29,7 +29,7 @@ class PDFEditedPageContentElementPath;
|
|||
class PDFEditedPageContentElementText;
|
||||
class PDFEditedPageContentElementImage;
|
||||
|
||||
class PDFEditedPageContentElement
|
||||
class PDF4QTLIBCORESHARED_EXPORT PDFEditedPageContentElement
|
||||
{
|
||||
public:
|
||||
PDFEditedPageContentElement() = default;
|
||||
|
@ -64,7 +64,7 @@ protected:
|
|||
PDFPageContentProcessorState m_state;
|
||||
};
|
||||
|
||||
class PDFEditedPageContentElementPath : public PDFEditedPageContentElement
|
||||
class PDF4QTLIBCORESHARED_EXPORT PDFEditedPageContentElementPath : public PDFEditedPageContentElement
|
||||
{
|
||||
public:
|
||||
PDFEditedPageContentElementPath(PDFPageContentProcessorState state, QPainterPath path, bool strokePath, bool fillPath);
|
||||
|
@ -91,16 +91,17 @@ private:
|
|||
bool m_fillPath;
|
||||
};
|
||||
|
||||
class PDFEditedPageContentElementImage : public PDFEditedPageContentElement
|
||||
class PDF4QTLIBCORESHARED_EXPORT PDFEditedPageContentElementImage : public PDFEditedPageContentElement
|
||||
{
|
||||
public:
|
||||
PDFEditedPageContentElementImage(PDFPageContentProcessorState state, PDFObject imageObject, QImage image);
|
||||
PDFEditedPageContentElementImage(PDFPageContentProcessorState state, PDFObject imageObject, QImage image, QRectF boundingBox);
|
||||
virtual ~PDFEditedPageContentElementImage() = default;
|
||||
|
||||
virtual Type getType() const override;
|
||||
virtual PDFEditedPageContentElementImage* clone() const override;
|
||||
virtual PDFEditedPageContentElementImage* asImage() override { return this; }
|
||||
virtual const PDFEditedPageContentElementImage* asImage() const override { return this; }
|
||||
virtual QRectF getBoundingBox() const override;
|
||||
|
||||
PDFObject getImageObject() const;
|
||||
void setImageObject(const PDFObject& newImageObject);
|
||||
|
@ -111,9 +112,10 @@ public:
|
|||
private:
|
||||
PDFObject m_imageObject;
|
||||
QImage m_image;
|
||||
QRectF m_boundingBox;
|
||||
};
|
||||
|
||||
class PDFEditedPageContentElementText : public PDFEditedPageContentElement
|
||||
class PDF4QTLIBCORESHARED_EXPORT PDFEditedPageContentElementText : public PDFEditedPageContentElement
|
||||
{
|
||||
public:
|
||||
|
||||
|
@ -127,13 +129,17 @@ public:
|
|||
};
|
||||
|
||||
PDFEditedPageContentElementText(PDFPageContentProcessorState state);
|
||||
PDFEditedPageContentElementText(PDFPageContentProcessorState state, std::vector<Item> items);
|
||||
PDFEditedPageContentElementText(PDFPageContentProcessorState state,
|
||||
std::vector<Item> items,
|
||||
QPainterPath textPath,
|
||||
QRectF boundingBox);
|
||||
virtual ~PDFEditedPageContentElementText() = default;
|
||||
|
||||
virtual Type getType() const override;
|
||||
virtual PDFEditedPageContentElementText* clone() const override;
|
||||
virtual PDFEditedPageContentElementText* asText() override { return this; }
|
||||
virtual const PDFEditedPageContentElementText* asText() const override { return this; }
|
||||
virtual QRectF getBoundingBox() const override;
|
||||
|
||||
void addItem(Item item);
|
||||
const std::vector<Item>& getItems() const;
|
||||
|
@ -141,11 +147,18 @@ public:
|
|||
|
||||
bool isEmpty() const { return m_items.empty(); }
|
||||
|
||||
void setBoundingBox(const QRectF& newBoundingBox);
|
||||
|
||||
QPainterPath getTextPath() const;
|
||||
void setTextPath(QPainterPath newTextPath);
|
||||
|
||||
private:
|
||||
std::vector<Item> m_items;
|
||||
QRectF m_boundingBox;
|
||||
QPainterPath m_textPath;
|
||||
};
|
||||
|
||||
class PDFEditedPageContent
|
||||
class PDF4QTLIBCORESHARED_EXPORT PDFEditedPageContent
|
||||
{
|
||||
public:
|
||||
PDFEditedPageContent() = default;
|
||||
|
@ -159,7 +172,7 @@ public:
|
|||
static QString getOperandName(PDFPageContentProcessor::Operator operatorValue, int operandIndex);
|
||||
|
||||
void addContentPath(PDFPageContentProcessorState state, QPainterPath path, bool strokePath, bool fillPath);
|
||||
void addContentImage(PDFPageContentProcessorState state, PDFObject imageObject, QImage image);
|
||||
void addContentImage(PDFPageContentProcessorState state, PDFObject imageObject, QImage image, QRectF boundingBox);
|
||||
void addContentClipping(PDFPageContentProcessorState state, QPainterPath path);
|
||||
void addContentElement(std::unique_ptr<PDFEditedPageContentElement> element);
|
||||
|
||||
|
@ -205,6 +218,7 @@ private:
|
|||
QRectF m_textBoundingRect;
|
||||
std::stack<QPainterPath> m_clippingPaths;
|
||||
std::unique_ptr<PDFEditedPageContentElementText> m_contentElementText;
|
||||
QPainterPath m_textPath;
|
||||
};
|
||||
|
||||
} // namespace pdf
|
||||
|
|
|
@ -114,56 +114,12 @@ bool PDFPainterBase::isContentSuppressedByOC(PDFObjectReference ocgOrOcmd)
|
|||
|
||||
QPen PDFPainterBase::getCurrentPenImpl() const
|
||||
{
|
||||
const PDFPageContentProcessorState* graphicState = getGraphicState();
|
||||
QColor color = graphicState->getStrokeColor();
|
||||
if (color.isValid())
|
||||
{
|
||||
color.setAlphaF(getEffectiveStrokingAlpha());
|
||||
const PDFReal lineWidth = graphicState->getLineWidth();
|
||||
Qt::PenCapStyle penCapStyle = graphicState->getLineCapStyle();
|
||||
Qt::PenJoinStyle penJoinStyle = graphicState->getLineJoinStyle();
|
||||
const PDFLineDashPattern& lineDashPattern = graphicState->getLineDashPattern();
|
||||
const PDFReal mitterLimit = graphicState->getMitterLimit();
|
||||
|
||||
QPen pen(color);
|
||||
|
||||
pen.setWidthF(lineWidth);
|
||||
pen.setCapStyle(penCapStyle);
|
||||
pen.setJoinStyle(penJoinStyle);
|
||||
pen.setMiterLimit(mitterLimit);
|
||||
|
||||
if (lineDashPattern.isSolid())
|
||||
{
|
||||
pen.setStyle(Qt::SolidLine);
|
||||
}
|
||||
else
|
||||
{
|
||||
pen.setStyle(Qt::CustomDashLine);
|
||||
pen.setDashPattern(lineDashPattern.createForQPen(pen.widthF()));
|
||||
pen.setDashOffset(lineDashPattern.getDashOffset());
|
||||
}
|
||||
|
||||
return pen;
|
||||
}
|
||||
else
|
||||
{
|
||||
return QPen(Qt::NoPen);
|
||||
}
|
||||
return PDFPainterHelper::createPenFromState(getGraphicState(), getEffectiveStrokingAlpha());
|
||||
}
|
||||
|
||||
QBrush PDFPainterBase::getCurrentBrushImpl() const
|
||||
{
|
||||
const PDFPageContentProcessorState* graphicState = getGraphicState();
|
||||
QColor color = graphicState->getFillColor();
|
||||
if (color.isValid())
|
||||
{
|
||||
color.setAlphaF(getEffectiveFillingAlpha());
|
||||
return QBrush(color, Qt::SolidPattern);
|
||||
}
|
||||
else
|
||||
{
|
||||
return QBrush(Qt::NoBrush);
|
||||
}
|
||||
return PDFPainterHelper::createBrushFromState(getGraphicState(), getEffectiveFillingAlpha());
|
||||
}
|
||||
|
||||
PDFReal PDFPainterBase::getEffectiveStrokingAlpha() const
|
||||
|
|
|
@ -16,6 +16,7 @@
|
|||
// along with PDF4QT. If not, see <https://www.gnu.org/licenses/>.
|
||||
|
||||
#include "pdfpainterutils.h"
|
||||
#include "pdfpagecontentprocessor.h"
|
||||
|
||||
#include <QPainterPath>
|
||||
#include <QFontMetrics>
|
||||
|
@ -64,5 +65,56 @@ QRect PDFPainterHelper::drawBubble(QPainter* painter, QPoint point, QColor color
|
|||
return rectangle;
|
||||
}
|
||||
|
||||
QPen PDFPainterHelper::createPenFromState(const PDFPageContentProcessorState* graphicState, double alpha)
|
||||
{
|
||||
QColor color = graphicState->getStrokeColor();
|
||||
if (color.isValid())
|
||||
{
|
||||
color.setAlphaF(alpha);
|
||||
const PDFReal lineWidth = graphicState->getLineWidth();
|
||||
Qt::PenCapStyle penCapStyle = graphicState->getLineCapStyle();
|
||||
Qt::PenJoinStyle penJoinStyle = graphicState->getLineJoinStyle();
|
||||
const PDFLineDashPattern& lineDashPattern = graphicState->getLineDashPattern();
|
||||
const PDFReal mitterLimit = graphicState->getMitterLimit();
|
||||
|
||||
QPen pen(color);
|
||||
|
||||
pen.setWidthF(lineWidth);
|
||||
pen.setCapStyle(penCapStyle);
|
||||
pen.setJoinStyle(penJoinStyle);
|
||||
pen.setMiterLimit(mitterLimit);
|
||||
|
||||
if (lineDashPattern.isSolid())
|
||||
{
|
||||
pen.setStyle(Qt::SolidLine);
|
||||
}
|
||||
else
|
||||
{
|
||||
pen.setStyle(Qt::CustomDashLine);
|
||||
pen.setDashPattern(lineDashPattern.createForQPen(pen.widthF()));
|
||||
pen.setDashOffset(lineDashPattern.getDashOffset());
|
||||
}
|
||||
|
||||
return pen;
|
||||
}
|
||||
else
|
||||
{
|
||||
return QPen(Qt::NoPen);
|
||||
}
|
||||
}
|
||||
|
||||
QBrush PDFPainterHelper::createBrushFromState(const PDFPageContentProcessorState* graphicState, double alpha)
|
||||
{
|
||||
QColor color = graphicState->getFillColor();
|
||||
if (color.isValid())
|
||||
{
|
||||
color.setAlphaF(alpha);
|
||||
return QBrush(color, Qt::SolidPattern);
|
||||
}
|
||||
else
|
||||
{
|
||||
return QBrush(Qt::NoBrush);
|
||||
}
|
||||
}
|
||||
|
||||
} // namespace pdf
|
||||
|
|
|
@ -24,6 +24,7 @@
|
|||
|
||||
namespace pdf
|
||||
{
|
||||
class PDFPageContentProcessorState;
|
||||
|
||||
/// RAII wrapper for painter save/restore
|
||||
class PDFPainterStateGuard
|
||||
|
@ -55,6 +56,12 @@ public:
|
|||
/// \param text Text inside the bubble
|
||||
/// \param alignment Bubble alignment relative to the bubble position point
|
||||
static QRect drawBubble(QPainter* painter, QPoint point, QColor color, QString text, Qt::Alignment alignment);
|
||||
|
||||
/// Creates pen from painter graphicState
|
||||
static QPen createPenFromState(const PDFPageContentProcessorState* graphicState, double alpha);
|
||||
|
||||
/// Creates brush from painter graphicState
|
||||
static QBrush createBrushFromState(const PDFPageContentProcessorState* graphicState, double alpha);
|
||||
};
|
||||
|
||||
} // namespace pdf
|
||||
|
|
|
@ -2552,8 +2552,52 @@ PDFPageContentElementEdited* PDFPageContentElementEdited::clone() const
|
|||
return new PDFPageContentElementEdited(m_element.get());
|
||||
}
|
||||
|
||||
void PDFPageContentElementEdited::drawPage(QPainter* painter, PDFInteger pageIndex, const PDFPrecompiledPage* compiledPage, PDFTextLayoutGetter& layoutGetter, const QTransform& pagePointToDevicePointMatrix, QList<PDFRenderError>& errors) const
|
||||
void PDFPageContentElementEdited::drawPage(QPainter* painter,
|
||||
PDFInteger pageIndex,
|
||||
const PDFPrecompiledPage* compiledPage,
|
||||
PDFTextLayoutGetter& layoutGetter,
|
||||
const QTransform& pagePointToDevicePointMatrix,
|
||||
QList<PDFRenderError>& errors) const
|
||||
{
|
||||
PDFPainterStateGuard guard(painter);
|
||||
|
||||
Q_UNUSED(pageIndex);
|
||||
Q_UNUSED(compiledPage);
|
||||
Q_UNUSED(layoutGetter);
|
||||
Q_UNUSED(errors);
|
||||
|
||||
QRectF rect = getBoundingBox();
|
||||
painter->setWorldTransform(QTransform(pagePointToDevicePointMatrix), true);
|
||||
painter->setPen(Qt::SolidLine);
|
||||
painter->setBrush(Qt::NoBrush);
|
||||
painter->setFont(QApplication::font());
|
||||
painter->setRenderHint(QPainter::Antialiasing);
|
||||
painter->setClipRect(rect, Qt::IntersectClip);
|
||||
|
||||
if (const PDFEditedPageContentElementImage* imageElement = m_element->asImage())
|
||||
{
|
||||
painter->translate(rect.bottomLeft());
|
||||
painter->scale(1.0, -1.0);
|
||||
|
||||
QImage image = imageElement->getImage();
|
||||
painter->drawImage(rect, image);
|
||||
}
|
||||
|
||||
if (const PDFEditedPageContentElementPath* pathElement = m_element->asPath())
|
||||
{
|
||||
const PDFPageContentProcessorState& state = m_element->getState();
|
||||
painter->setPen(pdf::PDFPainterHelper::createPenFromState(&state, state.getAlphaStroking()));
|
||||
painter->setBrush(pdf::PDFPainterHelper::createBrushFromState(&state, state.getAlphaFilling()));
|
||||
painter->setTransform(pathElement->getState().getCurrentTransformationMatrix(), true);
|
||||
painter->drawPath(pathElement->getPath());
|
||||
}
|
||||
|
||||
if (const PDFEditedPageContentElementText* textElement = m_element->asText())
|
||||
{
|
||||
const PDFPageContentProcessorState& state = m_element->getState();
|
||||
painter->setBrush(pdf::PDFPainterHelper::createBrushFromState(&state, state.getAlphaFilling()));
|
||||
painter->fillPath(textElement->getTextPath(), painter->brush());
|
||||
}
|
||||
}
|
||||
|
||||
uint PDFPageContentElementEdited::getManipulationMode(const QPointF& point, PDFReal snapPointDistanceThreshold) const
|
||||
|
@ -2572,15 +2616,32 @@ void PDFPageContentElementEdited::performManipulation(uint mode, const QPointF&
|
|||
|
||||
QRectF PDFPageContentElementEdited::getBoundingBox() const
|
||||
{
|
||||
return m_element->getState()
|
||||
return m_element->getBoundingBox();
|
||||
}
|
||||
|
||||
void PDFPageContentElementEdited::setSize(QSizeF size)
|
||||
{
|
||||
Q_UNUSED(size);
|
||||
}
|
||||
|
||||
QString PDFPageContentElementEdited::getDescription() const
|
||||
{
|
||||
if (m_element->asImage())
|
||||
{
|
||||
return formatDescription(PDFTranslationContext::tr("Image"));
|
||||
}
|
||||
|
||||
if (m_element->asText())
|
||||
{
|
||||
return formatDescription(PDFTranslationContext::tr("Text"));
|
||||
}
|
||||
|
||||
if (m_element->asPath())
|
||||
{
|
||||
return formatDescription(PDFTranslationContext::tr("Path"));
|
||||
}
|
||||
|
||||
return formatDescription(PDFTranslationContext::tr("Unknown"));
|
||||
}
|
||||
|
||||
} // namespace pdf
|
||||
|
|
Loading…
Reference in New Issue