HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/qtcharts Commit - r54:f2e3dfe7c506

Removed scale from chart's sizeChanged signals

Tero Ahola -

r54:f2e3dfe7c506

parent child

Context file:

r54:f2e3dfe7c506

Collapse all files

src/qchart.cpp +7 -8

             #include "qchart.h"
             #include "qchartseries.h"
             #include "qscatterseries.h"
             #include "qscatterseries_p.h"
             #include "qpieseries.h"
             #include "qxychartseries.h"
             #include "xylinechartitem_p.h"
             #include "xyplotdomain_p.h"
             #include "axis_p.h"
             #include "xygrid_p.h"
             #include <QGraphicsScene>
             #include <QDebug>
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
             QChart::QChart(QGraphicsObject* parent) : QGraphicsObject(parent),
             		m_axisX(new Axis(this)),
             		m_axisY(new Axis(this)),
             		m_grid(new XYGrid(this)),
             		m_plotDataIndex(0),
             		m_marginSize(0)
             {
                 //  setFlags(QGraphicsItem::ItemClipsChildrenToShape);
                 // set axis
                 m_axisY->rotate(90);
             }
             QChart::~QChart(){}
             QRectF QChart::boundingRect() const
             {
                 return m_rect;
             }
             void QChart::addSeries(QChartSeries* series)
             {
                 // TODO: we should check the series not already added
                 m_series<<series;
                 switch(series->type())
                 {
                 case QChartSeries::SeriesTypeLine: {
                     QXYChartSeries* xyseries = static_cast<QXYChartSeries*>(series);
                     XYPlotDomain domain;
                     //TODO "nice numbers algorithm"
                     domain.m_ticksX=4;
                     domain.m_ticksY=4;
                     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);
                     item->updateXYPlotDomain(domain);
                     m_plotDomainList<<domain;
                     m_xyLineChartItems<<item;
                     break;
                 }
                     // TODO: Not tested:
             //    case QChartSeries::SeriesTypeScatter: {
             //        QScatterSeries *scatter = qobject_cast<QScatterSeries *>(series);
             //        if (scatter) {
             //            scatter->d->setParentItem(this);
             //            scene()->addItem(scatter->d);
             //        }
             //        break;
             //    }
                 }
             }
             QChartSeries* QChart::createSeries(QList<qreal> x, QList<qreal> y, QChartSeries::QChartSeriesType type)
             {
                 // TODO: support also other types; not only scatter and pie
                 Q_ASSERT(type == QChartSeries::SeriesTypeScatter
                          || type == QChartSeries::SeriesTypePie);
                 switch (type) {
                 case QChartSeries::SeriesTypeScatter: {
                     QScatterSeries *scatterSeries = new QScatterSeries(x, y, this);
-                    connect(this, SIGNAL(sizeChanged(QRectF, qreal, qreal)),
+                    connect(this, SIGNAL(sizeChanged(QRectF)),
-                            scatterSeries, SLOT(chartSizeChanged(QRectF, qreal, qreal)));
+                            scatterSeries, SLOT(chartSizeChanged(QRectF)));
                     scatterSeries->d->setParentItem(this);
                     return scatterSeries;
                 }
                 case QChartSeries::SeriesTypePie: {
                     // TODO: we now have also a list of y values as a parameter, it is ignored
                     // we should use a generic data class instead of list of x and y values
                     QPieSeries *pieSeries = new QPieSeries(x, this);
-                    connect(this, SIGNAL(sizeChanged(QRectF, qreal, qreal)),
+                    connect(this, SIGNAL(sizeChanged(QRectF)),
-                            pieSeries, SLOT(chartSizeChanged(QRectF, qreal, qreal)));
+                            pieSeries, SLOT(chartSizeChanged(QRectF)));
                     return pieSeries;
                 }
                 default:
                     break;
                 }
                 return 0;
             }
             void QChart::setSize(const QSizeF& size)
             {
                 m_rect = QRect(QPoint(0,0),size.toSize());
                 m_rect.adjust(margin(),margin(), -margin(), -margin());
                 m_grid->setPos(m_rect.topLeft());
                 m_grid->setSize(m_rect.size());
-                // TODO: calculate the scale
+                // 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
-                const qreal xscale = size.width() / 100;
+                emit sizeChanged(QRectF(0, 0, size.width(), size.height()));
-                const qreal yscale = size.height() / 100;
-                emit sizeChanged(QRectF(0, 0, size.width(), size.height()), xscale, yscale);
                 for (int i(0); i < m_plotDomainList.size(); i++)
                     m_plotDomainList[i].m_viewportRect = m_rect;
                 // TODO: line chart items are updated separately as they don't support update
                 // via sizeChanged signal
                 foreach(XYLineChartItem* item ,m_xyLineChartItems)
                     item->updateXYPlotDomain(m_plotDomainList.at(m_plotDataIndex));
                 if (m_plotDomainList.count())
                     m_grid->setXYPlotData(m_plotDomainList.at(m_plotDataIndex));
                 update();
             }
             int QChart::margin() const
             {
                 return m_marginSize;
             }
             void QChart::setMargin(int margin)
             {
                 m_marginSize = margin;
             }
             #include "moc_qchart.cpp"
             QTCOMMERCIALCHART_END_NAMESPACE

src/qchart.h +2 -1

             #ifndef CHART_H
             #define CHART_H
             #include <qchartglobal.h>
             #include <qchartseries.h>
             #include <QGraphicsObject>
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
             class Axis;
             class XYGrid;
             class QChartSeries;
             class XYPlotDomain;
             class XYLineChartItem;
             // 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:
                 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(QList<qreal> x, QList<qreal> y, QChartSeries::QChartSeriesType type);
                 virtual void setSize(const QSizeF& rect);
                 void setMargin(int margin);
                 int margin() const;
             signals:
-                void sizeChanged(QRectF rect, qreal xscale, qreal yscale);
+                void sizeChanged(QRectF rect);
+                void scaleChanged(qreal xscale, qreal yscale);
             private:
                 Q_DISABLE_COPY(QChart)
                 Axis* m_axisX;
                 Axis* m_axisY;
                 XYGrid* m_grid;
                 QRect m_rect;
                 QList<const QChartSeries*> m_series;
                 QList<XYPlotDomain> m_plotDomainList;
                 QList<XYLineChartItem*> m_xyLineChartItems;
                 QList<QGraphicsItem*> m_items;
                 int m_plotDataIndex;
                 int m_marginSize;
             };
             QTCOMMERCIALCHART_END_NAMESPACE
             #endif

src/qpieseries.cpp +11 -11

             #include "qpieseries.h"
             #include "pieslice.h"
             #include <QGraphicsObject>
             #include <QDebug>
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
             QPieSeries::QPieSeries(QList<qreal> x, QGraphicsObject *parent) :
                 QChartSeries(parent),
                 m_x(x)
             {
+                // Create slices
-            QPieSeries::~QPieSeries()
-            void QPieSeries::chartSizeChanged(QRectF rect, qreal xscale, qreal yscale)
                 qreal fullPie = 360;
                 qreal total = 0;
                 foreach (qreal value, m_x)
                     total += value;
-                // We must have a parent for the graphics items we create
+                QGraphicsItem *parentItem = qobject_cast<QGraphicsItem *>(parent);
-                // TODO: maybe QChartSeries needs to be a QGraphicsObject to make this clear for the users?
-                QGraphicsItem *parentItem = qobject_cast<QGraphicsItem *>(parent());
                 Q_ASSERT(parentItem);
                 qreal angle = 0;
+                // TODO: no need to create new slices in case size changed; we should re-use the existing ones
                 foreach (qreal value, m_x) {
                     qreal span = value / total * fullPie;
                     PieSlice *slice = new PieSlice(randomColor(), angle, span);
                     slice->setParentItem(parentItem);
                     m_slices.append(slice);
                     angle += span;
                 }
             }
+            QPieSeries::~QPieSeries()
+            {
+            }
+            void QPieSeries::chartSizeChanged(QRectF /*rect*/)
+            {
+            }
             QColor QPieSeries::randomColor()
             {
                 QColor c;
                 c.setRed(qrand() % 255);
                 c.setGreen(qrand() % 255);
                 c.setBlue(qrand() % 255);
                 return c;
             }
             void QPieSeries::setData(QList<int> data)
             {
             }
             #include "moc_qpieseries.cpp"
             QTCOMMERCIALCHART_END_NAMESPACE

src/qpieseries.h +1 -1

             #ifndef PIESERIES_H
             #define PIESERIES_H
             #include "qchartseries.h"
             #include <QObject>
             #include <QRectF>
             #include <QColor>
             class QGraphicsObject;
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
             class PieSlice;
             class QTCOMMERCIALCHART_EXPORT QPieSeries : public QChartSeries
             {
                 Q_OBJECT
             public:
                 // TODO: use a generic data class instead of x and y
                 QPieSeries(QList<qreal> x, QGraphicsObject *parent = 0);
                 ~QPieSeries();
                 QColor randomColor();
                 void setData(QList<int> data);
             public: // from QChartSeries
                 QChartSeriesType type() const { return QChartSeries::SeriesTypePie; }
             public Q_SLOTS:
-                void chartSizeChanged(QRectF rect, qreal xscale, qreal yscale);
+                void chartSizeChanged(QRectF rect);
             private:
                 //Q_DECLARE_PRIVATE(QPieSeries)
                 Q_DISABLE_COPY(QPieSeries)
                 // TODO: move the followin to internal impl
                 QList<qreal> m_x;
                 QList<PieSlice*> m_slices;
                 QSizeF m_size;
             };
             QTCOMMERCIALCHART_END_NAMESPACE
             #endif // PIESERIES_H

src/qscatterseries.cpp +19 -7

             #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(QList<qreal> x, QList<qreal> y, QGraphicsItem *parent) :
                 QGraphicsItem(parent),
                 m_x(x),
-                m_y(y)
+                m_y(y),
+                m_scalex(100), // TODO: let the use define the scale (or autoscaled)
+                m_scaley(100)
             {
+                resize(parent->boundingRect());
             }
-            void QScatterSeriesPrivate::resize(QRectF rect, qreal xscale, qreal yscale)
+            void QScatterSeriesPrivate::resize(QRectF rect)
             {
                 m_scenex.clear();
                 m_sceney.clear();
                 foreach(qreal x, m_x)
-                    m_scenex.append(rect.left() + x * xscale);
+                    m_scenex.append(rect.left() + x * (rect.width() / m_scalex));
                 foreach(qreal y, m_y)
-                    m_sceney.append(rect.bottom() - y * yscale);
+                    m_sceney.append(rect.bottom() - y * (rect.height() / m_scaley));
             }
+            // TODO:
+            //void QScatterSeriesPrivate::setAxisScale(qreal xscale, qreal yscale)
             QRectF QScatterSeriesPrivate::boundingRect() const
             {
                 return QRectF(0, 0, 55, 100);
             }
             void QScatterSeriesPrivate::paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget)
             {
                 QPen pen = painter->pen();
                 QBrush brush = pen.brush();
                 // TODO: The opacity should be user definable...
-                brush.setColor(QColor(255, 82, 0, 50));
+                brush.setColor(QColor(255, 82, 0, 100));
                 pen.setBrush(brush);
                 pen.setWidth(4);
                 painter->setPen(pen);
                 // 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(QList<qreal> x, QList<qreal> y, QObject *parent) :
                 QChartSeries(parent),
                 d(new QScatterSeriesPrivate(x, y, qobject_cast<QGraphicsItem *> (parent)))
             {
             }
-            void QScatterSeries::chartSizeChanged(QRectF rect, qreal xscale, qreal yscale)
+            void QScatterSeries::chartSizeChanged(QRectF rect)
             {
                 // Recalculate scatter data point locations on the scene
             //    d->transform().reset();
             //    d->transform().translate();
-                d->resize(rect, xscale, yscale);
+                d->resize(rect);
             }
+            // 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.h +2 -1

             #ifndef QSCATTERSERIES_H
             #define QSCATTERSERIES_H
             #include "qchartseries.h"
             #include <QRectF>
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
             class QScatterSeriesPrivate;
             class QTCOMMERCIALCHART_EXPORT QScatterSeries : public QChartSeries
             {
                 Q_OBJECT
             public:
                 //QScatterSeries(QSeriesData *data, QObject *chart);
                 QScatterSeries(QList<qreal> x, QList<qreal> y, QObject *parent = 0);
                 ~QScatterSeries();
             public: // from QChartSeries
                 QChartSeriesType type() const { return QChartSeries::SeriesTypeScatter; }
             public Q_SLOTS:
-                void chartSizeChanged(QRectF rect, qreal xscale, qreal yscale);
+                void chartSizeChanged(QRectF rect);
+                //void chartScaleChanged(qreal xscale, qreal yscale);
             private:
                 Q_DECLARE_PRIVATE(QScatterSeries)
                 Q_DISABLE_COPY(QScatterSeries)
                 friend class QChart;
                 QScatterSeriesPrivate *const d;
             };
             QTCOMMERCIALCHART_END_NAMESPACE
             #endif // QSCATTERSERIES_H

src/qscatterseries_p.h +3 -1

             #ifndef QSCATTERSERIESPRIVATE_H
             #define QSCATTERSERIESPRIVATE_H
             #include "qchartseries.h"
             #include <QGraphicsItem>
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
             /*!
              * The PIMPL class of QScatterSeries.
              */
             class QScatterSeriesPrivate : public QGraphicsItem
             {
             public:
                 QScatterSeriesPrivate(QList<qreal> x, QList<qreal> y, QGraphicsItem *parent);
             public: // from QGraphicsItem
-                void resize(QRectF rect, qreal xscale, qreal yscale);
+                void resize(QRectF rect);
                 QRectF boundingRect() const;
                 void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget);
                 // 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;
             };
             QTCOMMERCIALCHART_END_NAMESPACE
             #endif // QSCATTERSERIES_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