HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/qtcharts Commit - r93:264fcc5c2ce8

QChartWidget now zooms only x axis and zoom is reset with right click

Tero Ahola -

r93:264fcc5c2ce8

parent child

Context file:

r93:264fcc5c2ce8

Collapse all files

src/qchart.cpp +11 -1

                     foreach (ChartItem* item ,m_chartItems)
                         item->setPlotDomain(m_plotDomainList[m_plotDataIndex]);
                     update();
-                }else{
+                } else {
                     QRect rect = m_rect.adjusted(margin(),margin(), -margin(), -margin());
                     rect.setWidth(rect.width()/2);
                     rect.setHeight(rect.height()/2);
                 }
             }
+            void QChart::zoomReset()
+            {
+                if (m_plotDataIndex > 0) {
+                    m_plotDataIndex = 0;
+                    foreach (ChartItem* item ,m_chartItems)
+                        item->setPlotDomain(m_plotDomainList[m_plotDataIndex]);
+                    update();
+                }
+            }
             void QChart::setAxisX(const QChartAxis& axis)
             {
                 setAxis(m_axisXItem,axis);

src/qchart.h +1 0

                 void zoomInToRect(const QRect& rectangle);
                 void zoomIn();
                 void zoomOut();
+                void zoomReset();
                 void setAxisX(const QChartAxis& axis);
                 void setAxisY(const QChartAxis& axis);

src/qchartwidget.cpp +9 -8

             QChartWidget::QChartWidget(QWidget *parent) :
                 QGraphicsView(parent),
-                m_rubberBand(QRubberBand::Rectangle, this)
+                m_rubberBand(QRubberBand::Rectangle, this),
+                m_originX(0)
             {
                 setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding);
                 m_scene = new QGraphicsScene();
                 if(m_rubberBand.isEnabled() && event->button() == Qt::LeftButton) {
                     int margin = m_chart->margin();
                     QRect rect(margin, margin, width() - 2 * margin, height() - 2 * margin);
-                    m_origin = event->pos();
-                    if (rect.contains(m_origin)) {
+                    if (rect.contains(event->pos())) {
-                        m_rubberBand.setGeometry(QRect(m_origin, QSize()));
+                        m_originX = event->pos().x();
+                        m_rubberBand.setGeometry(QRect(m_originX, 0, 0, height()));
                         m_rubberBand.show();
                         event->accept();
                     }
             void QChartWidget::mouseMoveEvent(QMouseEvent *event)
             {
                 if(m_rubberBand.isVisible())
-                    m_rubberBand.setGeometry(QRect(m_origin, event->pos()).normalized());
+                    m_rubberBand.setGeometry(QRect(m_originX, 0,
+                        event->pos().x() - m_originX, height()).normalized());
             }
             void QChartWidget::mouseReleaseEvent(QMouseEvent *event)
                     event->accept();
                 }
-                if(event->button()==Qt::RightButton) {
+                if(event->button()==Qt::RightButton)
-                    m_chart->zoomOut();
+                    m_chart->zoomReset();
             }
             void QChartWidget::addSeries(QChartSeries* series)

src/qchartwidget.h +1 -1

                 QGraphicsScene *m_scene;
                 QChart* m_chart;
                 QRubberBand m_rubberBand;
-                QPoint m_origin;
+                int m_originX;
             };
             QTCOMMERCIALCHART_END_NAMESPACE

General Comments 0

Write
Preview

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

No TODOs yet

	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