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

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

src/qchartwidget.cpp +2 0

                 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();

src/qscatterseries.cpp +35 -20

             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();
+                    qreal scaley = m_boundingRect.height() / m_visibleChartArea.spanY();
                     m_scenex.clear();
                     m_sceney.clear();
                     // Convert relative coordinates to absolute pixel coordinates that can be used for drawing
                     foreach(qreal x, m_x)
-                    m_scenex.append(rect.left() + x * scalex - m_visibleChartArea.m_minX * scalex);
+                        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);
+                        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)
             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*/)
             {
             }
-            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;
             }

src/qscatterseries_p.h +2 -3

                 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;

test/chartwidgettest/mainwidget.cpp +5 -3

             {
                 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

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