From a401b8c031444de2188dace257d41282a07d37ef Mon Sep 17 00:00:00 2001 From: Jakub Melka Date: Tue, 8 Mar 2022 19:36:52 +0100 Subject: [PATCH] Signature plugin: selection --- Pdf4QtLib/sources/pdfpagecontentelements.cpp | 71 +++++++++++++++++++- Pdf4QtLib/sources/pdfpagecontentelements.h | 12 +++- 2 files changed, 80 insertions(+), 3 deletions(-) diff --git a/Pdf4QtLib/sources/pdfpagecontentelements.cpp b/Pdf4QtLib/sources/pdfpagecontentelements.cpp index 2db90ab..2aa7da9 100644 --- a/Pdf4QtLib/sources/pdfpagecontentelements.cpp +++ b/Pdf4QtLib/sources/pdfpagecontentelements.cpp @@ -296,6 +296,11 @@ void PDFPageContentElementRectangle::performManipulation(uint mode, const QPoint performRectangleManipulation(m_rectangle, mode, offset); } +QRectF PDFPageContentElementRectangle::getBoundingBox() const +{ + return getRectangle(); +} + PDFPageContentScene::PDFPageContentScene(QObject* parent) : QObject(parent), m_firstFreeId(1), @@ -303,7 +308,7 @@ PDFPageContentScene::PDFPageContentScene(QObject* parent) : m_widget(nullptr), m_manipulator(this, nullptr) { - + connect(&m_manipulator, &PDFPageContentElementManipulator::selectionChanged, this, &PDFPageContentScene::onSelectionChanged); } PDFPageContentScene::~PDFPageContentScene() @@ -724,6 +729,11 @@ void PDFPageContentScene::updateMouseCursor(const MouseEventInfo& info, PDFReal } } +void PDFPageContentScene::onSelectionChanged() +{ + emit sceneChanged(true); +} + PDFWidget* PDFPageContentScene::widget() const { return m_widget; @@ -820,7 +830,7 @@ uint PDFPageContentElementLine::getManipulationMode(const QPointF& point, QPointF vl = m_line.p2() - m_line.p1(); QPointF vp = point - m_line.p1(); - const qreal lengthSquared = QPointF::dotProduct(vp, vp); + const qreal lengthSquared = QPointF::dotProduct(vl, vl); if (qFuzzyIsNull(lengthSquared)) { @@ -865,6 +875,20 @@ void PDFPageContentElementLine::performManipulation(uint mode, const QPointF& of } } +QRectF PDFPageContentElementLine::getBoundingBox() const +{ + if (!qFuzzyIsNull(m_line.length())) + { + const qreal xMin = qMin(m_line.p1().x(), m_line.p2().x()); + const qreal xMax = qMax(m_line.p1().x(), m_line.p2().x()); + const qreal yMin = qMin(m_line.p1().y(), m_line.p2().y()); + const qreal yMax = qMax(m_line.p1().y(), m_line.p2().y()); + return QRectF(xMin, yMin, xMax - xMin, yMax - yMin); + } + + return QRectF(); +} + PDFPageContentElementLine::LineGeometry PDFPageContentElementLine::getGeometry() const { return m_geometry; @@ -965,6 +989,11 @@ void PDFPageContentSvgElement::performManipulation(uint mode, const QPointF& off performRectangleManipulation(m_rectangle, mode, offset); } +QRectF PDFPageContentSvgElement::getBoundingBox() const +{ + return getRectangle(); +} + const QByteArray& PDFPageContentSvgElement::getContent() const { return m_content; @@ -1052,6 +1081,11 @@ void PDFPageContentElementDot::performManipulation(uint mode, const QPointF& off } } +QRectF PDFPageContentElementDot::getBoundingBox() const +{ + return QRectF(m_point, QSizeF(0.001, 0.001)); +} + QPointF PDFPageContentElementDot::getPoint() const { return m_point; @@ -1132,6 +1166,11 @@ void PDFPageContentElementFreehandCurve::performManipulation(uint mode, const QP } } +QRectF PDFPageContentElementFreehandCurve::getBoundingBox() const +{ + return m_curve.controlPointRect(); +} + QPainterPath PDFPageContentElementFreehandCurve::getCurve() const { return m_curve; @@ -1449,7 +1488,35 @@ void PDFPageContentElementManipulator::drawPage(QPainter* painter, QList& errors) const { // Draw selection + if (!isSelectionEmpty()) + { + QPainterPath selectionPath; + for (const PDFInteger id : m_selection) + { + if (PDFPageContentElement* element = m_scene->getElementById(id)) + { + QPainterPath tempPath; + tempPath.addRect(element->getBoundingBox()); + selectionPath = selectionPath.united(tempPath); + } + } + if (!selectionPath.isEmpty()) + { + PDFPainterStateGuard guard(painter); + QPen pen(Qt::SolidLine); + pen.setWidthF(2.0); + pen.setColor(QColor::fromRgbF(0.8, 0.8, 0.1, 0.7)); + QBrush brush(Qt::SolidPattern); + brush.setColor(QColor::fromRgbF(1.0, 1.0, 0.0, 0.2)); + + painter->setPen(std::move(pen)); + painter->setBrush(std::move(brush)); + + selectionPath = pagePointToDevicePointMatrix.map(selectionPath); + painter->drawPath(selectionPath); + } + } // Draw dragged items if (isManipulationInProgress()) diff --git a/Pdf4QtLib/sources/pdfpagecontentelements.h b/Pdf4QtLib/sources/pdfpagecontentelements.h index e1af638..40e7f12 100644 --- a/Pdf4QtLib/sources/pdfpagecontentelements.h +++ b/Pdf4QtLib/sources/pdfpagecontentelements.h @@ -62,6 +62,9 @@ public: /// \param offset Offset virtual void performManipulation(uint mode, const QPointF& offset) = 0; + /// Returns bounding box of the element + virtual QRectF getBoundingBox() const = 0; + PDFInteger getPageIndex() const; void setPageIndex(PDFInteger newPageIndex); @@ -143,6 +146,7 @@ public: PDFReal snapPointDistanceThreshold) const override; virtual void performManipulation(uint mode, const QPointF& offset) override; + virtual QRectF getBoundingBox() const override; private: bool m_rounded = false; @@ -174,6 +178,7 @@ public: PDFReal snapPointDistanceThreshold) const override; virtual void performManipulation(uint mode, const QPointF& offset) override; + virtual QRectF getBoundingBox() const override; LineGeometry getGeometry() const; void setGeometry(LineGeometry newGeometry); @@ -204,7 +209,7 @@ public: PDFReal snapPointDistanceThreshold) const override; virtual void performManipulation(uint mode, const QPointF& offset) override; - + virtual QRectF getBoundingBox() const override; QPointF getPoint() const; void setPoint(QPointF newPoint); @@ -231,6 +236,7 @@ public: PDFReal snapPointDistanceThreshold) const override; virtual void performManipulation(uint mode, const QPointF& offset) override; + virtual QRectF getBoundingBox() const override; QPainterPath getCurve() const; void setCurve(QPainterPath newCurve); @@ -263,6 +269,7 @@ public: PDFReal snapPointDistanceThreshold) const override; virtual void performManipulation(uint mode, const QPointF& offset) override; + virtual QRectF getBoundingBox() const override; const QByteArray& getContent() const; void setContent(const QByteArray& newContent); @@ -464,6 +471,9 @@ private: /// \param snapPointDistanceTreshold Snap point threshold void updateMouseCursor(const MouseEventInfo& info, PDFReal snapPointDistanceThreshold); + /// Reaction on selection changed + void onSelectionChanged(); + PDFInteger m_firstFreeId; bool m_isActive; PDFWidget* m_widget;