HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/qtcharts Commit - r1290:d3d22419eb01

Adds QChartView empty constructor to be able to promote qchartview in qtdesigner

Michal Klocek -

r1290:d3d22419eb01

parent child

Context file:

r1290:d3d22419eb01

Collapse all files

src/qchartview.cpp +26 -15

             /****************************************************************************
             **
             ** Copyright (C) 2012 Digia Plc
             ** All rights reserved.
             ** For any questions to Digia, please use contact form at http://qt.digia.com
             **
             ** This file is part of the Qt Commercial Charts Add-on.
             **
             ** $QT_BEGIN_LICENSE$
             ** Licensees holding valid Qt Commercial licenses may use this file in
             ** accordance with the Qt Commercial License Agreement provided with the
             ** Software or, alternatively, in accordance with the terms contained in
             ** a written agreement between you and Digia.
             **
             ** If you have questions regarding the use of this file, please use
             ** contact form at http://qt.digia.com
             ** $QT_END_LICENSE$
             **
             ****************************************************************************/
             #include "qchartview.h"
             #include "qchartview_p.h"
             #include "qchart_p.h"
             #include <QGraphicsScene>
             #include <QRubberBand>
             /*!
                 \enum QChartView::RubberBand
                 This enum describes the different types of rubber bands that can be used for zoom rect selection
                 \value NoRubberBand
                 \value VerticalRubberBand
                 \value HorizonalRubberBand
                 \value RectangleRubberBand
             */
             /*!
                 \class QChartView
                 \brief Standalone charting widget.
                 QChartView is a standalone widget that can display charts. It does not require separate
                 QGraphicsScene to work. It manages the graphical representation of different types of
                 series and other chart related objects like QAxis and QLegend. If you want to
                 display a chart in your existing QGraphicsScene, you can use the QChart class instead.
                 \sa QChart
             */
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
             /*!
+                Constructs a chartView object with parent \a parent.
+            */
+            QChartView::QChartView(QWidget *parent) :
+                QGraphicsView(parent),
+                d_ptr(new QChartViewPrivate(this))
+            {
+            }
+            /*!
                 Constructs a chartView object with parent \a parent to display a \a chart.
             */
             QChartView::QChartView(QChart *chart,QWidget *parent) :
                 QGraphicsView(parent),
-                d_ptr(new QChartViewPrivate())
+                d_ptr(new QChartViewPrivate(this,chart))
             {
-                Q_ASSERT(chart);
-                d_ptr->m_scene = new QGraphicsScene(this);
-                d_ptr->m_chart = chart;
-                setFrameShape(QFrame::NoFrame);
-                setBackgroundRole(QPalette::Window);
-                setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
-                setVerticalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
-                setScene(d_ptr->m_scene);
-                d_ptr->m_scene->addItem(chart);
-                setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding);
             }
             /*!
                 Destroys the object and it's children, like series and axis objects added to it.
             */
             QChartView::~QChartView()
             {
             }
             /*!
                 Returns the pointer to the associated chart
             */
             QChart* QChartView::chart() const
             {
                 return d_ptr->m_chart;
             }
             /*!
                 Sets the RubberBandPlicy to \a rubberBand. Selected policy determines the way zooming is performed.
             */
             void QChartView::setRubberBand(const RubberBands& rubberBand)
             {
                 d_ptr->m_rubberBandFlags=rubberBand;
                 if (!d_ptr->m_rubberBandFlags) {
                     delete d_ptr->m_rubberBand;
                     d_ptr->m_rubberBand=0;
                     return;
                 }
                 if (!d_ptr->m_rubberBand) {
                     d_ptr->m_rubberBand = new QRubberBand(QRubberBand::Rectangle, this);
                     d_ptr->m_rubberBand->setEnabled(true);
                 }
             }
             /*!
                 Returns the RubberBandPolicy that is currently being used by the widget.
             */
             QChartView::RubberBands QChartView::rubberBand() const
             {
                 return d_ptr->m_rubberBandFlags;
             }
             /*!
                 If Left mouse button is pressed and the RubberBandPolicy is enabled the \a event is accepted and the rubber band is displayed on the screen allowing the user to select the zoom area.
                 If different mouse button is pressed and/or the RubberBandPolicy is disabled then the \a event is passed to QGraphicsView::mousePressEvent() implementation.
             */
             void QChartView::mousePressEvent(QMouseEvent *event)
             {
                 if(d_ptr->m_rubberBand && d_ptr->m_rubberBand->isEnabled() && event->button() == Qt::LeftButton) {
                     int padding = d_ptr->m_chart->margins().top();
                     QRect rect(padding, padding, width() - 2 * padding, height() - 2 * padding);
                     if (rect.contains(event->pos())) {
                         d_ptr->m_rubberBandOrigin = event->pos();
                         d_ptr->m_rubberBand->setGeometry(QRect(d_ptr->m_rubberBandOrigin, QSize()));
                         d_ptr->m_rubberBand->show();
                         event->accept();
                     }
                 }
                 else {
                     QGraphicsView::mousePressEvent(event);
                 }
             }
             /*!
                 If RubberBand rectange specification has been initiated in pressEvent then \a event data is used to update RubberBand geometry.
                 In other case the defualt QGraphicsView::mouseMoveEvent implementation is called.
             */
             void QChartView::mouseMoveEvent(QMouseEvent *event)
             {
                 if(d_ptr->m_rubberBand && d_ptr->m_rubberBand->isVisible()) {
                     QRectF margins = d_ptr->m_chart->margins();
                     QRectF geometry = d_ptr->m_chart->geometry();
                     QRectF rect =geometry.adjusted(margins.left(),margins.top(),-margins.right(),-margins.bottom());
                     int width = event->pos().x() - d_ptr->m_rubberBandOrigin.x();
                     int height = event->pos().y() - d_ptr->m_rubberBandOrigin.y();
                     if (!d_ptr->m_rubberBandFlags.testFlag(VerticalRubberBand)) {
                         d_ptr->m_rubberBandOrigin.setY(rect.top());
                         height = rect.height();
                     }
                     if (!d_ptr->m_rubberBandFlags.testFlag(HorizonalRubberBand)) {
                         d_ptr->m_rubberBandOrigin.setX(rect.left());
                         width= rect.width();
                     }
                     d_ptr->m_rubberBand->setGeometry(QRect(d_ptr->m_rubberBandOrigin.x(),d_ptr->m_rubberBandOrigin.y(), width,height).normalized());
                 }
                 else {
                     QGraphicsView::mouseMoveEvent(event);
                 }
             }
             /*!
                 If left mouse button is release and RubberBand is enabled then \a event is accepted and the view is zoomed in to rect specified by RubberBand
                 If it is the right mouse button \a event then RubberBand is dissmissed and zoom is canceled.
             */
             void QChartView::mouseReleaseEvent(QMouseEvent *event)
             {
                 if(d_ptr->m_rubberBand) {
                     if (event->button() == Qt::LeftButton && d_ptr->m_rubberBand->isVisible()) {
                         d_ptr->m_rubberBand->hide();
                         QRect rect = d_ptr->m_rubberBand->geometry();
                         d_ptr->m_chart->zoomIn(rect);
                         event->accept();
                     }
                     if(event->button()==Qt::RightButton){
                         d_ptr->m_chart->zoomOut();
                         event->accept();
                     }
                 }
                 else {
                     QGraphicsView::mouseReleaseEvent(event);
                 }
             }
             /*!
                 Resizes and updates the chart area using the \a event data
             */
             void QChartView::resizeEvent(QResizeEvent *event)
             {
                 QGraphicsView::resizeEvent(event);
                 d_ptr->m_chart->resize(size());
                 setMinimumSize(d_ptr->m_chart->minimumSize().toSize());
                 setSceneRect(d_ptr->m_chart->geometry());
             }
             ///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-            QChartViewPrivate::QChartViewPrivate():
+            QChartViewPrivate::QChartViewPrivate(QChartView *q,QChart* chart):
-            m_scene(0),
+            q_ptr(q),
-            m_chart(0),
+            m_scene(new QGraphicsScene(q)),
+            m_chart(chart),
             m_presenter(0),
             m_rubberBand(0),
             m_rubberBandFlags(QChartView::NoRubberBand)
             {
+                q_ptr->setFrameShape(QFrame::NoFrame);
+                q_ptr->setBackgroundRole(QPalette::Window);
+                q_ptr->setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
+                q_ptr->setVerticalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
+                q_ptr->setScene(m_scene);
+                q_ptr->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding);
+                if(!m_chart) m_chart = new QChart();
+                m_scene->addItem(m_chart);
             }
             QChartViewPrivate::~QChartViewPrivate()
             {
             }
             #include "moc_qchartview.cpp"
             QTCOMMERCIALCHART_END_NAMESPACE

src/qchartview.h +1 0

             /****************************************************************************
             **
             ** Copyright (C) 2012 Digia Plc
             ** All rights reserved.
             ** For any questions to Digia, please use contact form at http://qt.digia.com
             **
             ** This file is part of the Qt Commercial Charts Add-on.
             **
             ** $QT_BEGIN_LICENSE$
             ** Licensees holding valid Qt Commercial licenses may use this file in
             ** accordance with the Qt Commercial License Agreement provided with the
             ** Software or, alternatively, in accordance with the terms contained in
             ** a written agreement between you and Digia.
             **
             ** If you have questions regarding the use of this file, please use
             ** contact form at http://qt.digia.com
             ** $QT_END_LICENSE$
             **
             ****************************************************************************/
             #ifndef QCHARTVIEW_H
             #define QCHARTVIEW_H
             #include <QAxis>
             #include <QAbstractSeries>
             #include <QChart>
             #include <QGraphicsView>
             class QGraphicsScene;
             class QRubberBand;
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
             struct QChartViewPrivate;
             class QTCOMMERCIALCHART_EXPORT QChartView : public QGraphicsView
             {
                 Q_OBJECT
                 Q_ENUMS(RubberBand)
             public:
                 enum  RubberBand{
                     NoRubberBand = 0x0,
                     VerticalRubberBand = 0x1,
                     HorizonalRubberBand = 0x2,
                     RectangleRubberBand = 0x3
                 };
                 Q_DECLARE_FLAGS(RubberBands, RubberBand)
+                explicit QChartView(QWidget *parent = 0);
                 explicit QChartView(QChart *chart,QWidget *parent = 0);
                 ~QChartView();
                 void setRubberBand(const RubberBands& rubberBands);
                 RubberBands rubberBand() const;
                 QChart* chart() const;
             protected:
                 void resizeEvent(QResizeEvent *event);
                 void mousePressEvent(QMouseEvent *event);
                 void mouseMoveEvent(QMouseEvent *event);
                 void mouseReleaseEvent(QMouseEvent *event);
             protected:
                 QScopedPointer<QChartViewPrivate> d_ptr;
                 Q_DISABLE_COPY(QChartView)
             };
             QTCOMMERCIALCHART_END_NAMESPACE
             #endif // QCHARTWIDGET_H

src/qchartview_p.h +8 -2

             /****************************************************************************
             **
             ** Copyright (C) 2012 Digia Plc
             ** All rights reserved.
             ** For any questions to Digia, please use contact form at http://qt.digia.com
             **
             ** This file is part of the Qt Commercial Charts Add-on.
             **
             ** $QT_BEGIN_LICENSE$
             ** Licensees holding valid Qt Commercial licenses may use this file in
             ** accordance with the Qt Commercial License Agreement provided with the
             ** Software or, alternatively, in accordance with the terms contained in
             ** a written agreement between you and Digia.
             **
             ** If you have questions regarding the use of this file, please use
             ** contact form at http://qt.digia.com
             ** $QT_END_LICENSE$
             **
             ****************************************************************************/
             //  W A R N I N G
             //  -------------
             //
             // This file is not part of the QtCommercial Chart API.  It exists purely as an
             // implementation detail.  This header file may change from version to
             // version without notice, or even be removed.
             //
             // We mean it.
             #ifndef QCHARTVIEW_P_H
             #define QCHARTVIEW_P_H
             #include "qchartview.h"
             class QGraphicsScene;
             class ChartPresenter;
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
             class QChart;
+            class QChartView;
-            struct QChartViewPrivate {
+            class QChartViewPrivate {
-                QChartViewPrivate();
+            public:
+                QChartViewPrivate(QChartView *q,QChart *chart = 0);
                 ~QChartViewPrivate();
+            protected:
+                QChartView *q_ptr;
+            public:
                 QGraphicsScene *m_scene;
                 QChart *m_chart;
                 ChartPresenter *m_presenter;
                 QPoint m_rubberBandOrigin;
                 QRubberBand *m_rubberBand;
                 QChartView::RubberBands m_rubberBandFlags;
             };
             QTCOMMERCIALCHART_END_NAMESPACE
             #endif

tests/auto/qchartview/tst_qchartview.cpp +6 0

             /****************************************************************************
             **
             ** Copyright (C) 2012 Digia Plc
             ** All rights reserved.
             ** For any questions to Digia, please use contact form at http://qt.digia.com
             **
             ** This file is part of the Qt Commercial Charts Add-on.
             **
             ** $QT_BEGIN_LICENSE$
             ** Licensees holding valid Qt Commercial licenses may use this file in
             ** accordance with the Qt Commercial License Agreement provided with the
             ** Software or, alternatively, in accordance with the terms contained in
             ** a written agreement between you and Digia.
             **
             ** If you have questions regarding the use of this file, please use
             ** contact form at http://qt.digia.com
             ** $QT_END_LICENSE$
             **
             ****************************************************************************/
             #include <QtTest/QtTest>
             #include <qchartview.h>
             #include <qlineseries.h>
             #include <cmath>
             #include <tst_definitions.h>
             QTCOMMERCIALCHART_USE_NAMESPACE
             Q_DECLARE_METATYPE(QChart*)
             Q_DECLARE_METATYPE(QChartView::RubberBands)
             Q_DECLARE_METATYPE(Qt::Key)
             class tst_QChartView : public QObject
             {
                 Q_OBJECT
             public Q_SLOTS:
                 void initTestCase();
                 void cleanupTestCase();
                 void init();
                 void cleanup();
             private Q_SLOTS:
                 void qchartview_data();
                 void qchartview();
                 void chart_data();
                 void chart();
                 void rubberBand_data();
                 void rubberBand();
             private:
                 QChartView* m_view;
             };
             void tst_QChartView::initTestCase()
             {
                 //test tracks mouse, give a while to user to relese it
                 QTest::qWait(1000);
             }
             void tst_QChartView::cleanupTestCase()
             {
             }
             void tst_QChartView::init()
             {
                 m_view = new QChartView(new QChart());
                 m_view->chart()->legend()->setVisible(false);
             }
             void tst_QChartView::cleanup()
             {
                 delete m_view;
                 m_view =0;
             }
             void tst_QChartView::qchartview_data()
             {
             }
             void tst_QChartView::qchartview()
             {
                 QVERIFY(m_view->chart());
                 QCOMPARE(m_view->rubberBand(), QChartView::NoRubberBand);
                 m_view->show();
                 QTest::qWaitForWindowShown(m_view);
+                delete(new QChartView());
+                QChartView view;
+                QVERIFY(view.chart());
             }
             void tst_QChartView::chart_data()
             {
                 QTest::addColumn<QChart*>("chart");
                 QTest::newRow("qchart") << new QChart();
             }
             void tst_QChartView::chart()
             {
                 QFETCH(QChart*, chart);
                 QChartView* view = new QChartView(chart);
                 QCOMPARE(view->chart(), chart);
                 delete view;
             }
             void tst_QChartView::rubberBand_data()
             {
                 QTest::addColumn<QChartView::RubberBands>("rubberBand");
                 QTest::addColumn<int>("Xcount");
                 QTest::addColumn<int>("Ycount");
                 QTest::addColumn<int>("minX");
                 QTest::addColumn<int>("maxX");
                 QTest::addColumn<int>("minY");
                 QTest::addColumn<int>("maxY");
                 QTest::newRow("HorizonalRubberBand") << QChartView::RubberBands(QChartView::HorizonalRubberBand) << 0 << 1 << 20 << 180 << 0<< 200;
                 QTest::newRow("VerticalRubberBand") <<  QChartView::RubberBands(QChartView::VerticalRubberBand) << 1 << 0 << 0 << 200 << 20<< 180;
                 QTest::newRow("RectangleRubberBand") <<  QChartView::RubberBands(QChartView::RectangleRubberBand) << 1 << 1 <<20 << 180 << 20<< 180;
             }
             void tst_QChartView::rubberBand()
             {
                 QFETCH(QChartView::RubberBands, rubberBand);
                 QFETCH(int, Xcount);
                 QFETCH(int, Ycount);
                 QFETCH(int, minX);
                 QFETCH(int, maxX);
                 QFETCH(int, minY);
                 QFETCH(int, maxY);
                 m_view->setRubberBand(rubberBand);
                 QRectF padding = m_view->chart()->margins();
                 QCOMPARE(m_view->rubberBand(), rubberBand);
                 QLineSeries* line = new QLineSeries();
                 *line << QPointF(0, 0) << QPointF(200, 200);
                 m_view->chart()->addSeries(line);
                 m_view->resize(200 + padding.left() + padding.right(), 200 +  padding.top()+ padding.bottom());
                 m_view->show();
                 //this is hack since view does not get events otherwise
                 m_view->setMouseTracking(true);
                 QAxis* axisY = m_view->chart()->axisY();
                 QSignalSpy spy0(axisY, SIGNAL(rangeChanged(qreal,qreal)));
                 QAxis* axisX = m_view->chart()->axisX();
                 QSignalSpy spy1(axisX, SIGNAL(rangeChanged(qreal,qreal)));
                 QTest::qWaitForWindowShown(m_view);
                 QTest::mouseMove(m_view->viewport(),  QPoint(minX, minY) + padding.topLeft().toPoint());
                 QTest::mousePress(m_view->viewport(), Qt::LeftButton, 0,  QPoint(minX, minY) + padding.topLeft().toPoint());
                 QTest::mouseMove(m_view->viewport(), QPoint(maxX, maxY) + padding.topLeft().toPoint());
                 QTest::mouseRelease(m_view->viewport(), Qt::LeftButton, 0, QPoint(maxX, maxY)+ padding.topLeft().toPoint());
                 TRY_COMPARE(spy0.count(), Xcount);
                 TRY_COMPARE(spy1.count(), Ycount);
                 //this is hack since view does not get events otherwise
                 m_view->setMouseTracking(false);
                 QVERIFY(axisX->min() - minX < 1);
                 QVERIFY(axisX->max() - maxX < 1);
                 QVERIFY(axisY->min() - minY < 1);
                 QVERIFY(axisY->max() - maxY < 1);
             }
             QTEST_MAIN(tst_QChartView)
             #include "tst_qchartview.moc"

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