HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/qtcharts Commit - r804:02c84d5a1cd8

Fix padding to be int, update unit test

Michal Klocek -

r804:02c84d5a1cd8

parent child

Context file:

r804:02c84d5a1cd8

Collapse all files

src/qchart.cpp +2 -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$
             **
             ****************************************************************************/
             #include "qchart.h"
             #include "qchart_p.h"
             #include <QGraphicsScene>
             #include <QGraphicsSceneResizeEvent>
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
             /*!
              \enum QChart::ChartTheme
              This enum describes the theme used by the chart.
              \value ChartThemeDefault Follows the GUI style of the Operating System
              \value ChartThemeLight
              \value ChartThemeBlueCerulean
              \value ChartThemeDark
              \value ChartThemeBrownSand
              \value ChartThemeBlueNcs
              \value ChartThemeHighContrast
              \value ChartThemeBlueIcy
              \value ChartThemeCount Not really a theme; the total count of themes.
              */
             /*!
              \enum QChart::AnimationOption
              For enabling/disabling animations. Defaults to NoAnimation.
              \value NoAnimation
              \value GridAxisAnimations
              \value SeriesAnimations
              \value AllAnimations
              */
             /*!
              \class QChart
              \brief QtCommercial chart API.
              QChart is a QGraphicsWidget that you can show in a QGraphicsScene. It manages the graphical
              representation of different types of QChartSeries and other chart related objects like
              QChartAxis and QChartLegend. If you simply want to show a chart in a layout, you can use the
              convenience class QChartView instead of QChart.
              \sa QChartView
              */
             /*!
              Constructs a chart object which is a child of a\a parent. Parameter \a wFlags is passed to the QGraphicsWidget constructor.
              */
             QChart::QChart(QGraphicsItem *parent, Qt::WindowFlags wFlags) : QGraphicsWidget(parent,wFlags),
             d_ptr(new QChartPrivate(this))
             {
                 //setMinimumSize(200,200);
                 d_ptr->m_legend = new QLegend(this);
                 d_ptr->m_dataset = new ChartDataSet(this);
                 d_ptr->m_presenter = new ChartPresenter(this,d_ptr->m_dataset);
                 setMinimumSize(d_ptr->m_padding.left() * 3, d_ptr->m_padding.top() * 3);
                 connect(d_ptr->m_dataset,SIGNAL(seriesAdded(QSeries*,Domain*)),d_ptr->m_legend,SLOT(handleSeriesAdded(QSeries*,Domain*)));
                 connect(d_ptr->m_dataset,SIGNAL(seriesRemoved(QSeries*)),d_ptr->m_legend,SLOT(handleSeriesRemoved(QSeries*)));
             }
             /*!
              Destroys the object and it's children, like QChartSeries and QChartAxis object added to it.
              */
             QChart::~QChart()
             {
                 //delete first presenter , since this is a root of all the graphical items
                 delete d_ptr->m_presenter;
                 d_ptr->m_presenter=0;
             }
             /*!
              Adds the \a series and optional \a axisY onto the chart and takes the ownership of the objects.
              If auto scaling is enabled, re-scales the axes the series is bound to (both the x axis and
              the y axis).
              */
             void QChart::addSeries(QSeries* series, QChartAxis* axisY)
             {
                 d_ptr->m_dataset->addSeries(series, axisY);
             }
             /*!
              Removes the \a series specified in a perameter from the QChartView.
              It releses its ownership of the specified QChartSeries object.
              It does not delete the pointed QChartSeries data object
              \sa addSeries(), removeAllSeries()
              */
             void QChart::removeSeries(QSeries* series)
             {
                 d_ptr->m_dataset->removeSeries(series);
             }
             /*!
              Removes all the QChartSeries that have been added to the QChartView
              It also deletes the pointed QChartSeries data objects
              \sa addSeries(), removeSeries()
              */
             void QChart::removeAllSeries()
             {
                 d_ptr->m_dataset->removeAllSeries();
             }
             /*!
              Sets the \a brush that is used for painting the background of the chart area.
              */
             void QChart::setBackgroundBrush(const QBrush& brush)
             {
                 d_ptr->createChartBackgroundItem();
                 d_ptr->m_backgroundItem->setBrush(brush);
                 d_ptr->m_backgroundItem->update();
             }
             QBrush QChart::backgroundBrush() const
             {
                 if (!d_ptr->m_backgroundItem) return QBrush();
                 return (d_ptr->m_backgroundItem)->brush();
             }
             /*!
              Sets the \a pen that is used for painting the background of the chart area.
              */
             void QChart::setBackgroundPen(const QPen& pen)
             {
                 d_ptr->createChartBackgroundItem();
                 d_ptr->m_backgroundItem->setPen(pen);
                 d_ptr->m_backgroundItem->update();
             }
             QPen QChart::backgroundPen() const
             {
                 if (!d_ptr->m_backgroundItem) return QPen();
                 return d_ptr->m_backgroundItem->pen();
             }
             /*!
              Sets the chart \a title. The description text that is drawn above the chart.
              */
             void QChart::setTitle(const QString& title)
             {
                 d_ptr->createChartTitleItem();
                 d_ptr->m_titleItem->setText(title);
                 d_ptr->updateLayout();
             }
             /*!
              Returns the chart title. The description text that is drawn above the chart.
              */
             QString QChart::title() const
             {
                 if (d_ptr->m_titleItem)
                 return d_ptr->m_titleItem->text();
                 else
                 return QString();
             }
             /*!
              Sets the \a font that is used for rendering the description text that is rendered above the chart.
              */
             void QChart::setTitleFont(const QFont& font)
             {
                 d_ptr->createChartTitleItem();
                 d_ptr->m_titleItem->setFont(font);
                 d_ptr->updateLayout();
             }
             /*!
              Sets the \a brush used for rendering the title text.
              */
             void QChart::setTitleBrush(const QBrush &brush)
             {
                 d_ptr->createChartTitleItem();
                 d_ptr->m_titleItem->setBrush(brush);
                 d_ptr->updateLayout();
             }
             /*!
              Returns the brush used for rendering the title text.
              */
             QBrush QChart::titleBrush() const
             {
                 if (!d_ptr->m_titleItem) return QBrush();
                 return d_ptr->m_titleItem->brush();
             }
             /*!
              Sets the \a theme used by the chart for rendering the graphical representation of the data
              \sa ChartTheme, chartTheme()
              */
             void QChart::setTheme(QChart::ChartTheme theme)
             {
                 d_ptr->m_presenter->setTheme(theme);
             }
             /*!
              Returns the theme enum used by the chart.
              \sa ChartTheme, setChartTheme()
              */
             QChart::ChartTheme QChart::theme() const
             {
                 return d_ptr->m_presenter->theme();
             }
             /*!
              Zooms in the view by a factor of 2
              */
             void QChart::zoomIn()
             {
                 d_ptr->m_presenter->zoomIn();
             }
             /*!
              Zooms in the view to a maximum level at which \a rect is still fully visible.
              */
             void QChart::zoomIn(const QRectF& rect)
             {
                 if (!rect.isValid()) return;
                 d_ptr->m_presenter->zoomIn(rect);
             }
             /*!
              Restores the view zoom level to the previous one.
              */
             void QChart::zoomOut()
             {
                 d_ptr->m_presenter->zoomOut();
             }
             /*!
              Returns the pointer to the x axis object of the chart
              */
             QChartAxis* QChart::axisX() const
             {
                 return d_ptr->m_dataset->axisX();
             }
             /*!
              Returns the pointer to the y axis object of the chart
              */
             QChartAxis* QChart::axisY() const
             {
                 return d_ptr->m_dataset->axisY();
             }
             /*!
              Returns the legend object of the chart. Ownership stays in chart.
              */
             QLegend* QChart::legend() const
             {
                 return d_ptr->m_legend;
             }
-            QRectF QChart::padding() const
+            QRect QChart::padding() const
             {
                 return d_ptr->m_padding;
             }
             /*!
              Resizes and updates the chart area using the \a event data
              */
             void QChart::resizeEvent(QGraphicsSceneResizeEvent *event)
             {
                 d_ptr->m_rect = QRectF(QPoint(0,0),event->newSize());
                 d_ptr->updateLayout();
                 QGraphicsWidget::resizeEvent(event);
                 update();
             }
             /*!
              Sets animation \a options for the chart
              */
             void QChart::setAnimationOptions(AnimationOptions options)
             {
                 d_ptr->m_presenter->setAnimationOptions(options);
             }
             /*!
              Returns animation options for the chart
              */
             QChart::AnimationOptions QChart::animationOptions() const
             {
                 return d_ptr->m_presenter->animationOptions();
             }
             void QChart::scrollLeft()
             {
                 d_ptr->m_presenter->scroll(-d_ptr->m_presenter->geometry().width()/(axisX()->ticksCount()-1),0);
             }
             void QChart::scrollRight()
             {
                 d_ptr->m_presenter->scroll(d_ptr->m_presenter->geometry().width()/(axisX()->ticksCount()-1),0);
             }
             void QChart::scrollUp()
             {
                 d_ptr->m_presenter->scroll(0,d_ptr->m_presenter->geometry().width()/(axisY()->ticksCount()-1));
             }
             void QChart::scrollDown()
             {
                 d_ptr->m_presenter->scroll(0,-d_ptr->m_presenter->geometry().width()/(axisY()->ticksCount()-1));
             }
             void QChart::setBackgroundVisible(bool visible)
             {
                 d_ptr->createChartBackgroundItem();
                 d_ptr->m_backgroundItem->setVisible(visible);
             }
             bool QChart::isBackgroundVisible() const
             {
                 if (!d_ptr->m_backgroundItem) return false;
                 return d_ptr->m_backgroundItem->isVisible();
             }
             //////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
             QChartPrivate::QChartPrivate(QChart *parent):
             q_ptr(parent),
             m_backgroundItem(0),
             m_titleItem(0),
             m_legend(0),
             m_dataset(0),
             m_presenter(0),
-            m_padding(QRectF(50,50,50,50))
+            m_padding(QRect(50,50,0,0))
             {
             }
             QChartPrivate::~QChartPrivate()
             {
             }
             void QChartPrivate::createChartBackgroundItem()
             {
                 if (!m_backgroundItem) {
                     m_backgroundItem = new ChartBackground(q_ptr);
                     m_backgroundItem->setPen(Qt::NoPen);
                     m_backgroundItem->setZValue(ChartPresenter::BackgroundZValue);
                 }
             }
             void QChartPrivate::createChartTitleItem()
             {
                 if (!m_titleItem) {
                     m_titleItem = new QGraphicsSimpleTextItem(q_ptr);
                     m_titleItem->setZValue(ChartPresenter::BackgroundZValue);
                 }
             }
             void QChartPrivate::updateLegendLayout()
             {
                 //int legendPadding = m_chart->legend()->padding();
                 int legendPadding = 30;
                 QRectF rect = m_rect;
                 if ((m_legend->attachedToChart()) && (m_legend->isVisible())) {
                     // Reserve some space for legend
                     switch (m_legend->alignment()) {
                     case QLegend::AlignmentTop: {
                         rect.adjust(m_padding.left(),
                                     m_padding.top() + legendPadding,
                                     -m_padding.right(),
                                     -m_padding.bottom());
                         break;
                     }
                     case QLegend::AlignmentBottom: {
                         rect.adjust(m_padding.left(),
                                     m_padding.top(),
                                     -m_padding.right(),
                                     -m_padding.bottom() - legendPadding);
                         break;
                     }
                     case QLegend::AlignmentLeft: {
                         rect.adjust(m_padding.left() + legendPadding,
                                     m_padding.top(),
                                     -m_padding.right(),
                                     -m_padding.bottom());
                         break;
                     }
                     case QLegend::AlignmentRight: {
                         rect.adjust(m_padding.left(),
                                     m_padding.top(),
                                     -m_padding.right() - legendPadding,
                                     -m_padding.bottom());
                         break;
                     }
                     default: {
                         rect.adjust(m_padding.left(),
                                     m_padding.top(),
                                     -m_padding.right(),
                                     -m_padding.bottom());
                         break;
                     }
                     }
                 } else {
                     rect.adjust(m_padding.left(),
                                 m_padding.top(),
                                 -m_padding.right(),
                                 -m_padding.bottom());
                 }
                 QRectF plotRect = m_rect.adjusted(m_padding.left()
                                                   ,m_padding.top()
                                                   ,-m_padding.right()
                                                   ,-m_padding.bottom());
                 QRectF legendRect;
                 int padding = 0; // TODO: fix this
                 switch (m_legend->alignment())
                 {
                     case QLegend::AlignmentTop: {
                         legendRect = m_rect.adjusted(0,padding,0,-padding - plotRect.height());
                         break;
                     }
                     case QLegend::AlignmentBottom: {
                         legendRect = m_rect.adjusted(padding,padding + plotRect.height(),-padding,0);
                         break;
                     }
                     case QLegend::AlignmentLeft: {
                         legendRect = m_rect.adjusted(0,padding,-padding - plotRect.width(),-padding);
                         break;
                     }
                     case QLegend::AlignmentRight: {
                         legendRect = m_rect.adjusted(padding + plotRect.width(),padding,0,-padding);
                         break;
                     }
                     default: {
                         legendRect = plotRect;
                         break;
                     }
                 }
                 m_legend->setMaximumSize(legendRect.size());
                 qreal width = legendRect.width() - m_legend->size().width();
                 qreal height = legendRect.height() - m_legend->size().height();
                 QPointF pos = legendRect.topLeft();
                 if (width > 0) {
                     pos.setX(pos.x() + width/2);
                 }
                 if (height > 0) {
                     pos.setY(pos.y() + height/2);
                 }
                 m_legend->setPos(pos);
             }
             void QChartPrivate::updateLayout()
             {
                 if (!m_rect.isValid()) return;
                 int padding = m_padding.top();
                 int backgroundPadding = m_presenter->backgroundPadding();
                 // recalculate title position
                 if (m_titleItem) {
                     QPointF center = m_rect.center() -m_titleItem->boundingRect().center();
                     m_titleItem->setPos(center.x(),m_rect.top()/2 + padding/2);
                 }
                 //recalculate background gradient
                 if (m_backgroundItem) {
                     m_backgroundItem->setRect(m_rect.adjusted(backgroundPadding,backgroundPadding, -backgroundPadding, -backgroundPadding));
                 }
                 // recalculate legend position
                 if (m_legend) {
                     if ((m_legend->attachedToChart()) && (m_legend->parentObject() == q_ptr)) {
                         updateLegendLayout();
                     }
                 }
             }
             #include "moc_qchart.cpp"
             QTCOMMERCIALCHART_END_NAMESPACE

src/qchart.h +1 -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$
             **
             ****************************************************************************/
             #ifndef QCHART_H
             #define QCHART_H
             #include <QSeries>
             #include <QGraphicsWidget>
             class QGraphicsSceneResizeEvent;
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
             class QSeries;
             class QChartAxis;
             class QLegend;
             struct QChartPrivate;
             class QTCOMMERCIALCHART_EXPORT QChart : public QGraphicsWidget
             {
                 Q_OBJECT
             public:
                 enum ChartTheme {
                     ChartThemeDefault,
                     ChartThemeLight,
                     ChartThemeBlueCerulean,
                     ChartThemeDark,
                     ChartThemeBrownSand,
                     ChartThemeBlueNcs,
                     ChartThemeHighContrast,
                     ChartThemeBlueIcy,
                     ChartThemeCount
                 };
                 enum AnimationOption {
                     NoAnimation = 0x0,
                     GridAxisAnimations = 0x1,
                     SeriesAnimations =0x2,
                     AllAnimations = 0x3
                 };
                 Q_DECLARE_FLAGS(AnimationOptions, AnimationOption)
             public:
                 explicit QChart(QGraphicsItem *parent = 0, Qt::WindowFlags wFlags = 0);
                 ~QChart();
                 void addSeries(QSeries *series, QChartAxis *axisY = 0);
                 void removeSeries(QSeries *series);
                 void removeAllSeries();
                 void setTheme(QChart::ChartTheme theme);
                 QChart::ChartTheme theme() const;
                 void setTitle(const QString& title);
                 QString title() const;
                 void setTitleFont(const QFont& font);
                 QFont titleFont() const;
                 void setTitleBrush(const QBrush &brush);
                 QBrush titleBrush() const;
                 void setBackgroundBrush(const QBrush &brush);
                 QBrush backgroundBrush() const;
                 void setBackgroundPen(const QPen &pen);
                 QPen backgroundPen() const;
                 void setBackgroundVisible(bool visible);
                 bool isBackgroundVisible() const;
                 void setAnimationOptions(AnimationOptions options);
                 AnimationOptions animationOptions() const;
                 void zoomIn();
                 void zoomIn(const QRectF &rect);
                 void zoomOut();
                 void scrollLeft();
                 void scrollRight();
                 void scrollUp();
                 void scrollDown();
                 QChartAxis* axisX() const;
                 QChartAxis* axisY() const;
                 QLegend* legend() const;
-                QRectF padding() const;
+                QRect padding() const;
             protected:
                 void resizeEvent(QGraphicsSceneResizeEvent *event);
             protected:
                 QScopedPointer<QChartPrivate> d_ptr;
-                friend class QChartView;
                 friend class QLegend;
                 Q_DISABLE_COPY(QChart)
             };
             QTCOMMERCIALCHART_END_NAMESPACE
             Q_DECLARE_OPERATORS_FOR_FLAGS(QTCOMMERCIALCHART_NAMESPACE::QChart::AnimationOptions)
             #endif

src/qchart_p.h +1 -1

             /****************************************************************************
             **
             ** 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 QCHART_P_H
             #define QCHART_P_H
             #include "qchartaxis.h"
             #include "qlegend.h"
             #include "chartpresenter_p.h"
             #include "chartdataset_p.h"
             #include "chartbackground_p.h"
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
             class QChart;
             struct QChartPrivate
             {
                 QChartPrivate(QChart *parent);
                 ~QChartPrivate();
                 void createChartBackgroundItem();
                 void createChartTitleItem();
                 void updateLayout();
                 void updateLegendLayout();
                 QChart *q_ptr;
                 ChartBackground* m_backgroundItem;
                 QGraphicsSimpleTextItem* m_titleItem;
                 QRectF m_rect;
                 QLegend* m_legend;
                 ChartDataSet *m_dataset;
                 ChartPresenter *m_presenter;
-                QRectF m_padding;
+                QRect m_padding;
             };
             QTCOMMERCIALCHART_END_NAMESPACE
             #endif

src/qchartview.cpp +18 -7

             /****************************************************************************
             **
             ** 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 "qchart_p.h"
             #include "qchartview_p.h"
             #include <QGraphicsScene>
             #include <QRubberBand>
             /*!
                 \enum QChartView::RubberBandPolicy
                 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
                 QChartSeries and other chart related objects like QChartAxis and QChartLegend. 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 which is a child of a\a parent.
             */
             QChartView::QChartView(QChart *chart,QWidget *parent) :
                 QGraphicsView(parent),
                 d_ptr(new QChartViewPrivate())
             {
                 d_ptr->m_scene = new QGraphicsScene(this);
                 d_ptr->m_chart = chart;
-                d_ptr->m_presenter = chart->d_ptr->m_presenter;
                 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 QChartSeries and QChartAxis object added to it.
             */
             QChartView::~QChartView()
             {
             }
             QChart* QChartView::chart() const
             {
                 return d_ptr->m_chart;
             }
             /*!
                 Sets the RubberBandPlicy to \a policy. 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->padding().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()) {
                     int padding = d_ptr->m_chart->padding().top();
                     QRect rect(padding, padding, width() - 2 * padding, height() - 2 * padding);
                     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);
                 }
             }
             /*!
                 Pressing + and - keys performs zoomIn() and zoomOut() respectivly.
                 In other \a event is passed to the QGraphicsView::keyPressEvent() implementation
             */
             void QChartView::keyPressEvent(QKeyEvent *event)
             {
                 switch (event->key()) {
                     case Qt::Key_Plus:
-                    d_ptr->m_chart->zoomIn();
+                        d_ptr->m_chart->zoomIn();
-                    break;
+                        break;
                     case Qt::Key_Minus:
-                    d_ptr->m_chart->zoomOut();
+                        d_ptr->m_chart->zoomOut();
-                    break;
+                        break;
+                    case Qt::Key_Left:
+                        d_ptr->m_chart->scrollLeft();
+                        break;
+                    case Qt::Key_Right:
+                        d_ptr->m_chart->scrollRight();
+                        break;
+                    case Qt::Key_Up:
+                        d_ptr->m_chart->scrollUp();
+                        break;
+                    case Qt::Key_Down:
+                        d_ptr->m_chart->scrollDown();
+                        break;
                     default:
-                    QGraphicsView::keyPressEvent(event);
+                        QGraphicsView::keyPressEvent(event);
-                    break;
+                        break;
                 }
             }
             /*!
                 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());
                 setSceneRect(d_ptr->m_chart->geometry());
             }
             ///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
             QChartViewPrivate::QChartViewPrivate():
             m_scene(0),
             m_chart(0),
             m_presenter(0),
             m_rubberBand(0),
             m_rubberBandFlags(QChartView::NoRubberBand)
             {
             }
             QChartViewPrivate::~QChartViewPrivate()
             {
             }
             #include "moc_qchartview.cpp"
             QTCOMMERCIALCHART_END_NAMESPACE

test/auto/qchartview/tst_qchartview.cpp +68 -14

             /****************************************************************************
             **
             ** 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>
             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();
+                void keys_data();
+                void keys();
             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());
             }
             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);
             }
             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 << 10 << 90 << 0<< 100;
-                QTest::newRow("VerticalRubberBand") <<  QChartView::RubberBands(QChartView::VerticalRubberBand) << 1 << 0 << 10 << 90 << 0<< 100;
+                QTest::newRow("VerticalRubberBand") <<  QChartView::RubberBands(QChartView::VerticalRubberBand) << 1 << 0 << 0 << 100 << 10<< 90;
-                QTest::newRow("RectangleRubberBand") <<  QChartView::RubberBands(QChartView::RectangleRubberBand) << 1 << 1 <<10 << 90 << 0<< 100;
+                QTest::newRow("RectangleRubberBand") <<  QChartView::RubberBands(QChartView::RectangleRubberBand) << 1 << 1 <<10 << 90 << 10<< 90;
             }
             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);
+                QRect padding = m_view->chart()->padding();
                 QCOMPARE(m_view->rubberBand(), rubberBand);
                 QLineSeries* line = new QLineSeries();
                 *line << QPointF(0, 0) << QPointF(100, 100);
                 m_view->chart()->addSeries(line);
-                m_view->resize(1000, 1000);
+                m_view->resize(100 + padding.left() + padding.right(), 100 +  padding.top()+ padding.bottom());
                 m_view->show();
+                //this is hack since view does not get events otherwise
                 m_view->setMouseTracking(true);
                 QChartAxis* axisY = m_view->chart()->axisY();
                 QSignalSpy spy0(axisY, SIGNAL(rangeChanged(qreal, qreal)));
                 QChartAxis* axisX = m_view->chart()->axisX();
                 QSignalSpy spy1(axisX, SIGNAL(rangeChanged(qreal, qreal)));
                 QTest::qWaitForWindowShown(m_view);
-                QTest::mouseMove(m_view->viewport(), QPoint(250, 250));
+                QTest::mouseMove(m_view->viewport(),  QPoint(minX, minY) + padding.topLeft());
-                QTest::mousePress(m_view->viewport(), Qt::LeftButton, 0, QPoint(250, 250));
-                QTest::mouseMove(m_view->viewport(), QPoint(900, 900));
+                QTest::mousePress(m_view->viewport(), Qt::LeftButton, 0,  QPoint(minX, minY) + padding.topLeft());
-                QTest::qWait(3000);
+                QTest::mouseMove(m_view->viewport(), QPoint(maxX, maxY) + padding.topLeft());
-                QTest::mouseRelease(m_view->viewport(), Qt::LeftButton, 0, QPoint(900, 900));
-                QTest::qWait(3000);
+                QTest::mouseRelease(m_view->viewport(), Qt::LeftButton, 0, QPoint(maxX, maxY)+ padding.topLeft());
                 QCOMPARE(spy0.count(), Xcount);
                 QCOMPARE(spy1.count(), Ycount);
-            qDebug()<<axisX->min();
-                QVERIFY(int(ceil(axisX->min())) - minX < 1);
+                //this is hack since view does not get events otherwise
-                QVERIFY(int(ceil(axisX->max())) - maxX < 1);
+                m_view->setMouseTracking(false);
-                QVERIFY(int(ceil(axisY->min())) - minY < 1);
-                QVERIFY(int(ceil(axisY->max())) - maxY < 1);
+                QVERIFY(axisX->min() - minX < 1);
+                QVERIFY(axisX->max() - maxX < 1);
+                QVERIFY(axisY->min() - minY < 1);
+                QVERIFY(axisY->max() - maxY < 1);
+            }
+            void tst_QChartView::keys_data()
+            {
+                QTest::addColumn<Qt::Key>("key");
+                QTest::addColumn<int>("Xcount");
+                QTest::addColumn<int>("Ycount");
+                QTest::newRow("Qt::Key_Plus") << Qt::Key_Plus << 1 << 1;
+                QTest::newRow("Qt::Key_Minus") << Qt::Key_Minus << 1 << 1;
+                QTest::newRow("Qt::Key_Up") << Qt::Key_Up << 0 << 1;
+                QTest::newRow("Qt::Key_Down") << Qt::Key_Down << 0 << 1;
+                QTest::newRow("Qt::Key_Left") << Qt::Key_Left << 1 << 0;
+                QTest::newRow("Qt::Key_Right") << Qt::Key_Right << 1 << 0;
+            }
+            void tst_QChartView::keys()
+            {
+                QFETCH(Qt::Key,key);
+                QFETCH(int, Xcount);
+                QFETCH(int, Ycount);
+                QRect padding = m_view->chart()->padding();
+                QLineSeries* line = new QLineSeries();
+                *line << QPointF(0, 0) << QPointF(100, 100);
+                m_view->chart()->addSeries(line);
+                m_view->resize(100 + padding.left() + padding.right(), 100 +  padding.top()+ padding.bottom());
+                m_view->show();
+                QChartAxis* axisY = m_view->chart()->axisY();
+                QSignalSpy spy0(axisY, SIGNAL(rangeChanged(qreal, qreal)));
+                QChartAxis* axisX = m_view->chart()->axisX();
+                QSignalSpy spy1(axisX, SIGNAL(rangeChanged(qreal, qreal)));
+                QTest::keyPress(m_view, key);
+                QTest::keyRelease(m_view, key);
+                QCOMPARE(spy0.count(), Ycount);
+                QCOMPARE(spy1.count(), Xcount);
             }
             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