[Annotations] Implement the note editing feature

Contributes to: https://gitlab.com/omprussia/libraries/amberpdf-qml-plugin/-/issues/16

[Annotations] Implement the note editing feature
Contributes to: https://gitlab.com/omprussia/libraries/amberpdf-qml-plugin/-/issues/16
0d8e58a3 · OMP Education · Alexey Andreyev · 67d28f22 · 0d8e58a3 · 0d8e58a3
--- a/plugin/PdfView.qml
+++ b/plugin/PdfView.qml
@@ -91,6 +91,9 @@ Rectangle {
    function removeNote(pageIndex, noteIndex) {
        pdfView.removeNote(pageIndex, noteIndex)
    }
+    function editNote(pageIndex, noteIndex, newColor, newContent) {
+        pdfView.editNote(pageIndex, noteIndex, newContent, newColor)
+    }
    color: "transparent"
    data: [

--- a/plugin/src/interface/basepage.h
+++ b/plugin/src/interface/basepage.h
@@ -66,12 +66,14 @@ public:
    virtual void addAnnotation(const QRectF &rect, const QColor &color,
                                       const QString &author, const QString &content) = 0;
    virtual void removeAnnotation(int annotationId) = 0;
+    virtual void editNote(int noteId, const QString &newContent, const QColor &newColor) = 0;
 signals:
    void annotationsLoaded();
    void originalSizeLoaded();
    void annotationAdded(bool);
    void annotationDelete(int, bool);
+    void annotationEdited(int, bool);
 };
 #endif // BASEPAGE_H
--- a/plugin/src/pdfium-provider/pdfpageitem.cpp
+++ b/plugin/src/pdfium-provider/pdfpageitem.cpp
@@ -219,3 +219,40 @@ void PdfPageItem::removeAnnotation(int annotationId)
    watcher->setFuture(m_amberPage->removeAnnotation(annotationId));
 }
+void PdfPageItem::editNote(int noteId, const QString &newContent, const QColor &newColor)
+{
+    BaseAnnotation *annotationToEdit = nullptr;
+    for (const auto annotation : m_annotations) {
+        if (annotation == nullptr)
+            continue;
+        if (annotation->annotationId == noteId) {
+            annotationToEdit = annotation;
+            break;
+        }
+    }
+    if (annotationToEdit == nullptr)
+        return;
+    auto *watcher = new QFutureWatcher<bool>();
+    connect(watcher, &QFutureWatcher<bool>::finished, this, [this, watcher, noteId]() {
+        if (watcher == nullptr)
+            return;
+        if (watcher->isFinished() && !watcher->isCanceled())
+            removeAnnotation(noteId);
+        watcher->deleteLater();
+    });
+    auto future = m_amberPage->addAnnotation(annotationToEdit->rect, newColor, annotationToEdit->author, newContent);
+    watcher->setFuture(future);
+    connect(this, &PdfPageItem::annotationDelete, this, [this, noteId](int annotationId, bool result) {
+        if (noteId != annotationId)
+            return;
+        emit annotationEdited(noteId, result);
+    });
+}
--- a/plugin/src/pdfium-provider/pdfpageitem.h
+++ b/plugin/src/pdfium-provider/pdfpageitem.h
@@ -66,6 +66,7 @@ public:
    void addAnnotation(const QRectF &rect, const QColor &color,
                                   const QString &author, const QString &content) override;
    void removeAnnotation(int annotationId) override;
+    void editNote(int noteId, const QString &newContent, const QColor &newColor) override;
 private:
    QSharedPointer<PdfPage> m_amberPage;

--- a/plugin/src/pdfpagecontainer.cpp
+++ b/plugin/src/pdfpagecontainer.cpp
@@ -173,6 +173,16 @@ void PdfPageContainer::setPageSource(QSharedPointer<BasePage> pageSource)
        emit noteRemoved(noteId, removeResult);
    });
+    connect(m_pageSource.data(), &BasePage::annotationEdited, this, [this](int noteId, bool edited) {
+        Q_UNUSED(noteId)
+        if (m_pageSource && edited) {
+            m_pageSource->loadAnnotations();
+            emit pageChanged();
+        }
+        emit noteEdited(noteId, edited);
+    });
    if (m_pageSource->annotations().isEmpty())
        m_pageSource->loadAnnotations();
@@ -263,6 +273,14 @@ void PdfPageContainer::removeNote(int noteId)
    m_pageSource->removeAnnotation(noteId);
 }
+void PdfPageContainer::editNote(int noteId, const QString &newContent, const QColor &newColor)
+{
+    if (!m_pageSource)
+        return;
+    m_pageSource->editNote(noteId, newContent, newColor);
+}
 void PdfPageContainer::setRequestedSize(QSizeF requestedSize)
 {
    if (m_requestedSize == requestedSize)

--- a/plugin/src/pdfpagecontainer.h
+++ b/plugin/src/pdfpagecontainer.h
@@ -84,6 +84,7 @@ public:
    void addAnnotation(const QRectF &rect, const QColor &color,
                       const QString &author, const QString &content);
    void removeNote(int noteId);
+    void editNote(int noteId, const QString &newContent, const QColor &newColor);
 public slots:
    void setRequestedSize(QSizeF requestedSize);
@@ -104,6 +105,7 @@ signals:
    void notesPaintChanged(bool notesPaint);
    void noteActivate(QString, QString);
    void noteRemoved(int, bool);
+    void noteEdited(int, bool);
 private slots:
    void _correctSize();

--- a/plugin/src/pdfview.cpp
+++ b/plugin/src/pdfview.cpp
@@ -319,6 +319,15 @@ void PdfView::removeNote(int pageId, int noteId)
    page->removeNote(noteId);
 }
+void PdfView::editNote(int pageId, int noteId, const QString &newContent, const QColor &newColor)
+{
+    if (!m_paintedPages.contains(pageId))
+        return;
+    auto page = qobject_cast<PdfPageContainer *>(m_pages.value(pageId));
+    page->editNote(noteId, newContent, newColor);
+}
 bool PdfView::documentEdited() const
 {
    return m_documentEdited;
@@ -886,6 +895,9 @@ void PdfView::_preparePages()
        connect(page, &PdfPageContainer::noteRemoved, this, [pageIndex, this](int noteId, bool result) {
            emit noteRemoved(pageIndex, noteId, result);
        });
+        connect(page, &PdfPageContainer::noteEdited, this, [pageIndex, this](int noteId, bool result) {
+            emit noteEdited(pageIndex, noteId, result);
+        });
        page->setVisible(false);
        page->setPageGeometry(m_mapper->originalPageGeometry(pageIndex));

--- a/plugin/src/pdfview.h
+++ b/plugin/src/pdfview.h
@@ -106,6 +106,7 @@ public:
                                   const QString &author,
                                   const QString &content);
    Q_INVOKABLE void removeNote(int pageId, int noteId);
+    Q_INVOKABLE void editNote(int pageId, int noteId, const QString &newContent, const QColor &newColor);
    PagesWithNotesModel* pagesWithNotesModel() const;
 public slots:
@@ -149,6 +150,7 @@ signals:
    void documentSaved(bool saveStatus);
    void documentEditedChanged(bool documentEdited);
    void noteRemoved(int pageIndex, int noteId, bool result);
+    void noteEdited(int pageIndex, int noteId, bool result);
    void pagesWithNotesModelChanged(PagesWithNotesModel* pagesWithNotesModel);
 private slots: