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

                 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;
                 }
                     // 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:
                 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;

src/qchart.h +2 -1

                 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)

src/qpieseries.cpp +11 -11

                 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);
                 }
             }
+            QPieSeries::~QPieSeries()
+            {
+            }
+            void QPieSeries::chartSizeChanged(QRectF /*rect*/)
+            {
+            }
             QColor QPieSeries::randomColor()
             {
                 QColor c;

src/qpieseries.h +1 -1

                 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)

src/qscatterseries.cpp +19 -7

             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);
                 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);
             {
             }
-            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;

src/qscatterseries.h +2 -1

                 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)

src/qscatterseries_p.h +3 -1

                 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;
             };

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