HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/qtcharts Commit - r111:0d50fe03d2e8

Scaling for scatter series

Tero Ahola -

r111:0d50fe03d2e8

parent child

Context file:

r111:0d50fe03d2e8

Collapse all files

src/qchart.cpp +15 -25

             #include "qchart.h"
             #include "qchartseries.h"
             #include "qscatterseries.h"
             #include "qscatterseries_p.h"
             #include "qpieseries.h"
             #include "qpieseries_p.h"
             #include "qxychartseries.h"
             #include "qchartaxis.h"
             #include "barchartseries.h"
             #include "bargroup.h"
             #include "stackedbarchartseries.h"
             #include "stackedbargroup.h"
             #include "percentbarchartseries.h"
             #include "percentbargroup.h"
             #include "charttheme_p.h"
             #include "chartitem_p.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),
                 m_chartTheme(new ChartTheme(this))
             {
                 // 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;
+                m_plotDataIndex = 0 ;
+                m_plotDomainList.resize(1);
+                PlotDomain& domain = m_plotDomainList[m_plotDataIndex];
                 switch(series->type())
                 {
                 case QChartSeries::SeriesTypeLine: {
                     QXYChartSeries* xyseries = static_cast<QXYChartSeries*>(series);
-                    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;
                     // TODO:
                     //m_chartTheme->addObserver(xyseries);
                     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);
-                    // TODO: setting of domain should this be somewhere else.
-                    m_plotDataIndex = 0 ;
-                    m_plotDomainList.resize(1);
                     qreal x = barSeries->countColumns();
                     qreal y = barSeries->max();
-                    PlotDomain& domain = m_plotDomainList[m_plotDataIndex];
                     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);
                     break;
                     }
                 case QChartSeries::SeriesTypeStackedBar: {
                     qDebug() << "barSeries added";
                     StackedBarChartSeries* stackedBarSeries = static_cast<StackedBarChartSeries*>(series);
                     StackedBarGroup* stackedBarGroup = new StackedBarGroup(*stackedBarSeries,this);
                     // Add some fugly colors for 5 fist series...
                     stackedBarGroup->addColor(QColor(255,0,0,128));
                     stackedBarGroup->addColor(QColor(255,255,0,128));
                     stackedBarGroup->addColor(QColor(0,255,0,128));
                     stackedBarGroup->addColor(QColor(0,0,255,128));
                     stackedBarGroup->addColor(QColor(255,128,0,128));
                     m_chartItems << stackedBarGroup;
                     childItems().append(stackedBarGroup);
-                    // TODO: setting of domain should this be somewhere else.
-                    m_plotDataIndex = 0 ;
-                    m_plotDomainList.resize(1);
                     qreal x = stackedBarSeries->countColumns();
                     qreal y = stackedBarSeries->maxColumnSum();
-                    PlotDomain& domain = m_plotDomainList[m_plotDataIndex];
                     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);
                     break;
                     }
                 case QChartSeries::SeriesTypePercentBar: {
                     qDebug() << "barSeries added";
                     PercentBarChartSeries* percentBarSeries = static_cast<PercentBarChartSeries*>(series);
                     PercentBarGroup* percentBarGroup = new PercentBarGroup(*percentBarSeries,this);
                     // Add some fugly colors for 5 fist series...
                     percentBarGroup->addColor(QColor(255,0,0,128));
                     percentBarGroup->addColor(QColor(255,255,0,128));
                     percentBarGroup->addColor(QColor(0,255,0,128));
                     percentBarGroup->addColor(QColor(0,0,255,128));
                     percentBarGroup->addColor(QColor(255,128,0,128));
                     m_chartItems << percentBarGroup;
                     childItems().append(percentBarGroup);
-                    // TODO: setting of domain should this be somewhere else.
-                    m_plotDataIndex = 0 ;
-                    m_plotDomainList.resize(1);
                     qreal x = percentBarSeries->countColumns();
-                    PlotDomain& domain = m_plotDomainList[m_plotDataIndex];
                     domain.m_minX = qMin(domain.m_minX,x);
                     domain.m_minY = 0;
                     domain.m_maxX = qMax(domain.m_maxX,x);
                     domain.m_maxY = 100;
                     break;
                     }
                 case QChartSeries::SeriesTypeScatter: {
                     QScatterSeries *scatterSeries = qobject_cast<QScatterSeries *>(series);
                     scatterSeries->d->m_theme = m_chartTheme->themeForSeries();
                     scatterSeries->d->setParentItem(this);
+                    scatterSeries->d->m_boundingRect = m_rect.adjusted(margin(),margin(), -margin(), -margin());
                     m_chartItems << scatterSeries->d;
                     m_chartTheme->addObserver(scatterSeries->d);
+                    foreach (qreal x, scatterSeries->d->m_x) {
+                        domain.m_minX = qMin(domain.m_minX, x);
+                        domain.m_maxX = qMax(domain.m_maxX, x);
+                    }
+                    foreach (qreal y, scatterSeries->d->m_y) {
+                        domain.m_minY = qMin(domain.m_minY, y);
+                        domain.m_maxY = qMax(domain.m_maxY, y);
+                    }
                     break;
                     }
                 case QChartSeries::SeriesTypePie: {
                     QPieSeries *pieSeries = qobject_cast<QPieSeries *>(series);
                     pieSeries->d->setParentItem(this);
                     m_chartItems << pieSeries->d;
                     pieSeries->d->m_chartTheme = m_chartTheme;
                     m_chartTheme->addObserver(pieSeries->d);
                     break;
                     }
                 }
                 // Update all the items to match the new visible area of the chart
                 foreach(ChartItem* i, m_chartItems)
                     i->setPlotDomain(m_plotDomainList.at(m_plotDataIndex));
             }
             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::SeriesTypeStackedBar: {
                     series = new StackedBarChartSeries(this);
                     break;
                 }
                 case QChartSeries::SeriesTypePercentBar: {
                     series = new PercentBarChartSeries(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());
                 // recalculate title position
                 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 and reposition childs
                 foreach (ChartItem *item, m_chartItems) {
                     item->setPos(rect.topLeft());
                     item->setSize(rect.size());
                 }
                 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)
             {
                 m_chartTheme->setTheme(theme);
                 setBackground(m_chartTheme->d->m_gradientStartColor,
                               m_chartTheme->d->m_gradientEndColor,
                               m_bacgroundOrinetation);
                 // TODO: Move the controlling of the series presentations into private implementation of the
                 // series instead of QChart controlling themes for each
                 // In other words, the following should be used when creating xy series:
                 // m_chartTheme->addObserver(xyseries)
                 foreach (QChartSeries *series, m_chartSeries) {
                     if (series->type() == QChartSeries::SeriesTypeLine) {
                         QXYChartSeries *xyseries = static_cast<QXYChartSeries *>(series);
                         SeriesTheme seriesTheme = m_chartTheme->themeForSeries();
                         xyseries->setPen(seriesTheme.linePen);
                     }
                 }
                 update();
             }
             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/qchartwidget.cpp +2 0

             #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_originX(0)
             {
                 setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding);
                 m_scene = new QGraphicsScene();
                 setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
                 setVerticalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
                 setScene(m_scene);
                 m_chart = new QChart();
+                // TODO: currently setting the margins explicitly is required, if you wish to have axis labels visible
+                m_chart->setMargin(25);
                 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);
                     if (rect.contains(event->pos())) {
                         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_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)
                     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/qscatterseries.cpp +42 -27

             #include "qscatterseries.h"
             #include "qscatterseries_p.h"
             #include "qchart.h"
             #include <QPainter>
             #include <QGraphicsScene>
             #include <QDebug>
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
             //#define QSeriesData QList<qreal>
             QScatterSeriesPrivate::QScatterSeriesPrivate(QGraphicsItem *parent) :
                 ChartItem(parent),
                 m_markerColor(QColor()),
-                m_visibleChartArea()
+                m_visibleChartArea(),
+                m_boundingRect()
             {
+                if (parent)
+                    m_boundingRect = parent->boundingRect();
             }
-            void QScatterSeriesPrivate::resize(QRectF rect)
+            void QScatterSeriesPrivate::changeGeometry()
             {
-                qreal scalex = rect.width() / m_visibleChartArea.spanX();
+                if (m_boundingRect.isValid()) {
-                qreal scaley = rect.height() / m_visibleChartArea.spanY();
+                    prepareGeometryChange();
+                    qreal scalex = m_boundingRect.width() / m_visibleChartArea.spanX();
-                m_scenex.clear();
+                    qreal scaley = m_boundingRect.height() / m_visibleChartArea.spanY();
-                m_sceney.clear();
+                    m_scenex.clear();
+                    m_sceney.clear();
-                // Convert relative coordinates to absolute pixel coordinates that can be used for drawing
-                foreach(qreal x, m_x)
+                    // Convert relative coordinates to absolute pixel coordinates that can be used for drawing
-                    m_scenex.append(rect.left() + x * scalex - m_visibleChartArea.m_minX * scalex);
+                    foreach(qreal x, m_x)
+                        m_scenex.append(m_boundingRect.left() + x * scalex - m_visibleChartArea.m_minX * scalex);
-                foreach(qreal y, m_y)
-                    m_sceney.append(rect.bottom() - y * scaley - m_visibleChartArea.m_minY * scaley);
+                    foreach(qreal y, m_y)
+                        m_sceney.append(m_boundingRect.bottom() - y * scaley + m_visibleChartArea.m_minY * scaley);
+                }
             }
             void QScatterSeriesPrivate::setSize(const QSize &size)
             {
-                QGraphicsItem *parent = this->parentItem();
+            //    m_boundingRect = QRectF(pos().x(), pos().y(), size.width(), size.height());
-                if (parent)
+                m_boundingRect = QRectF(0, 0, size.width(), size.height());
-                    resize(QRectF(parent->pos(), size));
+                changeGeometry();
             }
             void QScatterSeriesPrivate::themeChanged(ChartTheme *theme)
             {
                 m_theme = theme->themeForSeries();
             }
             void QScatterSeriesPrivate::setPlotDomain(const PlotDomain& plotDomain)
             {
                 m_visibleChartArea = plotDomain;
-                resize(parentItem()->boundingRect());
+                changeGeometry();
             }
             QRectF QScatterSeriesPrivate::boundingRect() const
             {
-                return QRectF(0, 0, 55, 100);
+                return m_boundingRect;
             }
             void QScatterSeriesPrivate::paint(QPainter *painter, const QStyleOptionGraphicsItem */*option*/, QWidget */*widget*/)
             {
                 // TODO: The opacity should be user definable?
                 //brush.setColor(QColor(255, 82, 0, 100));
                 if (m_markerColor.isValid()) {
                     QPen pen = painter->pen();
                     QBrush brush = pen.brush();
                     brush.setColor(m_markerColor);
                     pen.setBrush(brush);
                     pen.setWidth(4);
                     painter->setPen(pen);
                 }
                 else
                     painter->setPen(m_theme.markerPen);
             //        brush.setColor(m_theme..lineColor);
                 // TODO: m_scenex and m_sceny are left empty during construction -> we would need a resize
                 // event right after construction or maybe given a size during initialization
                 for (int i(0); i < m_scenex.count() && i < m_sceney.count(); i++) {
                     if (scene()->width() > m_scenex.at(i) && scene()->height() > m_sceney.at(i))
                         //painter->drawArc(m_scenex.at(i), m_sceney.at(i), 2, 2, 0, 5760);
                         painter->drawPoint(m_scenex.at(i), m_sceney.at(i));
                 }
             }
             QScatterSeries::QScatterSeries(QObject *parent) :
                 QChartSeries(parent),
                 d(new QScatterSeriesPrivate(qobject_cast<QGraphicsItem *> (parent)))
             {
             }
-            bool QScatterSeries::setData(QList<qreal> x, QList<qreal> y)
+            bool QScatterSeries::setData(QList<qreal> xlist, QList<qreal> ylist)
             {
                 // TODO: validate data
-                d->m_x = x;
+                d->m_x = xlist;
-                d->m_y = y;
+                d->m_y = ylist;
-                QGraphicsItem *parentItem = qobject_cast<QGraphicsItem *>(parent());
-                Q_ASSERT(parentItem);
+                // TODO: the following updates the visible chart area setting of the series, we would instead
-            //    d->setPos(parentItem->pos());
+                // need to update the _chart's_ visible area... this would require a callback or
-            //    d->setSize(parentItem->boundingRect().size().toSize());
+                // similar to the parenting QChart object...
-                d->resize(parentItem->boundingRect());
+                foreach (qreal x, d->m_x) {
+                    d->m_visibleChartArea.m_minX = qMin(d->m_visibleChartArea.m_minX, x);
+                    d->m_visibleChartArea.m_maxX = qMax(d->m_visibleChartArea.m_maxX, x);
+                }
+                foreach (qreal y, d->m_y) {
+                    d->m_visibleChartArea.m_minY = qMin(d->m_visibleChartArea.m_minY, y);
+                    d->m_visibleChartArea.m_maxY = qMax(d->m_visibleChartArea.m_maxY, y);
+                }
+                d->changeGeometry();
                 return true;
             }
             void QScatterSeries::setMarkerColor(QColor color)
             {
                 d->m_markerColor = color;
             }
             QColor QScatterSeries::markerColor()
             {
                 return d->m_markerColor;
             }
             // TODO:
             //void QScatterSeries::chartScaleChanged(qreal xscale, qreal yscale)
             //{
             //    d->rescale(xscale, yscale);
             //}
             QScatterSeries::~QScatterSeries()
             {
                 delete d;
             }
             #include "moc_qscatterseries.cpp"
             QTCOMMERCIALCHART_END_NAMESPACE

src/qscatterseries_p.h +2 -3

             #ifndef QSCATTERSERIESPRIVATE_H
             #define QSCATTERSERIESPRIVATE_H
             #include "qchartseries.h"
             #include "charttheme_p.h"
             #include "chartitem_p.h"
             #include "plotdomain_p.h"
             #include <QGraphicsItem>
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
             /*!
              * The PIMPL class of QScatterSeries.
              */
             class QScatterSeriesPrivate : public ChartItem, public ChartThemeObserver
             {
             public:
                 QScatterSeriesPrivate(QGraphicsItem *parent);
             public: // from ChartObjectInterface
                 void setSize(const QSize &size);
                 void setPlotDomain(const PlotDomain& data);
             public: // from ChartThemeObserver
                 void themeChanged(ChartTheme *theme);
             public: // from QGraphicsItem
                 QRectF boundingRect() const;
                 void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget);
             public:
-                void resize(QRectF rect); // TODO: replace with setSize
+                void changeGeometry();
+                QRectF m_boundingRect;
                 // TODO: use the chart data class instead of list of x and y values?
                 QList<qreal> m_x;
                 QList<qreal> m_y;
-                qreal m_scalex;
-                qreal m_scaley;
                 QList<qreal> m_scenex;
                 QList<qreal> m_sceney;
                 QColor m_markerColor;
                 SeriesTheme m_theme;
                 PlotDomain m_visibleChartArea;
             };
             QTCOMMERCIALCHART_END_NAMESPACE
             #endif // QSCATTERSERIESPRIVATE_H

test/chartwidgettest/mainwidget.cpp +5 -3

             #include "mainwidget.h"
             #include "dataseriedialog.h"
             #include "qchartseries.h"
             #include "qpieseries.h"
             #include <qxychartseries.h>
             #include <barchartseries.h>
             #include <QPushButton>
             #include <QComboBox>
             #include <QSpinBox>
             #include <QCheckBox>
             #include <QGridLayout>
             #include <QHBoxLayout>
             #include <QLabel>
             #include <QSpacerItem>
             #include <QMessageBox>
             #include <cmath>
             #include <QDebug>
             #include <QStandardItemModel>
             QTCOMMERCIALCHART_USE_NAMESPACE
             MainWidget::MainWidget(QWidget *parent) :
                 QWidget(parent)
             {
                 m_chartWidget = new QChartWidget(this);
-                // GridLayout for the controls for configuring the chart widget
+                // Grid layout for the controls for configuring the chart widget
                 QGridLayout *grid = new QGridLayout();
-                QGridLayout *mainLayout = new QGridLayout();
                 QPushButton *addSeriesButton = new QPushButton("Add series");
                 connect(addSeriesButton, SIGNAL(clicked()), this, SLOT(addSeries()));
                 grid->addWidget(addSeriesButton, 0, 1);
                 initBackroundCombo(grid);
                 initScaleControls(grid);
                 initThemeCombo(grid);
-                QCheckBox *zoomCheckBox = new QCheckBox("Zoom enabled");
+                QCheckBox *zoomCheckBox = new QCheckBox("Drag'n drop Zoom");
                 connect(zoomCheckBox, SIGNAL(toggled(bool)), m_chartWidget, SLOT(setZoomEnabled(bool)));
                 zoomCheckBox->setChecked(true);
                 grid->addWidget(zoomCheckBox, grid->rowCount(), 0);
                 // add row with empty label to make all the other rows static
                 grid->addWidget(new QLabel(""), grid->rowCount(), 0);
                 grid->setRowStretch(grid->rowCount() - 1, 1);
+                // Another grid layout as a main layout
+                QGridLayout *mainLayout = new QGridLayout();
                 mainLayout->addLayout(grid, 0, 0);
                 // Init series type specific controls
                 initPieControls();
                 mainLayout->addLayout(m_pieLayout, 2, 0);
                 // Scatter series specific settings
             //    m_scatterLayout = new QGridLayout();
             //    m_scatterLayout->addWidget(new QLabel("scatter"), 0, 0);
             //    m_scatterLayout->setEnabled(false);
             //    mainLayout->addLayout(m_scatterLayout, 1, 0);
                 // Add layouts and the chart widget to the main layout
                 mainLayout->addWidget(m_chartWidget, 0, 1, 3, 1);
                 setLayout(mainLayout);
                 // force an update to test data
                 testDataChanged(0);
             }
             // Combo box for selecting the chart's background
             void MainWidget::initBackroundCombo(QGridLayout *grid)
             {
                 QComboBox *backgroundCombo = new QComboBox(this);
                 backgroundCombo->addItem("Color");
                 backgroundCombo->addItem("Gradient");
                 backgroundCombo->addItem("Image");
                 connect(backgroundCombo, SIGNAL(currentIndexChanged(int)),
                         this, SLOT(backgroundChanged(int)));
                 grid->addWidget(new QLabel("Background:"), grid->rowCount(), 0);
                 grid->addWidget(backgroundCombo, grid->rowCount() - 1, 1);
             }
             // Scale related controls (auto-scale vs. manual min-max values)
             void MainWidget::initScaleControls(QGridLayout *grid)
             {
                 m_autoScaleCheck = new QCheckBox("Automatic scaling");
                 connect(m_autoScaleCheck, SIGNAL(stateChanged(int)), this, SLOT(autoScaleChanged(int)));
                 // Allow setting also non-sense values (like -2147483648 and 2147483647)
                 m_xMinSpin = new QSpinBox();
                 m_xMinSpin->setMinimum(INT_MIN);
                 m_xMinSpin->setMaximum(INT_MAX);
                 m_xMinSpin->setValue(0);
                 connect(m_xMinSpin, SIGNAL(valueChanged(int)), this, SLOT(xMinChanged(int)));
                 m_xMaxSpin = new QSpinBox();
                 m_xMaxSpin->setMinimum(INT_MIN);
                 m_xMaxSpin->setMaximum(INT_MAX);
                 m_xMaxSpin->setValue(10);
                 connect(m_xMaxSpin, SIGNAL(valueChanged(int)), this, SLOT(xMaxChanged(int)));
                 m_yMinSpin = new QSpinBox();
                 m_yMinSpin->setMinimum(INT_MIN);
                 m_yMinSpin->setMaximum(INT_MAX);
                 m_yMinSpin->setValue(0);
                 connect(m_yMinSpin, SIGNAL(valueChanged(int)), this, SLOT(yMinChanged(int)));
                 m_yMaxSpin = new QSpinBox();
                 m_yMaxSpin->setMinimum(INT_MIN);
                 m_yMaxSpin->setMaximum(INT_MAX);
                 m_yMaxSpin->setValue(10);
                 connect(m_yMaxSpin, SIGNAL(valueChanged(int)), this, SLOT(yMaxChanged(int)));
                 grid->addWidget(m_autoScaleCheck, grid->rowCount(), 0);
                 grid->addWidget(new QLabel("x min:"), grid->rowCount(), 0);
                 grid->addWidget(m_xMinSpin, grid->rowCount() - 1, 1);
                 grid->addWidget(new QLabel("x max:"), grid->rowCount(), 0);
                 grid->addWidget(m_xMaxSpin, grid->rowCount() - 1, 1);
                 grid->addWidget(new QLabel("y min:"), grid->rowCount(), 0);
                 grid->addWidget(m_yMinSpin, grid->rowCount() - 1, 1);
                 grid->addWidget(new QLabel("y max:"), grid->rowCount(), 0);
                 grid->addWidget(m_yMaxSpin, grid->rowCount() - 1, 1);
                 m_autoScaleCheck->setChecked(true);
             }
             // Combo box for selecting theme
             void MainWidget::initThemeCombo(QGridLayout *grid)
             {
                 QComboBox *chartTheme = new QComboBox();
                 chartTheme->addItem("Default");
                 chartTheme->addItem("Vanilla");
                 chartTheme->addItem("Icy");
                 chartTheme->addItem("Grayscale");
                 chartTheme->addItem("Unnamed1");
                 connect(chartTheme, SIGNAL(currentIndexChanged(int)),
                         this, SLOT(changeChartTheme(int)));
                 grid->addWidget(new QLabel("Chart theme:"), 8, 0);
                 grid->addWidget(chartTheme, 8, 1);
             }
             void MainWidget::initPieControls()
             {
                 // Pie series specific settings
                 // Pie size factory
                 QDoubleSpinBox *pieSizeSpin = new QDoubleSpinBox();
                 pieSizeSpin->setMinimum(LONG_MIN);
                 pieSizeSpin->setMaximum(LONG_MAX);
                 pieSizeSpin->setValue(1.0);
                 pieSizeSpin->setSingleStep(0.1);
                 connect(pieSizeSpin, SIGNAL(valueChanged(double)), this, SLOT(setPieSizeFactor(double)));
                 // Pie position
                 QComboBox *piePosCombo = new QComboBox(this);
                 piePosCombo->addItem("Maximized");
                 piePosCombo->addItem("Top left");
                 piePosCombo->addItem("Top right");
                 piePosCombo->addItem("Bottom left");
                 piePosCombo->addItem("Bottom right");
                 connect(piePosCombo, SIGNAL(currentIndexChanged(int)),
                         this, SLOT(setPiePosition(int)));
                 m_pieLayout = new QGridLayout();
                 m_pieLayout->setEnabled(false);
                 m_pieLayout->addWidget(new QLabel("Pie size factor"), 0, 0);
                 m_pieLayout->addWidget(pieSizeSpin, 0, 1);
                 m_pieLayout->addWidget(new QLabel("Pie position"), 1, 0);
                 m_pieLayout->addWidget(piePosCombo, 1, 1);
             }
             void MainWidget::addSeries()
             {
                 DataSerieDialog dialog(m_defaultSeriesName, this);
                 connect(&dialog, SIGNAL(accepted(QString, QString)), this, SLOT(addSeries(QString, QString)));
                 dialog.exec();
             }
             void MainWidget::addSeries(QString series, QString data)
             {
                 qDebug() << "addSeries: " << series << " data: " << data;
                 m_defaultSeriesName = series;
                 // TODO: a dedicated data class for storing x and y values
                 QList<qreal> x;
                 QList<qreal> y;
                 if (data == "linear") {
                     for (int i = 0; i < 20; i++) {
                         x.append(i);
                         y.append(i);
                     }
                 } else if (data == "linear, 1M") {
                     // 1 million data points from 0.0001 to 100
                     // TODO: What is the requirement? Should we be able to show this kind of data with
                     // reasonable performance, or can we expect the application developer to do "data mining"
                     // for us, so that the count of data points given to QtCommercial Chart is always
                     // reasonable?
                     for (qreal i = 0; i < 100; i += 0.0001) {
                         x.append(i);
                         y.append(20);
                     }
                 } else if (data == "SIN") {
                     for (int i = 0; i < 100; i++) {
                         x.append(i);
                         y.append(abs(sin(3.14159265358979 / 50 * i) * 100));
                     }
                 } else if (data == "SIN + random") {
                     for (qreal i = 0; i < 100; i += 0.1) {
                         x.append(i + (rand() % 5));
                         y.append(abs(sin(3.14159265358979 / 50 * i) * 100) + (rand() % 5));
                     }
                 } else {
                     // TODO: check if data has a valid file name
                     Q_ASSERT(false);
                 }
                 // TODO: color of the series
                 QChartSeries *newSeries = 0;
                 if (series == "Scatter") {
                     newSeries = m_chartWidget->createSeries(QChartSeries::SeriesTypeScatter);
                     Q_ASSERT(newSeries->setData(x, y));
                 } else if (series == "Pie") {
                     newSeries = m_chartWidget->createSeries(QChartSeries::SeriesTypePie);
                     Q_ASSERT(newSeries->setData(y));
                 } else if (series == "Line") {
                     // TODO: adding data to an existing line series does not give any visuals for some reason
             //        newSeries = m_chartWidget->createSeries(QChartSeries::SeriesTypeLine);
             //        QXYChartSeries *lineSeries = static_cast<QXYChartSeries *>(newSeries);
             //        lineSeries->setColor(Qt::blue);
             //        for (int i(0); i < x.count() && i < y.count(); i++) {
             //            lineSeries->add(x.at(i), y.at(i));
             //        }
                     //Q_ASSERT(newSeries->setData(x, y));
                     QXYChartSeries* series0 = QXYChartSeries::create();
                     for (int i(0); i < x.count() && i < y.count(); i++)
                         series0->add(x.at(i), y.at(i));
                     m_chartWidget->addSeries(series0);
                     newSeries = series0;
                 } else {
                     // TODO
                 }
                 // BarChart
                 if (series == "Bar") {
                     // This is the another way of creating series. Should we create test cases for both ways, if we support them?
                     qDebug() << "Bar chart series";
                     newSeries = QChartSeries::create(QChartSeries::SeriesTypeBar, this);
                     // Create some test data to chart
                     QStandardItemModel dataModel(2,10,this);
                     QModelIndex index;
                     index = dataModel.index(0,0);
                     // Series 1, items 6 to 9 missing.
                     dataModel.setData(dataModel.index(0,0),1);
                     dataModel.setData(dataModel.index(0,1),12);
                     dataModel.setData(dataModel.index(0,2),5);
                     dataModel.setData(dataModel.index(0,3),8);
                     dataModel.setData(dataModel.index(0,4),17);
                     dataModel.setData(dataModel.index(0,5),9);
                     // Series 2, some other items missing
                     dataModel.setData(dataModel.index(1,0),5);
                     dataModel.setData(dataModel.index(1,3),4);
                     dataModel.setData(dataModel.index(1,5),7);
                     dataModel.setData(dataModel.index(1,6),8);
                     dataModel.setData(dataModel.index(1,8),9);
                     dataModel.setData(dataModel.index(1,9),9);
                     newSeries->setData(&dataModel);
                     m_chartWidget->addSeries(newSeries);
                 }
                 setCurrentSeries(newSeries);
             }
             void MainWidget::setCurrentSeries(QChartSeries *series)
             {
                 m_currentSeries = series;
                 switch (m_currentSeries->type()) {
                 case QChartSeries::SeriesTypeLine:
                     break;
                 case QChartSeries::SeriesTypeScatter:
                     break;
                 case QChartSeries::SeriesTypePie:
                     break;
                 case QChartSeries::SeriesTypeBar:
                     qDebug() << "setCurrentSeries (bar)";
                     break;
                 default:
                     Q_ASSERT(false);
                     break;
                 }
             }
             void MainWidget::testDataChanged(int itemIndex)
             {
                 qDebug() << "testDataChanged: " << itemIndex;
             //    switch (itemIndex) {
             //    case 0: {
             //        QList<QChartDataPoint> data;
             //        for (int x = 0; x < 20; x++) {
             //            data.append(QChartDataPoint() << x << x / 2);
             //        }
             //        m_chartWidget->setData(data);
             //        break;
             //    }
             //    case 1: {
             //        QList<QChartDataPoint> data;
             //        for (int x = 0; x < 100; x++) {
             //            data.append(QChartDataPoint() << x - 200 << 2 * (uint(sin(3.14159/50*x)*80) % 100));
             //        }
             //        m_chartWidget->setData(data);
             //        break;
             //    }
             //    case 2: {
             //        QList<QChartDataPoint> data;
             //        for (int x = 0; x < 1000; x++) {
             //            data.append(QChartDataPoint() << x - 200 << 2 * (uint(sin(3.14159/50*x)*80) % 100) + (rand() % 100 * 0.2));
             //            data.append(QChartDataPoint() << x - 200 << 2 * (uint(sin(3.14159/50*x)*80) % 100) + (rand() % 100 * 0.2));
             //            data.append(QChartDataPoint() << x - 200 << 2 * (uint(sin(3.14159/50*x)*80) % 100) + (rand() % 100 * 0.2));
             //        }
             //        m_chartWidget->setData(data);
             //        break;
             //    }
             //    default:
             //        break;
             //    }
             }
             void MainWidget::backgroundChanged(int itemIndex)
             {
                 qDebug() << "backgroundChanged: " << itemIndex;
             }
             void MainWidget::autoScaleChanged(int value)
             {
                 if (value) {
                     // TODO: enable auto scaling
                 } else {
                     // TODO: set scaling manually (and disable auto scaling)
                 }
                 m_xMinSpin->setEnabled(!value);
                 m_xMaxSpin->setEnabled(!value);
                 m_yMinSpin->setEnabled(!value);
                 m_yMaxSpin->setEnabled(!value);
             }
             void MainWidget::xMinChanged(int value)
             {
                 qDebug() << "xMinChanged: " << value;
             }
             void MainWidget::xMaxChanged(int value)
             {
                 qDebug() << "xMaxChanged: " << value;
             }
             void MainWidget::yMinChanged(int value)
             {
                 qDebug() << "yMinChanged: " << value;
             }
             void MainWidget::yMaxChanged(int value)
             {
                 qDebug() << "yMaxChanged: " << value;
             }
             void MainWidget::changeChartTheme(int themeIndex)
             {
                 qDebug() << "changeChartTheme: " << themeIndex;
                 m_chartWidget->setTheme((QChart::ChartThemeId) themeIndex);
             }
             void MainWidget::setPieSizeFactor(double size)
             {
                 QPieSeries *pie = qobject_cast<QPieSeries *>(m_currentSeries);
                 if (pie)
                     pie->setSizeFactor(qreal(size));
             }
             void MainWidget::setPiePosition(int position)
             {
                 QPieSeries *pie = qobject_cast<QPieSeries *>(m_currentSeries);
                 if (pie)
                     pie->setPosition((QPieSeries::PiePosition) position);
             }

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