HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/qtcharts Commit - r1577:779eeed6a402

Refactor QChart API...

Michal Klocek -

r1577:779eeed6a402

parent child

Context file:

r1577:779eeed6a402

Expand all files

demos/chartthemes/themewidget.cpp +3 -1

                     series->append(set);
                 }
                 chart->addSeries(series);
-                chart->setAxisX(series,axis);
+                chart->createDefaultAxes();
                 return chart;
             }
                     series->setName(name + QString::number(nameIndex));
                     nameIndex++;
                     chart->addSeries(series);
+                    chart->createDefaultAxes();
                 }
                 return chart;

examples/areachart/main.cpp +1 0

                 QChart* chart = new QChart();
                 chart->addSeries(series);
                 chart->setTitle("Simple areachart example");
+                chart->createDefaultAxes();
                 chart->axisX()->setRange(0, 20);
                 chart->axisY()->setRange(0, 10);
             //![4]

examples/barmodelmapper/tablewidget.cpp +1 -1

                 categories << "April" << "May" << "June" << "July" << "August";
                 QCategoriesAxis* axis = new QCategoriesAxis();
                 axis->append(categories);
-                chart->setAxisX(series,axis);
+                chart->createDefaultAxes();
                 //! [6]
                 //! [7]

examples/groupedbarchart/main.cpp +1 -1

                 categories << "Jan" << "Feb" << "Mar" << "Apr" << "May" << "Jun";
                 QCategoriesAxis* axis = new QCategoriesAxis();
                 axis->append(categories);
-                chart->setAxisX(series,axis);
+                chart->createDefaultAxes();
             //![4]
             //![5]

examples/linechart/main.cpp +2 0

                 QChart* chart = new QChart();
                 chart->legend()->hide();
                 chart->addSeries(series);
+                chart->createDefaultAxes();
                 chart->setTitle("Simple line chart example");
             //![3]
                 chartView->setRenderHint(QPainter::Antialiasing);
             //![4]
             //![5]
                 QMainWindow window;
                 window.setCentralWidget(chartView);

examples/percentbarchart/main.cpp +2 -1

                 categories << "Jan" << "Feb" << "Mar" << "Apr" << "May" << "Jun";
                 QCategoriesAxis* axis = new QCategoriesAxis();
                 axis->append(categories);
-                chart->setAxisX(series,axis);
+                chart->createDefaultAxes();
+                chart->setAxisX(axis,series);
             //![4]
             //![5]

examples/stackedbarchart/main.cpp +1 -4

                 categories << "Jan" << "Feb" << "Mar" << "Apr" << "May" << "Jun";
                 QCategoriesAxis* axis = new QCategoriesAxis();
                 axis->append(categories);
-                chart->setAxisX(series,axis);
+                chart->setAxisX(axis,series);
-            //    axis->setMinCategory(QString("Feb"));
-            //    axis->setMaxCategory(QString("May"));
-            //    axis->setRange(QString("Feb"), QString("Apr"));
             //![4]
             //![5]

examples/stackedbarchartdrilldown/drilldownchart.cpp +1 -1

                 addSeries(series);
-                setAxisX(series,axis);
+                createDefaultAxes();
                 setTitle(series->name());
             }

plugins/declarative/declarativeareaseries.cpp +2 -2

             void DeclarativeAreaSeries::setAxisX(QAbstractAxis *axis)
             {
-                chart()->setAxisX(this, axis);
+                chart()->setAxisX(axis,this);
             }
             QAbstractAxis *DeclarativeAreaSeries::axisX()
             void DeclarativeAreaSeries::setAxisY(QAbstractAxis *axis)
             {
-                chart()->setAxisY(this, axis);
+                chart()->setAxisY(axis,this);
             }
             QAbstractAxis *DeclarativeAreaSeries::axisY()

plugins/declarative/declarativebarseries.cpp +8 -8

             void DeclarativeBarSeries::setAxisX(QAbstractAxis *axis)
             {
-                chart()->setAxisX(this, axis);
+                chart()->setAxisX(axis, this);
             }
             QAbstractAxis *DeclarativeBarSeries::axisX()
             void DeclarativeBarSeries::setAxisY(QAbstractAxis *axis)
             {
-                chart()->setAxisY(this, axis);
+                chart()->setAxisY(axis, this);
             }
             QAbstractAxis *DeclarativeBarSeries::axisY()
             void DeclarativeGroupedBarSeries::setAxisX(QAbstractAxis *axis)
             {
-                chart()->setAxisX(this, axis);
+                chart()->setAxisX(axis, this);
             }
             QAbstractAxis *DeclarativeGroupedBarSeries::axisX()
             void DeclarativeGroupedBarSeries::setAxisY(QAbstractAxis *axis)
             {
-                chart()->setAxisY(this, axis);
+                chart()->setAxisY(axis, this);
             }
             QAbstractAxis *DeclarativeGroupedBarSeries::axisY()
             void DeclarativeStackedBarSeries::setAxisX(QAbstractAxis *axis)
             {
-                chart()->setAxisX(this, axis);
+                chart()->setAxisX(axis, this);
             }
             QAbstractAxis *DeclarativeStackedBarSeries::axisX()
             void DeclarativeStackedBarSeries::setAxisY(QAbstractAxis *axis)
             {
-                chart()->setAxisY(this, axis);
+                chart()->setAxisY(axis, this);
             }
             QAbstractAxis *DeclarativeStackedBarSeries::axisY()
             void DeclarativePercentBarSeries::setAxisX(QAbstractAxis *axis)
             {
-                chart()->setAxisX(this, axis);
+                chart()->setAxisX(axis, this);
             }
             QAbstractAxis *DeclarativePercentBarSeries::axisX()
             void DeclarativePercentBarSeries::setAxisY(QAbstractAxis *axis)
             {
-                chart()->setAxisY(this, axis);
+                chart()->setAxisY(axis, this);
             }
             QAbstractAxis *DeclarativePercentBarSeries::axisY()

plugins/declarative/declarativelineseries.cpp +2 -2

             void DeclarativeLineSeries::setAxisX(QAbstractAxis *axis)
             {
-                chart()->setAxisX(this, axis);
+                chart()->setAxisX(axis,this);
             }
             QAbstractAxis *DeclarativeLineSeries::axisX()
             void DeclarativeLineSeries::setAxisY(QAbstractAxis *axis)
             {
-                chart()->setAxisY(this, axis);
+                chart()->setAxisY(axis,this);
             }
             QAbstractAxis *DeclarativeLineSeries::axisY()

plugins/declarative/declarativescatterseries.cpp +2 -2

             void DeclarativeScatterSeries::setAxisX(QAbstractAxis *axis)
             {
-                chart()->setAxisX(this, axis);
+                chart()->setAxisX(axis,this);
             }
             QAbstractAxis *DeclarativeScatterSeries::axisX()
             void DeclarativeScatterSeries::setAxisY(QAbstractAxis *axis)
             {
-                chart()->setAxisY(this, axis);
+                chart()->setAxisY(axis,this);
             }
             QAbstractAxis *DeclarativeScatterSeries::axisY()

plugins/declarative/declarativesplineseries.cpp +2 -2

             void DeclarativeSplineSeries::setAxisX(QAbstractAxis *axis)
             {
-                chart()->setAxisX(this, axis);
+                chart()->setAxisX(axis,this);
             }
             QAbstractAxis *DeclarativeSplineSeries::axisX()
             void DeclarativeSplineSeries::setAxisY(QAbstractAxis *axis)
             {
-                chart()->setAxisY(this, axis);
+                chart()->setAxisY(axis,this);
             }
             QAbstractAxis *DeclarativeSplineSeries::axisY()

src/axis/chartaxis.cpp +36 -16

@@ -25,7 +25,7
25	#include "chartanimator_p.h"	25	#include "chartanimator_p.h"
26	#include <QPainter>	26	#include <QPainter>
27	#include <QDebug>	27	#include <QDebug>
28	#include <~~cmat~~h>	28	#include <qmath.h>
29		29
30	QTCOMMERCIALCHART_BEGIN_NAMESPACE	30	QTCOMMERCIALCHART_BEGIN_NAMESPACE
31		31
@@ -143,21 +143,6 void ChartAxis::updateLayout(QVector<qreal> &layout)
143	}	143	}
144	}	144	}
145		145
146	bool ChartAxis::createLabels(QStringList &labels,qreal min, qreal max,int ticks) const
147	{
148	Q_ASSERT(max>min);
149	Q_ASSERT(ticks>1);
150
151	int n = qMax(int(-floor(log10((max-min)/(ticks-1)))),0);
152	n++;
153	for (int i=0; i< ticks; i++) {
154	qreal value = min + (i * (max - min)/ (ticks-1));
155	Q_UNUSED(value);
156	labels << QString::number(value,'f',n);
157	}
158	return true;
159	}
160
161	void ChartAxis::setAxisOpacity(qreal opacity)	146	void ChartAxis::setAxisOpacity(qreal opacity)
162	{	147	{
163	m_axis->setOpacity(opacity);	148	m_axis->setOpacity(opacity);
@@ -354,6 +339,41 void ChartAxis::axisSelected()
354	qDebug()<<"TODO: axis clicked";	339	qDebug()<<"TODO: axis clicked";
355	}	340	}
356		341
		342
		343	void ChartAxis::createNumberLabels(QStringList &labels,qreal min, qreal max, int ticks) const
		344	{
		345	Q_ASSERT(max>min);
		346	Q_ASSERT(ticks>1);
		347
		348	int n = qMax(int(-floor(log10((max-min)/(ticks-1)))),0);
		349	n++;
		350	for (int i=0; i< ticks; i++) {
		351	qreal value = min + (i * (max - min)/ (ticks-1));
		352	labels << QString::number(value,'f',n);
		353	}
		354	}
		355
		356	void ChartAxis::createCategoryLabels(QStringList &labels,qreal min, qreal max,const QStringList &categories) const
		357	{
		358	Q_ASSERT(max>min);
		359	Q_UNUSED(max);
		360
		361	int x = qCeil(min);
		362	int count = 0;
		363
		364	// Try to find category for x coordinate
		365	while (count < m_ticksCount) {
		366	if ((x < categories.count()) && (x >= 0)) {
		367	labels << categories.at(x);
		368	} else {
		369	// No label for x coordinate
		370	labels << "";
		371	}
		372	x++;
		373	count++;
		374	}
		375	}
		376
357	#include "moc_chartaxis_p.cpp"	377	#include "moc_chartaxis_p.cpp"
358		378
359	QTCOMMERCIALCHART_END_NAMESPACE	379	QTCOMMERCIALCHART_END_NAMESPACE

src/axis/chartaxis_p.h +2 -1

             protected:
                 virtual void updateGeometry() = 0;
                 virtual QVector<qreal> calculateLayout() const = 0;
-                virtual bool createLabels(QStringList &labels,qreal min, qreal max,int ticks) const;
+                void createNumberLabels(QStringList &labels,qreal min, qreal max,int ticks) const;
+                void createCategoryLabels(QStringList &labels,qreal min, qreal max,const QStringList &categories) const;
             public Q_SLOTS:
                 void handleAxisUpdated();

src/axis/chartcategoriesaxisx.cpp +2 -28

             #include <QDebug>
             #include <QFontMetrics>
             #include <QCategoriesAxis>
-            #include <qmath.h>
             static int label_padding = 5;
             ChartCategoriesAxisX::ChartCategoriesAxisX(QCategoriesAxis *axis,ChartPresenter *presenter) : ChartAxis(axis,presenter),
               m_categoriesAxis(axis)
             {
-            ChartCategoriesAxisX::~ChartCategoriesAxisX()
             }
-            bool ChartCategoriesAxisX::createLabels(QStringList &labels,qreal min, qreal max,int ticks) const
+            ChartCategoriesAxisX::~ChartCategoriesAxisX()
             {
-                Q_ASSERT(max>min);
-                Q_UNUSED(ticks);
-                Q_UNUSED(max);
-                QStringList categories = m_categoriesAxis->categories();
-                int x = qCeil(min);
-                int count = 0;
-                // Try to find category for x coordinate
-                while (count < ticks) {
-                    if ((x < categories.count()) && (x >= 0)) {
-                        labels << categories.at(x);
-                    } else {
-                        // No label for x coordinate
-                        labels << "";
-                    x++;
-                    count++;
-                return true;
             }
             QVector<qreal> ChartCategoriesAxisX::calculateLayout() const
                 QStringList ticksList;
-                createLabels(ticksList,m_min,m_max,layout.size());
+                createCategoryLabels(ticksList,m_min,m_max,m_categoriesAxis->categories());
                 QList<QGraphicsItem *> lines = m_grid->childItems();
                 QList<QGraphicsItem *> labels = m_labels->childItems();

src/axis/chartcategoriesaxisx_p.h 0 -1

                 ~ChartCategoriesAxisX();
                 AxisType axisType() const { return X_AXIS;}
-                bool createLabels(QStringList &labels,qreal min, qreal max,int ticks) const;
             protected:
                 QVector<qreal> calculateLayout() const;

src/axis/chartcategoriesaxisy.cpp +4 -23

             #include <QGraphicsLayout>
             #include <QDebug>
             #include <QFontMetrics>
+            #include <QCategoriesAxis>
             static int label_padding = 5;
                 QStringList ticksList;
-                bool categories = createLabels(ticksList,m_min,m_max,layout.size());
+                createCategoryLabels(ticksList,m_min,m_max,m_categoriesAxis->categories());
                 QList<QGraphicsItem *> lines = m_grid->childItems();
                 QList<QGraphicsItem *> labels = m_labels->childItems();
                 QGraphicsLineItem *lineItem = static_cast<QGraphicsLineItem*>(axis.at(0));
                 lineItem->setLine(m_rect.left(), m_rect.bottom(), m_rect.right(), m_rect.bottom());
-                qreal width = 0;
+                for (int i = 1; i < layout.size(); ++i) {
-                for (int i = 0; i < layout.size(); ++i) {
                     QGraphicsLineItem *lineItem = static_cast<QGraphicsLineItem*>(lines.at(i));
                     lineItem->setLine(layout[i], m_rect.top(), layout[i], m_rect.bottom());
                     QGraphicsSimpleTextItem *labelItem = static_cast<QGraphicsSimpleTextItem*>(labels.at(i));
-                    if (!categories || i<1) {
-                        labelItem->setText(ticksList.at(i));
-                        const QRectF& rect = labelItem->boundingRect();
-                        QPointF center = rect.center();
-                        labelItem->setTransformOriginPoint(center.x(), center.y());
-                        labelItem->setPos(layout[i] - center.x(), m_rect.bottom() + label_padding);
-                        if(labelItem->pos().x()<=width){
-                            labelItem->setVisible(false);
-                            lineItem->setVisible(false);
-                        }else{
-                            labelItem->setVisible(true);
-                            lineItem->setVisible(true);
-                            width=rect.width()+labelItem->pos().x();
-                        m_minWidth+=rect.width();
-                        m_minHeight=qMax(rect.height(),m_minHeight);
-                    else {
                     labelItem->setText(ticksList.at(i));
                     const QRectF& rect = labelItem->boundingRect();
                     QPointF center = rect.center();
                     labelItem->setPos(layout[i] - (layout[i] - layout[i-1])/2 - center.x(), m_rect.bottom() + label_padding);
                     m_minWidth+=rect.width();
                     m_minHeight=qMax(rect.height()+label_padding,m_minHeight);
                     if ((i+1)%2 && i>1) {
                         QGraphicsRectItem *rectItem = static_cast<QGraphicsRectItem*>(shades.at(i/2-1));

src/axis/chartcategoriesaxisy_p.h +4 0

             QTCOMMERCIALCHART_BEGIN_NAMESPACE
             class QAbstractAxis;
+            class QCategoriesAxis;
             class ChartPresenter;
             class ChartCategoriesAxisY : public ChartAxis
             protected:
                 QVector<qreal> calculateLayout() const;
                 void updateGeometry();
+            private:
+                QCategoriesAxis *m_categoriesAxis;
             };
             QTCOMMERCIALCHART_END_NAMESPACE

src/axis/chartvaluesaxisx.cpp +2 -27

             {
             }
-            bool ChartValuesAxisX::createLabels(QStringList &labels,qreal min, qreal max,int ticks) const
-                Q_ASSERT(max>min);
-                Q_ASSERT(ticks>1);
-                int n = qMax(int(-floor(log10((max-min)/(ticks-1)))),0);
-                n++;
-                for (int i=0; i< ticks; i++) {
-                    qreal value = min + (i * (max - min)/ (ticks-1));
-                    Q_UNUSED(value);
-                    labels << QString::number(value,'f',n);
-                return true;
             QVector<qreal> ChartValuesAxisX::calculateLayout() const
             {
                 Q_ASSERT(m_ticksCount>=2);
                 QStringList ticksList;
-                int ticks = layout.size();
+                createNumberLabels(ticksList,m_min,m_max,layout.size());
-                int n = qMax(int(-floor(log10((m_max-m_min)/(ticks-1)))),0);
-                n++;
-                for (int i=0; i< ticks; i++) {
-                    qreal value = m_min + (i * (m_max - m_min)/ (ticks-1));
-                    Q_UNUSED(value);
-                    ticksList << QString::number(value,'f',n);
-                bool categories = false; //createLabels(ticksList,m_min,m_max,layout.size());
                 QList<QGraphicsItem *> lines = m_grid->childItems();
                 QList<QGraphicsItem *> labels = m_labels->childItems();
                     QGraphicsLineItem *lineItem = static_cast<QGraphicsLineItem*>(lines.at(i));
                     lineItem->setLine(layout[i], m_rect.top(), layout[i], m_rect.bottom());
                     QGraphicsSimpleTextItem *labelItem = static_cast<QGraphicsSimpleTextItem*>(labels.at(i));
-                    if (!categories || i<1) {
                         labelItem->setText(ticksList.at(i));
                         const QRectF& rect = labelItem->boundingRect();
                         QPointF center = rect.center();
                         }
                         m_minWidth+=rect.width();
                         m_minHeight=qMax(rect.height(),m_minHeight);
                     if ((i+1)%2 && i>1) {
                         QGraphicsRectItem *rectItem = static_cast<QGraphicsRectItem*>(shades.at(i/2-1));
                         rectItem->setRect(layout[i-1],m_rect.top(),layout[i]-layout[i-1],m_rect.height());

src/axis/chartvaluesaxisx_p.h +4 -1

                 ~ChartValuesAxisX();
                 AxisType axisType() const { return X_AXIS;}
-                bool createLabels(QStringList &labels,qreal min, qreal max,int ticks) const;
             protected:
                 QVector<qreal> calculateLayout() const;
                 void updateGeometry();
+            private:
+                void createLabels(QStringList &labels,qreal min, qreal max,int ticks) const;
             };
             QTCOMMERCIALCHART_END_NAMESPACE

src/axis/chartvaluesaxisy.cpp +1 -23

                 QStringList ticksList;
-                int ticks = layout.size();
+                createNumberLabels(ticksList,m_min,m_max,layout.size());
-                int n = qMax(int(-floor(log10((m_max-m_min)/(ticks-1)))),0);
-                n++;
-                for (int i=0; i< ticks; i++) {
-                    qreal value = m_min + (i * (m_max - m_min)/ (ticks-1));
-                    Q_UNUSED(value);
-                    ticksList << QString::number(value,'f',n);
-                bool categories = false;
-            //    bool categories = createLabels(ticksList,m_min,m_max,layout.size());
                 QList<QGraphicsItem *> lines = m_grid->childItems();
                 QList<QGraphicsItem *> labels = m_labels->childItems();
                     lineItem->setLine(m_rect.left() , layout[i], m_rect.right(), layout[i]);
                     QGraphicsSimpleTextItem *labelItem = static_cast<QGraphicsSimpleTextItem*>(labels.at(i));
-                    if (!categories || i<1) {
                         labelItem->setText(ticksList.at(i));
                         const QRectF& rect = labelItem->boundingRect();
                         m_minWidth=qMax(rect.width()+label_padding,m_minWidth);
                         m_minHeight+=rect.height();
-                    else {
-                        labelItem->setText(ticksList.at(i));
-                        const QRectF& rect = labelItem->boundingRect();
-                        m_minWidth=qMax(rect.width(),m_minWidth);
-                        m_minHeight+=rect.height();
-                        QPointF center = rect.center();
-                        labelItem->setTransformOriginPoint(center.x(), center.y());
-                        labelItem->setPos(m_rect.left() - rect.width() - label_padding , layout[i] - (layout[i] - layout[i-1])/2 -center.y());
                     if ((i+1)%2 && i>1) {
                         QGraphicsRectItem *rectItem = static_cast<QGraphicsRectItem*>(shades.at(i/2-1));

src/chartdataset.cpp +58 -37

             void ChartDataSet::addSeries(QAbstractSeries* series)
             {
-                QAbstractAxis* axis = m_seriesAxisXMap.value(series);
+                Domain* domain = m_seriesDomainMap.value(series);
-                if(axis) {
+                if(domain) {
                     qWarning() << "Can not add series. Series already on the chart";
                     return;
                 }
-                QAbstractAxis* axisX = series->d_ptr->createAxisX(this);
-                QAbstractAxis* axisY = series->d_ptr->createAxisY(this);
                 series->setParent(this); // take ownership
-                Domain* domain = new Domain(series);
+                domain = new Domain(series);
-                if(axisX){
-                    QObject::connect(axisX->d_ptr.data(),SIGNAL(changed(qreal,qreal,int,bool)),domain,SLOT(handleAxisXChanged(qreal,qreal,int,bool)));
-                    QObject::connect(domain,SIGNAL(rangeXChanged(qreal,qreal,int)),axisX->d_ptr.data(),SLOT(handleAxisRangeChanged(qreal,qreal,int)));
-                    axisX->d_ptr->m_orientation=Qt::Horizontal;
-                    emit axisAdded(axisX,domain);
-                    m_seriesAxisXMap.insert(series,axisX);
-                if(axisY){
-                    QObject::connect(axisY->d_ptr.data(),SIGNAL(changed(qreal,qreal,int,bool)),domain,SLOT(handleAxisYChanged(qreal,qreal,int,bool)));
-                    QObject::connect(domain,SIGNAL(rangeYChanged(qreal,qreal,int)),axisY->d_ptr.data(),SLOT(handleAxisRangeChanged(qreal,qreal,int)));
-                    axisY->d_ptr->m_orientation=Qt::Vertical;
-                    emit axisAdded(axisY,domain);
-                    m_seriesAxisYMap.insert(series,axisY);
                 m_seriesDomainMap.insert(series,domain);
             }
+            void ChartDataSet::createDefaultAxes()
+            {
+                QMapIterator<QAbstractSeries*, Domain*> i(m_seriesDomainMap);
+                while (i.hasNext()) {
+                    i.next();
+                    if(!m_seriesAxisXMap.value(i.key()))
+                    {
+                        QAbstractAxis* axisX = i.key()->d_ptr->createAxisX(this);
+                        if(axisX) {
+                            QObject::connect(axisX->d_ptr.data(),SIGNAL(changed(qreal,qreal,int,bool)),i.value(),SLOT(handleAxisXChanged(qreal,qreal,int,bool)));
+                            QObject::connect(i.value(),SIGNAL(rangeXChanged(qreal,qreal,int)),axisX->d_ptr.data(),SLOT(handleAxisRangeChanged(qreal,qreal,int)));
+                            axisX->d_ptr->m_orientation=Qt::Horizontal;
+                            emit axisAdded(axisX,i.value());
+                            m_seriesAxisXMap.insert(i.key(),axisX);
+                        }
+                    }
+                    if(!m_seriesAxisYMap.value(i.key()))
+                    {
+                        QAbstractAxis* axisY = i.key()->d_ptr->createAxisY(this);
+                        if(axisY) {
+                            QObject::connect(axisY->d_ptr.data(),SIGNAL(changed(qreal,qreal,int,bool)),i.value(),SLOT(handleAxisYChanged(qreal,qreal,int,bool)));
+                            QObject::connect(i.value(),SIGNAL(rangeYChanged(qreal,qreal,int)),axisY->d_ptr.data(),SLOT(handleAxisRangeChanged(qreal,qreal,int)));
+                            axisY->d_ptr->m_orientation=Qt::Vertical;
+                            emit axisAdded(axisY,i.value());
+                            m_seriesAxisYMap.insert(i.key(),axisY);
+                        }
+                    }
+                }
+            }
             void ChartDataSet::removeSeries(QAbstractSeries* series)
             {
                 Domain* domain = m_seriesDomainMap.take(series);
             int ChartDataSet::seriesCount(QAbstractSeries::SeriesType type)
             {
                 int count=0;
-                QMapIterator<QAbstractSeries*, QAbstractAxis*> i(m_seriesAxisXMap);
+                QMapIterator<QAbstractSeries*, Domain*> i(m_seriesDomainMap);
                 while (i.hasNext()) {
                        i.next();
                        if(i.key()->type()==type) count++;
             void ChartDataSet::setAxisX(QAbstractSeries *series, QAbstractAxis *axis)
             {
                 Q_ASSERT(axis);
-                QAbstractAxis *oldAxis = m_seriesAxisXMap.take(series);
+                Domain* domain = m_seriesDomainMap.value(series);
-                if(!oldAxis) {
+                if(!domain) {
                     qWarning() << "Series not found on the chart.";
                     return;
                 }
                     return;
                 }
+                QAbstractAxis *oldAxis = m_seriesAxisXMap.take(series);
                 QList<QAbstractAxis*> axesX = m_seriesAxisXMap.values();
+                if(oldAxis) {
                     int x = axesX.indexOf(oldAxis);
                     if(x==-1) {
                         emit axisRemoved(oldAxis);
                         oldAxis->deleteLater();
                     }
+                }
-                Domain* domain = m_seriesDomainMap.value(series);
-                Q_ASSERT(domain);
                 QObject::connect(axis->d_ptr.data(),SIGNAL(changed(qreal,qreal,int,bool)),domain,SLOT(handleAxisXChanged(qreal,qreal,int,bool)));
                 QObject::connect(domain,SIGNAL(rangeXChanged(qreal,qreal,int)),axis->d_ptr.data(),SLOT(handleAxisRangeChanged(qreal,qreal,int)));
-                x = axesX.indexOf(axis);
+                int x = axesX.indexOf(axis);
                 if(x==-1) {
                     axis->d_ptr->m_orientation=Qt::Horizontal;
                     emit axisAdded(axis,domain);
             void ChartDataSet::setAxisY(QAbstractSeries *series, QAbstractAxis *axis)
             {
                 Q_ASSERT(axis);
-            	QAbstractAxis *oldAxis = m_seriesAxisYMap.take(series);
+                Domain* domain = m_seriesDomainMap.value(series);
-            	if(!oldAxis) {
+                if(!domain) {
-            		qWarning()<<"Series not found on the chart or axis is unsupported for given series type";
+                    qWarning() << "Series not found on the chart.";
                     return;
                 }
                     return;
                 }
+                QAbstractAxis *oldAxis = m_seriesAxisYMap.take(series);
                 QList<QAbstractAxis*> axesY = m_seriesAxisYMap.values();
+                if(oldAxis) {
                     int y = axesY.indexOf(oldAxis);
                     if(y==-1) {
                         emit axisRemoved(oldAxis);
                         oldAxis->deleteLater();
                     }
+                }
-            	Domain* domain = m_seriesDomainMap.value(series);
-            	Q_ASSERT(domain);
                 QObject::connect(axis->d_ptr.data(),SIGNAL(changed(qreal,qreal,int,bool)),domain,SLOT(handleAxisYChanged(qreal,qreal,int,bool)));
                 QObject::connect(domain,SIGNAL(rangeYChanged(qreal,qreal,int)),axis->d_ptr.data(),SLOT(handleAxisRangeChanged(qreal,qreal,int)));
-            	y = axesY.indexOf(axis);
+                int y = axesY.indexOf(axis);
                 if(y==-1) {
                     axis->d_ptr->m_orientation=Qt::Vertical;
                     emit axisAdded(axis,domain);

src/chartdataset_p.h +2 0

                 QList<QAbstractSeries*> series() const;
                 Domain* domain(QAbstractSeries *series) const;
+                void createDefaultAxes();
             Q_SIGNALS:
                 void seriesAdded(QAbstractSeries* series, Domain* domain);
                 void seriesRemoved(QAbstractSeries* series);

src/qchart.cpp +7 -2

                 return d_ptr->m_dataset->axisY(series);
             }
+            void QChart::createDefaultAxes()
+            {
+            	d_ptr->m_dataset->createDefaultAxes();
+            }
             /*!
              Returns the legend object of the chart. Ownership stays in chart.
              */
                 d_ptr->m_presenter->setMarginsMinimum(margins);
             }
-            void QChart::setAxisX(QAbstractSeries *series, QAbstractAxis* axis)
+            void QChart::setAxisX(QAbstractAxis* axis , QAbstractSeries *series)
             {
                 d_ptr->m_dataset->setAxisX(series,axis);
             }
-            void QChart::setAxisY(QAbstractSeries *series, QAbstractAxis* axis)
+            void QChart::setAxisY( QAbstractAxis* axis , QAbstractSeries *series)
             {
                 d_ptr->m_dataset->setAxisY(series,axis);
             }

src/qchart.h +4 -2

                 void removeAllSeries();
                 QList<QAbstractSeries*> series() const;
-                void setAxisX(QAbstractSeries *series, QAbstractAxis* axis);
+                void setAxisX(QAbstractAxis* axis, QAbstractSeries *series = 0);
-                void setAxisY(QAbstractSeries *series, QAbstractAxis* axis);
+                void setAxisY(QAbstractAxis* axis, QAbstractSeries *series = 0);
                 QAbstractAxis* axisX(QAbstractSeries* series = 0) const;
                 QAbstractAxis* axisY(QAbstractSeries* series = 0) const;
+                void createDefaultAxes();
                 void setTheme(QChart::ChartTheme theme);
                 QChart::ChartTheme theme() const;

tests/auto/chartdataset/tst_chartdataset.cpp +16 -11

             	QVERIFY(m_dataset->domain(series) == 0);
             	QVERIFY(m_dataset->axisX(series) == 0);
             	QVERIFY(m_dataset->axisY(series) == 0);
+            	m_dataset->createDefaultAxes();
             }
                 QSignalSpy spy3(m_dataset, SIGNAL(seriesRemoved(QAbstractSeries *)));
                 m_dataset->addSeries(series);
+                m_dataset->createDefaultAxes();
                 if(series->type()==QAbstractSeries::SeriesTypePie){
                     TRY_COMPARE(spy0.count(), 0);
                 }else{
                     m_dataset->addSeries(series);
                 }
-                TRY_COMPARE(spy0.count(), seriesList.count()*2);
+                TRY_COMPARE(spy0.count(), 0);
                 TRY_COMPARE(spy1.count(), 0);
                 TRY_COMPARE(spy2.count(), seriesList.count());
                 TRY_COMPARE(spy3.count(), 0);
                 }
                 TRY_COMPARE(spy4.count(), axisCount);
-                TRY_COMPARE(spy5.count(), seriesList.count());
+                TRY_COMPARE(spy5.count(), 0);
                 TRY_COMPARE(spy6.count(), 0);
                 TRY_COMPARE(spy7.count(), 0);
                     m_dataset->addSeries(series);
                 }
-                TRY_COMPARE(spy0.count(), seriesList.count()*2);
+                TRY_COMPARE(spy0.count(), 0);
                 TRY_COMPARE(spy1.count(), 0);
                 TRY_COMPARE(spy2.count(), seriesList.count());
                 TRY_COMPARE(spy3.count(), 0);
                 }
                 TRY_COMPARE(spy4.count(), axisCount);
-                TRY_COMPARE(spy5.count(), seriesList.count());
+                TRY_COMPARE(spy5.count(), 0);
                 TRY_COMPARE(spy6.count(), 0);
                 TRY_COMPARE(spy7.count(), 0);
                 QFETCH(QAbstractSeries*, series);
                 m_dataset->addSeries(series);
+                m_dataset->createDefaultAxes();
                 QSignalSpy spy0(m_dataset, SIGNAL(axisAdded(QAbstractAxis*, Domain *)));
                 QSignalSpy spy1(m_dataset, SIGNAL(axisRemoved(QAbstractAxis*)));
                 m_dataset->removeAllSeries();
                 TRY_COMPARE(spy0.count(), 0);
-                TRY_COMPARE(spy1.count(), axisCount + seriesList.count());
+                TRY_COMPARE(spy1.count(), axisCount);
                 TRY_COMPARE(spy2.count(), 0);
                 TRY_COMPARE(spy3.count(), seriesList.count());
             }
                 m_dataset->addSeries(series);
                 QVERIFY(m_dataset->domain(series));
-                if(series->type()!=QAbstractSeries::SeriesTypePie){
-                TRY_COMPARE(spy0.count(), 2);
+                TRY_COMPARE(spy0.count(), 0);
                 TRY_COMPARE(spy1.count(), 0);
                 TRY_COMPARE(spy2.count(), 1);
                     m_dataset->addSeries(series);
                 }
-                for (int i = 1; i < seriesList.count(); i++) {
+                /*
-                    m_dataset->setAxisX(seriesList.at(i), m_dataset->axisX(seriesList.at(0)));
+                QValuesAxis* axis = new QValuesAxis();
+                for (int i = 0; i < seriesList.count(); i++) {
+                    m_dataset->setAxisX(seriesList.at(i), axis);
                 }
+            */
+                m_dataset->createDefaultAxes();
                 QList<QSignalSpy*> spyList;

tests/auto/qchart/tst_qchart.cpp +5 -5

                 QVERIFY(!series->chart());
                 QCOMPARE(m_chart->series().count(), 0);
                 m_chart->addSeries(series);
-                m_chart->setAxisY(series,axis);
+                m_chart->setAxisY(axis,series);
                 QCOMPARE(m_chart->series().count(), 1);
                 QCOMPARE(m_chart->series().first(), series);
                 QVERIFY(series->chart() == m_chart);
                 QLineSeries* series0 = new QLineSeries();
                 m_chart->addSeries(series0);
-                m_chart->setAxisY(series0,axis0);
+                m_chart->setAxisY(axis0,series0);
                 QLineSeries* series1 = new QLineSeries();
                 m_chart->addSeries(series1);
-                m_chart->setAxisY(series1,axis1);
+                m_chart->setAxisY(axis1,series1);
                 QLineSeries* series2 = new QLineSeries();
                 m_chart->addSeries(series2);
-                m_chart->setAxisY(series2,axis2);
+                m_chart->setAxisY(axis2,series2);
                 if (!axis0)
                     axis0 = defaultAxisY;
                 QTest::qWaitForWindowShown(m_view);
                 if(!axis) axis = m_chart->axisY();
                 m_chart->addSeries(series);
-                m_chart->setAxisY(series,axis);
+                m_chart->setAxisY(axis,series);
                 QCOMPARE(m_chart->axisY(series),axis);
                 m_chart->removeSeries(series);
                 QVERIFY(m_chart->axisY(series)==0);

tests/chartwidgettest/mainwidget.cpp +4 -4

                         series = new QBarSeries(this);
                         QCategoriesAxis* axis = new QCategoriesAxis();
                         axis->append(category);
-                        m_chart->setAxisX(series,axis);
+                        m_chart->setAxisX(axis,series);
                     } else if (seriesName == "Grouped bar") {
                         series = new QGroupedBarSeries(this);
                         QCategoriesAxis* axis = new QCategoriesAxis();
                         axis->append(category);
-                        m_chart->setAxisX(series,axis);
+                        m_chart->setAxisX(axis,series);
                     } else if (seriesName == "Stacked bar") {
                         series = new QStackedBarSeries(this);
                         QCategoriesAxis* axis = new QCategoriesAxis();
                         axis->append(category);
-                        m_chart->setAxisX(series,axis);
+                        m_chart->setAxisX(axis,series);
                     } else {
                         series = new QPercentBarSeries(this);
                         QCategoriesAxis* axis = new QCategoriesAxis();
                         axis->append(category);
-                        m_chart->setAxisX(series,axis);
+                        m_chart->setAxisX(axis,series);
                     }
                     for (int j(0); j < data.count(); j++) {

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