GIT_REPOSITORIES/LPP/Users/mperrinel/SciQLop-fork Commit - r1086:c6451ef8583a

Undo zoom box action

trabillard -

r1086:c6451ef8583a

parent child

Context file:

r1086:c6451ef8583a

gui/include/Visualization/VisualizationGraphWidget.h +3 0

                 SqpRange graphRange() const noexcept;
                 void setGraphRange(const SqpRange &range);
+                /// Undo the last zoom  done with a zoom box
+                void undoZoom();
                 // IVisualizationWidget interface
                 void accept(IVisualizationWidgetVisitor *visitor) override;
                 bool canDrop(const Variable &variable) const override;

gui/src/Visualization/VisualizationGraphWidget.cpp +22 0

                 std::unique_ptr<VisualizationGraphRenderingDelegate> m_RenderingDelegate;
                 QCPItemRect *m_DrawingZoomRect = nullptr;
+                QStack<QPair<QCPRange, QCPRange> > m_ZoomStack;
                 std::unique_ptr<VisualizationCursorItem> m_HorizontalCursor = nullptr;
                 std::unique_ptr<VisualizationCursorItem> m_VerticalCursor = nullptr;
                 qCDebug(LOG_VisualizationGraphWidget()) << tr("VisualizationGraphWidget::setGraphRange END");
             }
+            void VisualizationGraphWidget::undoZoom()
+            {
+                auto zoom = impl->m_ZoomStack.pop();
+                auto axisX = plot().axisRect()->axis(QCPAxis::atBottom);
+                auto axisY = plot().axisRect()->axis(QCPAxis::atLeft);
+                axisX->setRange(zoom.first);
+                axisY->setRange(zoom.second);
+                plot().replot(QCustomPlot::rpQueuedReplot);
+            }
             void VisualizationGraphWidget::accept(IVisualizationWidgetVisitor *visitor)
             {
                 if (visitor) {
                                         [ this, var = it->first ]() { removeVariable(var); });
                 }
+                if (!impl->m_ZoomStack.isEmpty()) {
+                    if (!graphMenu.isEmpty()) {
+                        graphMenu.addSeparator();
+                    }
+                    graphMenu.addAction(tr("Undo Zoom"), [this]() { undoZoom(); });
+                }
                 if (!graphMenu.isEmpty()) {
                     graphMenu.exec(QCursor::pos());
                 }
                     if (newAxisXRange.size() > axisX->range().size() * (ZOOM_BOX_MIN_SIZE / 100.0)
                         && newAxisYRange.size() > axisY->range().size() * (ZOOM_BOX_MIN_SIZE / 100.0)) {
+                        impl->m_ZoomStack.push(qMakePair(axisX->range(), axisY->range()));
                         axisX->setRange(newAxisXRange);
                         axisY->setRange(newAxisYRange);

General Comments 3

trabillard

|

Auto status change to "Under Review"

perrinel

|

Status change > Approved

Write
Preview

You need to be logged in to leave comments. Login now

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages