Issue #133: Rectangle selector when choosing the page of the PDF

Pdf4QtLibWidgets/sources/pdfwidgettool.cpp

@@ -913,7 +913,9 @@ PDFToolManager::PDFToolManager(PDFDrawWidgetProxy* proxy, Actions actions, QObje
     m_predefinedTools()
 {
     auto pickTool = new PDFPickTool(proxy, PDFPickTool::Mode::Rectangles, this);
+    auto pickPageTool = new PDFPickTool(proxy, PDFPickTool::Mode::Pages, this);
     m_predefinedTools[PickRectangleTool] = pickTool;
+    m_predefinedTools[PickPageTool] = pickPageTool;
     m_predefinedTools[FindTextTool] = new PDFFindTextTool(proxy, actions.findPrevAction, actions.findNextAction, this, parentDialog);
     m_predefinedTools[SelectTextTool] = new PDFSelectTextTool(proxy, actions.selectTextToolAction, actions.copyTextAction, actions.selectAllAction, actions.deselectAction, this);
     m_predefinedTools[SelectTableTool] = new PDFSelectTableTool(proxy, actions.selectTableToolAction, this);
@@ -927,6 +929,7 @@ PDFToolManager::PDFToolManager(PDFDrawWidgetProxy* proxy, Actions actions, QObje
     }
 
     connect(pickTool, &PDFPickTool::rectanglePicked, this, &PDFToolManager::onRectanglePicked);
+    connect(pickPageTool, &PDFPickTool::pagePicked, this, &PDFToolManager::onPagePicked);
 }
 
 void PDFToolManager::addTool(PDFWidgetTool* tool)
@@ -950,6 +953,13 @@ void PDFToolManager::pickRectangle(std::function<void (PDFInteger, QRectF)> call
     setActiveTool(m_predefinedTools[PickRectangleTool]);
 }
 
+void PDFToolManager::pickPage(std::function<void (PDFInteger)> callback)
+{
+    setActiveTool(nullptr);
+    m_pickPageCallback = callback;
+    setActiveTool(m_predefinedTools[PickPageTool]);
+}
+
 void PDFToolManager::setDocument(const PDFModifiedDocument& document)
 {
     for (PDFWidgetTool* tool : m_tools)
@@ -1119,6 +1129,10 @@ void PDFToolManager::onToolActivityChanged(bool active)
         {
             m_pickRectangleCallback = nullptr;
         }
+        if (tool == m_predefinedTools[PickPageTool])
+        {
+            m_pickPageCallback = nullptr;
+        }
     }
 }
 
@@ -1145,6 +1159,16 @@ void PDFToolManager::onRectanglePicked(PDFInteger pageIndex, QRectF pageRectangl
     setActiveTool(nullptr);
 }
 
+void PDFToolManager::onPagePicked(PDFInteger pageIndex)
+{
+    if (m_pickPageCallback)
+    {
+        m_pickPageCallback(pageIndex);
+    }
+
+    setActiveTool(nullptr);
+}
+
 PDFMagnifierTool::PDFMagnifierTool(PDFDrawWidgetProxy* proxy, QAction* action, QObject* parent) :
     BaseClass(proxy, action, parent),
     m_magnifierSize(200),
@@ -1247,7 +1271,26 @@ PDFPickTool::PDFPickTool(PDFDrawWidgetProxy* proxy, PDFPickTool::Mode mode, QObj
     m_drawSelectionRectangle(true),
     m_selectionRectangleColor(Qt::blue)
 {
-    setCursor((m_mode == Mode::Images) ? Qt::CrossCursor : Qt::BlankCursor);
+    switch (m_mode)
+    {
+    case pdf::PDFPickTool::Mode::Pages:
+        setCursor(Qt::ArrowCursor);
+        break;
+
+    case pdf::PDFPickTool::Mode::Points:
+    case pdf::PDFPickTool::Mode::Rectangles:
+        setCursor(Qt::BlankCursor);
+        break;
+
+    case pdf::PDFPickTool::Mode::Images:
+        setCursor(Qt::CrossCursor);
+        break;
+
+    default:
+        Q_ASSERT(false);
+        break;
+    }
+
     m_snapper.setSnapPointPixelSize(PDFWidgetUtils::scaleDPI_x(proxy->getWidget(), 10));
     m_snapper.setSnapPointTolerance(m_snapper.getSnapPointPixelSize());
 
@@ -1324,6 +1367,16 @@ void PDFPickTool::drawPostRendering(QPainter* painter, QRect rect) const
         painter->drawLine(hleft, hright);
         painter->drawLine(vtop, vbottom);
     }
+
+    if (m_mode == Mode::Pages && m_pageIndex != -1)
+    {
+        PDFWidgetSnapshot snapshot = getProxy()->getSnapshot();
+        if (snapshot.hasPage(m_pageIndex))
+        {
+            const PDFWidgetSnapshot::SnapshotItem* snapshotItem = snapshot.getPageSnapshot(m_pageIndex);
+            painter->fillRect(snapshotItem->rect, m_selectionRectangleColor);
+        }
+    }
 }
 
 void PDFPickTool::mousePressEvent(QWidget* widget, QMouseEvent* event)
@@ -1333,48 +1386,73 @@ void PDFPickTool::mousePressEvent(QWidget* widget, QMouseEvent* event)
 
     if (event->button() == Qt::LeftButton)
     {
-        if (m_mode != Mode::Images)
+        switch (m_mode)
         {
-            // Try to perform pick point
+            case Mode::Pages:
-            QPointF pagePoint;
-            PDFInteger pageIndex = getProxy()->getPageUnderPoint(m_snapper.getSnappedPoint().toPoint(), &pagePoint);
-            if (pageIndex != -1 &&    // We have picked some point on page
-                    (m_pageIndex == -1 || m_pageIndex == pageIndex)) // We are under current page
             {
-                m_pageIndex = pageIndex;
+                QPointF pagePoint;
-                m_pickedPoints.push_back(pagePoint);
+                PDFInteger pageIndex = getProxy()->getPageUnderPoint(m_snapper.getSnappedPoint().toPoint(), &pagePoint);
-                m_snapper.setReferencePoint(pageIndex, pagePoint);
+                if (pageIndex != -1)
-
-                // Emit signal about picked point
-                Q_EMIT pointPicked(pageIndex, pagePoint);
-
-                if (m_mode == Mode::Rectangles && m_pickedPoints.size() == 2)
                 {
-                    QPointF first = m_pickedPoints.front();
+                    m_pageIndex = pageIndex;
-                    QPointF second = m_pickedPoints.back();
+                    Q_EMIT pagePicked(pageIndex);
-
-                    const qreal xMin = qMin(first.x(), second.x());
-                    const qreal xMax = qMax(first.x(), second.x());
-                    const qreal yMin = qMin(first.y(), second.y());
-                    const qreal yMax = qMax(first.y(), second.y());
-
-                    QRectF pageRectangle(xMin, yMin, xMax - xMin, yMax - yMin);
-                    Q_EMIT rectanglePicked(pageIndex, pageRectangle);
-
-                    // We must reset tool, to pick next rectangle
-                    resetTool();
                 }
-
+                break;
-                buildSnapData();
-                Q_EMIT getProxy()->repaintNeeded();
             }
-        }
+
-        else
+            case Mode::Points:
-        {
+            case Mode::Rectangles:
-            // Try to perform pick image
-            if (const PDFSnapper::ViewportSnapImage* snappedImage = m_snapper.getSnappedImage())
             {
-                Q_EMIT imagePicked(snappedImage->image);
+                // Try to perform pick point
+                QPointF pagePoint;
+                PDFInteger pageIndex = getProxy()->getPageUnderPoint(m_snapper.getSnappedPoint().toPoint(), &pagePoint);
+                if (pageIndex != -1 &&    // We have picked some point on page
+                    (m_pageIndex == -1 || m_pageIndex == pageIndex)) // We are under current page
+                {
+                    m_pageIndex = pageIndex;
+                    m_pickedPoints.push_back(pagePoint);
+                    m_snapper.setReferencePoint(pageIndex, pagePoint);
+
+                    // Emit signal about picked point
+                    Q_EMIT pointPicked(pageIndex, pagePoint);
+
+                    if (m_mode == Mode::Rectangles && m_pickedPoints.size() == 2)
+                    {
+                        QPointF first = m_pickedPoints.front();
+                        QPointF second = m_pickedPoints.back();
+
+                        const qreal xMin = qMin(first.x(), second.x());
+                        const qreal xMax = qMax(first.x(), second.x());
+                        const qreal yMin = qMin(first.y(), second.y());
+                        const qreal yMax = qMax(first.y(), second.y());
+
+                        QRectF pageRectangle(xMin, yMin, xMax - xMin, yMax - yMin);
+                        Q_EMIT rectanglePicked(pageIndex, pageRectangle);
+
+                        // We must reset tool, to pick next rectangle
+                        resetTool();
+                    }
+
+                    buildSnapData();
+                    Q_EMIT getProxy()->repaintNeeded();
+                }
+                break;
+            }
+
+            case pdf::PDFPickTool::Mode::Images:
+            {
+                // Try to perform pick image
+                if (const PDFSnapper::ViewportSnapImage* snappedImage = m_snapper.getSnappedImage())
+                {
+                    Q_EMIT imagePicked(snappedImage->image);
+                }
+                break;
+            }
+
+            default:
+            {
+                Q_ASSERT(false);
+                break;
             }
         }
     }
@@ -1400,6 +1478,14 @@ void PDFPickTool::mouseMoveEvent(QWidget* widget, QMouseEvent* event)
     {
         m_mousePosition = mousePos;
         m_snapper.updateSnappedPoint(m_mousePosition);
+
+        // Update page index, if we are picking pages.
+        if (m_mode == Mode::Pages)
+        {
+            QPointF pagePoint;
+            m_pageIndex = getProxy()->getPageUnderPoint(m_snapper.getSnappedPoint().toPoint(), &pagePoint);
+        }
+
         Q_EMIT getProxy()->repaintNeeded();
     }
 }
@@ -1446,7 +1532,7 @@ void PDFPickTool::resetTool()
 
 void PDFPickTool::buildSnapData()
 {
-    if (!isActive())
+    if (!isActive() || m_mode == Mode::Pages)
     {
         return;
     }

Pdf4QtLibWidgets/sources/pdfwidgettool.h

@@ -343,6 +343,7 @@ public:
 
     enum class Mode
     {
+        Pages,      ///< Pick whole single page
         Points,     ///< Pick points
         Rectangles, ///< Pick rectangles
         Images      ///< Pick images
@@ -354,7 +355,8 @@ public:
     /// \param parent Parent object
     explicit PDFPickTool(PDFDrawWidgetProxy* proxy, Mode mode, QObject* parent);
 
-    virtual void drawPage(QPainter* painter, PDFInteger pageIndex,
+    virtual void drawPage(QPainter* painter,
+                          PDFInteger pageIndex,
                           const PDFPrecompiledPage* compiledPage,
                           PDFTextLayoutGetter& layoutGetter,
                           const QTransform& pagePointToDevicePointMatrix,
@@ -388,6 +390,7 @@ signals:
     void pointPicked(pdf::PDFInteger pageIndex, QPointF pagePoint);
     void rectanglePicked(pdf::PDFInteger pageIndex, QRectF pageRectangle);
     void imagePicked(const QImage& image);
+    void pagePicked(pdf::PDFInteger pageIndex);
 
 protected:
     virtual void setActiveImpl(bool active) override;
@@ -540,6 +543,7 @@ public:
 
     enum PredefinedTools
     {
+        PickPageTool,
         PickRectangleTool,
         FindTextTool,
         SelectTextTool,
@@ -561,6 +565,11 @@ public:
     /// \param callback Callback function
     void pickRectangle(std::function<void(PDFInteger, QRectF)> callback);
 
+    /// Picks page, if page is successfully picked,
+    /// then callback is called.
+    /// \param callback Callback function
+    void pickPage(std::function<void(PDFInteger)> callback);
+
     /// Returns first active tool from tool set. If no tool is active,
     /// then nullptr is returned.
     PDFWidgetTool* getActiveTool() const;
@@ -632,11 +641,13 @@ private:
     void onToolActivityChanged(bool active);
     void onToolActionTriggered(bool checked);
     void onRectanglePicked(PDFInteger pageIndex, QRectF pageRectangle);
+    void onPagePicked(PDFInteger pageIndex);
 
     std::set<PDFWidgetTool*> m_tools;
     std::array<PDFWidgetTool*, ToolEnd> m_predefinedTools;
     std::map<QAction*, PDFWidgetTool*> m_actionsToTools;
     std::function<void(PDFInteger, QRectF)> m_pickRectangleCallback;
+    std::function<void(PDFInteger)> m_pickPageCallback;
 };
 
 }   // namespace pdf

Pdf4QtViewer/pdfsidebarwidget.cpp

@@ -1027,6 +1027,28 @@ void PDFSidebarWidget::onOutlineTreeViewContextMenuRequested(const QPoint& pos)
         return onSetTarget;
     };
 
+    auto createOnSetTargetPage = [this, sourceIndex](pdf::DestinationType destinationType)
+    {
+        auto onSetTargetPage = [this, sourceIndex, destinationType]()
+        {
+            pdf::PDFToolManager* toolManager = m_proxy->getWidget()->getToolManager();
+
+            auto pickPage = [this, sourceIndex, destinationType](pdf::PDFInteger pageIndex)
+            {
+                pdf::PDFDestination destination;
+                destination.setDestinationType(destinationType);
+                destination.setPageIndex(pageIndex);
+                destination.setPageReference(m_document->getCatalog()->getPage(pageIndex)->getPageReference());
+                destination.setZoom(m_proxy->getZoom());
+                m_outlineTreeModel->setDestination(sourceIndex, destination);
+            };
+
+            toolManager->pickPage(pickPage);
+        };
+
+        return onSetTargetPage;
+    };
+
     auto onNamedDestinationTriggered = [this, sourceIndex]()
     {
         class SelectNamedDestinationDialog : public QDialog
@@ -1081,13 +1103,13 @@ void PDFSidebarWidget::onOutlineTreeViewContextMenuRequested(const QPoint& pos)
     };
 
     submenu->addAction(tr("Named Destination"), onNamedDestinationTriggered);
-    submenu->addAction(tr("Fit Page"), createOnSetTarget(pdf::DestinationType::Fit));
+    submenu->addAction(tr("Fit Page"), createOnSetTargetPage(pdf::DestinationType::Fit));
-    submenu->addAction(tr("Fit Page Horizontally"), createOnSetTarget(pdf::DestinationType::FitH));
+    submenu->addAction(tr("Fit Page Horizontally"), createOnSetTargetPage(pdf::DestinationType::FitH));
-    submenu->addAction(tr("Fit Page Vertically"), createOnSetTarget(pdf::DestinationType::FitV));
+    submenu->addAction(tr("Fit Page Vertically"), createOnSetTargetPage(pdf::DestinationType::FitV));
     submenu->addAction(tr("Fit Rectangle"), createOnSetTarget(pdf::DestinationType::FitR));
-    submenu->addAction(tr("Fit Bounding Box"), createOnSetTarget(pdf::DestinationType::FitB));
+    submenu->addAction(tr("Fit Bounding Box"), createOnSetTargetPage(pdf::DestinationType::FitB));
-    submenu->addAction(tr("Fit Bounding Box Horizontally"), createOnSetTarget(pdf::DestinationType::FitBH));
+    submenu->addAction(tr("Fit Bounding Box Horizontally"), createOnSetTargetPage(pdf::DestinationType::FitBH));
-    submenu->addAction(tr("Fit Bounding Box Vertically"), createOnSetTarget(pdf::DestinationType::FitBV));
+    submenu->addAction(tr("Fit Bounding Box Vertically"), createOnSetTargetPage(pdf::DestinationType::FitBV));
     submenu->addAction(tr("XYZ"), createOnSetTarget(pdf::DestinationType::XYZ));
 
     contextMenu.exec(ui->outlineTreeView->mapToGlobal(pos));