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 +10 0

             #include "qchart.h"
             #include "qchartseries.h"
             #include "qscatterseries.h"
             #include "qscatterseries_p.h"
             #include "qpieseries.h"
             #include "qxychartseries.h"
             #include "qchartaxis.h"
             #include "barchartseries.h"
             #include "bargroup.h"
             #include "xylinechartitem_p.h"
             #include "plotdomain_p.h"
             #include "axisitem_p.h"
             #include <QGraphicsScene>
             #include <QDebug>
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
             QChart::QChart(QGraphicsObject* parent) : QGraphicsObject(parent),
                 m_backgroundItem(0),
                 m_titleItem(0),
                 m_axisXItem(new AxisItem(AxisItem::X_AXIS,this)),
                 m_plotDataIndex(0),
                 m_marginSize(0)
             {
                 // TODO: the default theme?
                 setTheme(QChart::ChartThemeDefault);
                 PlotDomain domain;
                 m_plotDomainList<<domain;
                 m_axisYItem << new AxisItem(AxisItem::Y_AXIS,this);
                 m_chartItems<<m_axisXItem;
                 m_chartItems<<m_axisYItem.at(0);
             }
             QChart::~QChart(){}
             QRectF QChart::boundingRect() const
             {
                 return m_rect;
             }
             void QChart::addSeries(QChartSeries* series)
             {
                 // TODO: we should check the series not already added
                 m_chartSeries << series;
                 switch(series->type())
                 {
                 case QChartSeries::SeriesTypeLine: {
                     QXYChartSeries* xyseries = static_cast<QXYChartSeries*>(series);
                     // Use color defined by theme in case the series does not define a custom color
                     if (!xyseries->pen().color().isValid() && m_themeColors.count()) //TODO: wtf
                         xyseries->setPen(nextColor());
                     m_plotDataIndex = 0 ;
                     m_plotDomainList.resize(1);
                     PlotDomain& domain = m_plotDomainList[m_plotDataIndex];
                     for (int i = 0 ; i < xyseries->count() ; i++)
                     {
                         qreal x = xyseries->x(i);
                         qreal y = xyseries->y(i);
                         domain.m_minX = qMin(domain.m_minX,x);
                         domain.m_minY = qMin(domain.m_minY,y);
                         domain.m_maxX = qMax(domain.m_maxX,x);
                         domain.m_maxY = qMax(domain.m_maxY,y);
                     }
                     XYLineChartItem* item = new XYLineChartItem(xyseries,this);
                     m_chartItems<<item;
                     foreach(ChartItem* i ,m_chartItems)
                         i->setPlotDomain(m_plotDomainList.at(m_plotDataIndex));
                     break;
                 }
                 case QChartSeries::SeriesTypeBar: {
                     qDebug() << "barSeries added";
                     BarChartSeries* barSeries = static_cast<BarChartSeries*>(series);
                     BarGroup* barGroup = new BarGroup(*barSeries,this);
                     // Add some fugly colors for 5 fist series...
                     barGroup->addColor(QColor(255,0,0,128));
                     barGroup->addColor(QColor(255,255,0,128));
                     barGroup->addColor(QColor(0,255,0,128));
                     barGroup->addColor(QColor(0,0,255,128));
                     barGroup->addColor(QColor(255,128,0,128));
                     m_chartItems<<barGroup;
                     childItems().append(barGroup);
                     break;
                     }
                 case QChartSeries::SeriesTypeScatter: {
                     QScatterSeries *scatterSeries = qobject_cast<QScatterSeries *>(series);
                     scatterSeries->d->setParentItem(this);
                     // Set pre-defined colors in case the series has no colors defined
                     if (!scatterSeries->markerColor().isValid())
                         scatterSeries->setMarkerColor(nextColor());
                     connect(this, SIGNAL(sizeChanged(QRectF)),
                             scatterSeries, SLOT(chartSizeChanged(QRectF)));
             //        QColor nextColor = m_themeColors.takeFirst();
             //        nextColor.setAlpha(150); // TODO: default opacity?
             //        scatterSeries->setMarkerColor(nextColor);
                     break;
                     }
                 case QChartSeries::SeriesTypePie: {
                     QPieSeries *pieSeries = qobject_cast<QPieSeries *>(series);
                     for (int i(0); i < pieSeries->sliceCount(); i++) {
                         if (!pieSeries->sliceColor(i).isValid())
                             pieSeries->setSliceColor(i, nextColor());
                     }
                     connect(this, SIGNAL(sizeChanged(QRectF)),
                             pieSeries, SLOT(chartSizeChanged(QRectF)));
                     // Set pre-defined colors in case the series has no colors defined
                     // TODO: how to define the color for all the slices of a pie?
             //        for (int (i); i < pieSeries.sliceCount(); i++)
                     break;
                     }
                 }
             }
             QChartSeries* QChart::createSeries(QChartSeries::QChartSeriesType type)
             {
                 // TODO: support also other types; not only scatter and pie
                 QChartSeries *series(0);
                 switch (type) {
                 case QChartSeries::SeriesTypeLine: {
                     series = QXYChartSeries::create();
                     break;
                 }
                 case QChartSeries::SeriesTypeBar: {
                     series = new BarChartSeries(this);
                     break;
                 }
                 case QChartSeries::SeriesTypeScatter: {
                     series = new QScatterSeries(this);
                     break;
                 }
                 case QChartSeries::SeriesTypePie: {
                     series = new QPieSeries(this);
                     break;
                 }
                 default:
                     Q_ASSERT(false);
                     break;
                 }
                 addSeries(series);
                 return series;
             }
             void QChart::setSize(const QSize& size)
             {
                 m_rect = QRect(QPoint(0,0),size);
                 QRect rect = m_rect.adjusted(margin(),margin(), -margin(), -margin());
                 //recaculate title
                 if(m_titleItem){
                     QPointF center = m_rect.center() -m_titleItem->boundingRect().center();
                     m_titleItem->setPos(center.x(),m_rect.top()/2 + margin()/2);
                 }
                 //recalculate background gradient
                 if(m_backgroundItem){
                     m_backgroundItem->setRect(rect);
                     if(m_bacgroundOrinetation==HorizonatlGradientOrientation)
                     m_backgroundGradient.setFinalStop(m_backgroundItem->rect().width(),0);
                     else
                     m_backgroundGradient.setFinalStop(0,m_backgroundItem->rect().height());
                     m_backgroundItem->setBrush(m_backgroundGradient);
                 }
                 //resize elements
                 foreach (ChartItem* item ,m_chartItems) {
                     item->setPos(rect.topLeft());
                     item->setSize(rect.size());
                 }
                 // TODO: TTD for setting scale
                 //emit scaleChanged(100, 100);
                 // TODO: calculate the origo
                 // TODO: not sure if emitting a signal here is the best from performance point of view
                 emit sizeChanged(QRectF(0, 0, size.width(), size.height()));
                 update();
             }
             void QChart::setBackground(const QColor& startColor, const QColor& endColor, GradientOrientation orientation)
             {
                 if(!m_backgroundItem){
                     m_backgroundItem = new QGraphicsRectItem(this);
                     m_backgroundItem->setZValue(-1);
                 }
                 m_bacgroundOrinetation = orientation;
                 m_backgroundGradient.setColorAt( 0.0, startColor);
                 m_backgroundGradient.setColorAt( 1.0, endColor);
                 m_backgroundGradient.setStart(0,0);
                 if(orientation == VerticalGradientOrientation){
                     m_backgroundGradient.setFinalStop(0,m_rect.height());
                 }else{
                     m_backgroundGradient.setFinalStop(m_rect.width(),0);
                 }
                 m_backgroundItem->setBrush(m_backgroundGradient);
                 m_backgroundItem->setPen(Qt::NoPen);
                 m_backgroundItem->update();
             }
             void QChart::setTitle(const QString& title,const QFont& font)
             {
                 if(!m_titleItem) m_titleItem = new QGraphicsTextItem(this);
                 m_titleItem->setPlainText(title);
                 m_titleItem->setFont(font);
             }
             int QChart::margin() const
             {
                 return m_marginSize;
             }
             void QChart::setMargin(int margin)
             {
                 m_marginSize = margin;
             }
             void QChart::setTheme(QChart::ChartThemeId theme)
             {
             //    if (theme != m_currentTheme) {
                 m_themeColors.clear();
                 // TODO: define color themes
                 switch (theme) {
                 case QChart::ChartThemeDefault:
                     // TODO: define the default theme based on the OS
                     m_themeColors.append(QColor(QRgb(0xff000000)));
                     m_themeColors.append(QColor(QRgb(0xff707070)));
                     setBackground(QColor(QRgb(0xffffffff)), QColor(QRgb(0xffafafaf)), VerticalGradientOrientation);
                     break;
                 case QChart::ChartThemeVanilla:
                     m_themeColors.append(QColor(217, 197, 116));
                     m_themeColors.append(QColor(214, 168, 150));
                     m_themeColors.append(QColor(160, 160, 113));
                     m_themeColors.append(QColor(210, 210, 52));
                     m_themeColors.append(QColor(136, 114, 58));
                     setBackground(QColor(QRgb(0xff9d844d)), QColor(QRgb(0xffafafaf)), VerticalGradientOrientation);
                     break;
                 case QChart::ChartThemeIcy:
                     m_themeColors.append(QColor(0, 3, 165));
                     m_themeColors.append(QColor(49, 52, 123));
                     m_themeColors.append(QColor(71, 114, 187));
                     m_themeColors.append(QColor(48, 97, 87));
                     m_themeColors.append(QColor(19, 71, 90));
                     m_themeColors.append(QColor(110, 70, 228));
                     setBackground(QColor(QRgb(0xffe4ffff)), QColor(QRgb(0xffe4ffff)), VerticalGradientOrientation);
                     break;
                 case QChart::ChartThemeGrayscale:
                     m_themeColors.append(QColor(0, 0, 0));
                     m_themeColors.append(QColor(50, 50, 50));
                     m_themeColors.append(QColor(100, 100, 100));
                     m_themeColors.append(QColor(140, 140, 140));
                     m_themeColors.append(QColor(180, 180, 180));
                     setBackground(QColor(QRgb(0xffffffff)), QColor(QRgb(0xffafafaf)), VerticalGradientOrientation);
                     break;
                 case QChart::ChartThemeUnnamed1:
                     m_themeColors.append(QColor(QRgb(0xff3fa9f5)));
                     m_themeColors.append(QColor(QRgb(0xff7AC943)));
                     m_themeColors.append(QColor(QRgb(0xffFF931E)));
                     m_themeColors.append(QColor(QRgb(0xffFF1D25)));
                     m_themeColors.append(QColor(QRgb(0xffFF7BAC)));
                     setBackground(QColor(QRgb(0xfff3dc9e)), QColor(QRgb(0xffafafaf)), VerticalGradientOrientation);
                     break;
                 default:
                     Q_ASSERT(false);
                     break;
                 }
                 if(m_backgroundItem){
                 m_backgroundItem->setBrush(m_backgroundGradient);
                 m_backgroundItem->setPen(Qt::NoPen);
                 }
                 foreach(QChartSeries* series, m_chartSeries) {
                     // TODO: other series interested on themes?
                     if (series->type() == QChartSeries::SeriesTypeLine) {
                         QXYChartSeries *lineseries = reinterpret_cast<QXYChartSeries *>(series);
                         lineseries->setPen(nextColor());
                     } else if (series->type() == QChartSeries::SeriesTypeScatter) {
                         QScatterSeries *scatter = qobject_cast<QScatterSeries *>(series);
                         scatter->setMarkerColor(nextColor());
                     } else if (series->type() == QChartSeries::SeriesTypePie) {
                         QPieSeries *pieSeries = qobject_cast<QPieSeries *>(series);
                         for (int i(0); i < pieSeries->sliceCount(); i++)
                             pieSeries->setSliceColor(i, nextColor());
                     }
                 }
                 update();
             }
             QColor QChart::nextColor()
             {
                 QColor nextColor = m_themeColors.first();
                 m_themeColors.move(0, m_themeColors.size() - 1);
                 return nextColor;
             }
             void QChart::zoomInToRect(const QRect& rectangle)
             {
                 if(!rectangle.isValid()) return;
                 qreal margin = this->margin();
                 QRect rect = rectangle.normalized();
                 rect.translate(-margin, -margin);
                 PlotDomain& oldDomain = m_plotDomainList[m_plotDataIndex];
                 PlotDomain domain = oldDomain.subDomain(rect,m_rect.width() - 2 * margin,m_rect.height() - 2 * margin);
                 m_plotDomainList.resize(m_plotDataIndex + 1);
                 m_plotDomainList<<domain;
                 m_plotDataIndex++;
                 foreach (ChartItem* item ,m_chartItems)
                     item->setPlotDomain(m_plotDomainList[m_plotDataIndex]);
                 update();
             }
             void QChart::zoomIn()
             {
                 if (m_plotDataIndex < m_plotDomainList.count() - 1) {
                     m_plotDataIndex++;
                     foreach (ChartItem* item ,m_chartItems)
                         item->setPlotDomain(m_plotDomainList[m_plotDataIndex]);
                     update();
                 } else {
                     QRect rect = m_rect.adjusted(margin(),margin(), -margin(), -margin());
                     rect.setWidth(rect.width()/2);
                     rect.setHeight(rect.height()/2);
                     rect.moveCenter(m_rect.center());
                     zoomInToRect(rect);
                 }
             }
             void QChart::zoomOut()
             {
                 if (m_plotDataIndex > 0) {
                     m_plotDataIndex--;
                     foreach (ChartItem* item ,m_chartItems)
                         item->setPlotDomain(m_plotDomainList[m_plotDataIndex]);
                     update();
                 }
             }
+            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);
             }
             void QChart::setAxisY(const QChartAxis& axis)
             {
                 setAxis(m_axisYItem.at(0),axis);
             }
             void QChart::setAxisY(const QList<QChartAxis>& axis)
             {
                 //TODO not implemented
             }
             void QChart::setAxis(AxisItem *item, const QChartAxis& axis)
             {
                 item->setVisible(axis.isAxisVisible());
             }
             #include "moc_qchart.cpp"
             QTCOMMERCIALCHART_END_NAMESPACE

src/qchart.h +1 0

             #ifndef CHART_H
             #define CHART_H
             #include <qchartglobal.h>
             #include <qchartseries.h>
             #include <QGraphicsObject>
             #include <QLinearGradient>
             #include <QFont>
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
             class AxisItem;
             class QChartSeries;
             class PlotDomain;
             class ChartItem;
             class BarGroup;
             class QChartAxis;
             // TODO: We don't need to have QChart tied to QGraphicsItem:
             //class QTCOMMERCIALCHART_EXPORT QChart
             //class QTCOMMERCIALCHART_EXPORT QChartGraphicsItem : public QGraphicsItem {
             // public: QChartGraphicsItem(QChart &chart);
             /*!
              * TODO: define the responsibilities
              */
             class QTCOMMERCIALCHART_EXPORT QChart : public QGraphicsObject
             {
                 Q_OBJECT
             public:
                 enum GradientOrientation {
                     HorizonatlGradientOrientation,
                     VerticalGradientOrientation
                 };
                 enum ChartThemeId {
                     /*! The default theme follows the GUI style of the Operating System */
                     ChartThemeDefault = 0,
                     ChartThemeVanilla,
                     ChartThemeIcy,
                     ChartThemeGrayscale,
                     //ChartThemeScientific,
                     ChartThemeUnnamed1
                 };
             public:
                 QChart(QGraphicsObject* parent = 0);
                 ~QChart();
                 //from QGraphicsItem
                 QRectF boundingRect() const;
                 void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget){};
                 void addSeries(QChartSeries* series);
                 //TODO: QChartSeries* createSeries(QSeriesData *data, QChartSeries::QChartSeriesType type);
                 // TODO: who owns the series now? maybe owned by chart and returned a reference instead...
                 QChartSeries* createSeries(QChartSeries::QChartSeriesType type);
                 void setSize(const QSize& size);
                 void setMargin(int margin);
                 int margin() const;
                 void setTheme(QChart::ChartThemeId theme);
                 void setTitle(const QString& title,const QFont& font = QFont());
                 void setBackground(const QColor& startColor, const QColor& endColor = Qt::white, GradientOrientation orientation = VerticalGradientOrientation);
                 void zoomInToRect(const QRect& rectangle);
                 void zoomIn();
                 void zoomOut();
+                void zoomReset();
                 void setAxisX(const QChartAxis& axis);
                 void setAxisY(const QChartAxis& axis);
                 void setAxisY(const QList<QChartAxis>& axis);
             private:
                 void setAxis(AxisItem *item, const QChartAxis& axis);
             signals:
                 //TODO chage to const QSize& size
                 void sizeChanged(QRectF rect);
                 void scaleChanged(qreal xscale, qreal yscale);
             private:
                 QColor nextColor();
                 Q_DISABLE_COPY(QChart)
                 QGraphicsRectItem* m_backgroundItem;
                 QLinearGradient m_backgroundGradient;
                 GradientOrientation m_bacgroundOrinetation;
                 QGraphicsTextItem* m_titleItem;
                 AxisItem* m_axisXItem;
                 QList<AxisItem*> m_axisYItem;
                 QRect m_rect;
                 QList<QChartSeries*> m_chartSeries;
                 QVector<PlotDomain> m_plotDomainList;
                 QList<ChartItem*> m_chartItems;
                 int m_plotDataIndex;
                 int m_marginSize;
                 QList<QColor> m_themeColors;
             };
             QTCOMMERCIALCHART_END_NAMESPACE
             #endif

src/qchartwidget.cpp +9 -8

             #include "qchartwidget.h"
             #include "qchartseries.h"
             #include <QGraphicsView>
             #include <QGraphicsScene>
             #include <QResizeEvent>
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
             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();
                 setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
                 setVerticalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
                 setScene(m_scene);
                 m_chart = new QChart();
                 m_scene->addItem(m_chart);
                 m_rubberBand.setEnabled(true); // TODO: should zoom be enabled by default?
                 show();
             }
             QChartWidget::~QChartWidget()
             {
             }
             void QChartWidget::resizeEvent(QResizeEvent *event)
             {
                 m_scene->setSceneRect(0,0,size().width(),size().height());
                 m_chart->setSize(size());
                 QWidget::resizeEvent(event);
             }
             QSize QChartWidget::sizeHint() const
             {
                 // TODO: calculate size hint based on contents?
                 return QSize(100, 100);
             }
             void QChartWidget::mousePressEvent(QMouseEvent *event)
             {
                 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)
             {
                 if (event->button() == Qt::LeftButton && m_rubberBand.isVisible()) {
                     m_rubberBand.hide();
                     QRect rect = m_rubberBand.geometry();
                     m_chart->zoomInToRect(rect);
                     event->accept();
                 }
-                if(event->button()==Qt::RightButton) {
+                if(event->button()==Qt::RightButton)
-                    m_chart->zoomOut();
+                    m_chart->zoomReset();
             }
             void QChartWidget::addSeries(QChartSeries* series)
             {
                 m_chart->addSeries(series);
             }
             QChartSeries* QChartWidget::createSeries(QChartSeries::QChartSeriesType type)
             {
                 return m_chart->createSeries(type);
             }
             void QChartWidget::setTheme(QChart::ChartThemeId theme)
             {
                 m_chart->setTheme(theme);
             }
             void QChartWidget::setZoomEnabled(bool enabled)
             {
                 m_rubberBand.setEnabled(enabled);
             }
             #include "moc_qchartwidget.cpp"
             QTCOMMERCIALCHART_END_NAMESPACE

src/qchartwidget.h +1 -1

             #ifndef QCHARTWIDGET_H
             #define QCHARTWIDGET_H
             #include "qchartglobal.h"
             #include "qchart.h"
             #include <QGraphicsView>
             #include <QRubberBand>
             class QGraphicsScene;
             class QRubberBand;
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
             class QChartSeries;
             class QChartWidgetPrivate;
             class QTCOMMERCIALCHART_EXPORT QChartWidget : public QGraphicsView
             {
                 Q_OBJECT
             public:
                 explicit QChartWidget(QWidget *parent = 0);
                 ~QChartWidget();
                 // TODO: addSeries and createSeries are optional solutions
                 // TODO: currently createSeries assumes x, y value pairs. This isn't case with all charts. So is there another createSeries for other types (for example one list of ints)?
             public Q_SLOTS:
                 void addSeries(QChartSeries* series);
                 QChartSeries* createSeries(QChartSeries::QChartSeriesType type);
                 /*!
                  * Set color theme for the chart. Themes define harmonic colors for the graphical elements of
                  * the chart.
                  */
                 void setTheme(QChart::ChartThemeId theme);
                 void setZoomEnabled(bool enabled);
             private: // From QWidget TODO: should these be protected instead? Is QChartWidget meant to be extened by the user?
                 void resizeEvent(QResizeEvent *event);
                 QSize sizeHint() const;
                 void mousePressEvent(QMouseEvent *event);
                 void mouseMoveEvent(QMouseEvent *event);
                 void mouseReleaseEvent(QMouseEvent *event);
             private:
                 Q_DISABLE_COPY(QChartWidget)
                 // TODO: move the following to pimpl
                 QGraphicsScene *m_scene;
                 QChart* m_chart;
                 QRubberBand m_rubberBand;
-                QPoint m_origin;
+                int m_originX;
             };
             QTCOMMERCIALCHART_END_NAMESPACE
             #endif // QCHARTWIDGET_H

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