HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/qtcharts Commit - r1556:10e43766cad7

Refactors core to support mulitpile axis and domains...

Michal Klocek -

r1556:10e43766cad7

parent child

Context file:

r1556:10e43766cad7

Expand all files

src/areachart/qareaseries.cpp +4 -6

             }
-            QAbstractAxis* QAreaSeriesPrivate::createAxisX()
+            QAbstractAxis* QAreaSeriesPrivate::createAxisX(QObject* parent)
             {
-                // TODO: parent?
+                return new QValuesAxis(parent);
-                return new QValuesAxis(this);
             }
-            QAbstractAxis* QAreaSeriesPrivate::createAxisY()
+            QAbstractAxis* QAreaSeriesPrivate::createAxisY(QObject* parent)
             {
-                // TODO: parent?
+                return new QValuesAxis(parent);
-                return new QValuesAxis(this);
             }
             #include "moc_qareaseries.cpp"

src/areachart/qareaseries_p.h +2 -2

                 void scaleDomain(Domain& domain);
                 Chart* createGraphics(ChartPresenter* presenter);
                 QList<LegendMarker*> createLegendMarker(QLegend* legend);
-                QAbstractAxis* createAxisX();
+                QAbstractAxis* createAxisX(QObject* parent = 0);
-                QAbstractAxis* createAxisY();
+                QAbstractAxis* createAxisY(QObject* parent = 0);
             Q_SIGNALS:
                 void updated();

src/axis/qabstractaxis.h +1 0

                 Q_DISABLE_COPY(QAbstractAxis);
                 friend class ChartDataSet;
                 friend class ChartAxis;
+                friend class ChartPresenter;
             };
             QTCOMMERCIALCHART_END_NAMESPACE

src/axis/qabstractaxis_p.h +7 -1

             QTCOMMERCIALCHART_BEGIN_NAMESPACE
+            class ChartPresenter;
+            class ChartAxis;
             class QAbstractAxisPrivate : public QObject
             {
                 Q_OBJECT
             Q_SIGNALS:
                 void updated();
+            public:
+                virtual ChartAxis* createGraphics(ChartPresenter* presenter) = 0;
             protected:
                 virtual void setMin(const QVariant& min) = 0;
                 virtual void setMax(const QVariant& max) = 0;
                 virtual void setRange(const QVariant& min, const QVariant& max) = 0;
                 virtual int ticksCount() const = 0;
-            protected:
+            public:
                 QAbstractAxis *q_ptr;
                 bool m_axisVisible;

src/axis/qcategoriesaxis.cpp +13 0

             #include "qcategoriesaxis.h"
             #include "qcategoriesaxis_p.h"
+            #include "chartaxisx_p.h"
+            #include "chartaxisy_p.h"
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
                 return m_categories.count()+1;
             }
+            ChartAxis* QCategoriesAxisPrivate::createGraphics(ChartPresenter* presenter)
+            {
+                Q_Q( QCategoriesAxis);
+                if(m_orientation == Qt::Vertical){
+                    return new ChartAxisY(q,presenter);
+                }else{
+                    return new ChartAxisX(q,presenter);
+                }
+            }
             #include "moc_qcategoriesaxis.cpp"
             #include "moc_qcategoriesaxis_p.cpp"

src/axis/qcategoriesaxis_p.h +3 0

                 QCategoriesAxisPrivate(QCategoriesAxis *q);
                 ~QCategoriesAxisPrivate();
+            public:
+                ChartAxis* createGraphics(ChartPresenter* presenter);
             private:
                 //range handling
                 void setMin(const QVariant& min);

src/axis/qvaluesaxis.cpp +14 0

             #include "qvaluesaxis.h"
             #include "qvaluesaxis_p.h"
+            #include "chartaxisx_p.h"
+            #include "chartaxisy_p.h"
+            #include <QDebug>
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
             /*!
                 return m_ticksCount;
             }
+            ChartAxis* QValuesAxisPrivate::createGraphics(ChartPresenter* presenter)
+            {
+                Q_Q(QValuesAxis);
+                if(m_orientation == Qt::Vertical){
+                    return new ChartAxisY(q,presenter);
+                }else{
+                    return new ChartAxisX(q,presenter);
+                }
+            }
             #include "moc_qvaluesaxis.cpp"
             #include "moc_qvaluesaxis_p.cpp"

src/axis/qvaluesaxis_p.h +3 0

             public Q_SLOTS:
                 void handleAxisRangeChanged(qreal min, qreal max,int count);
+            public:
+                ChartAxis* createGraphics(ChartPresenter* presenter);
             protected:
                 void setMin(const QVariant& min);
                 void setMax(const QVariant& max);

src/barchart/qbarseries.cpp +4 -6

                 return markers;
             }
-            QAbstractAxis* QBarSeriesPrivate::createAxisX()
+            QAbstractAxis* QBarSeriesPrivate::createAxisX(QObject* parent)
             {
-                // TODO: parent?
+                return new QValuesAxis(parent);
-                return new QValuesAxis(this);
             }
-            QAbstractAxis* QBarSeriesPrivate::createAxisY()
+            QAbstractAxis* QBarSeriesPrivate::createAxisY(QObject* parent)
             {
-                // TODO: parent?
+                return new QValuesAxis(parent);
-                return new QValuesAxis(this);
             }
             bool QBarSeriesPrivate::append(QBarSet *set)

src/barchart/qbarseries_p.h +2 -2

                 Chart* createGraphics(ChartPresenter* presenter);
                 QList<LegendMarker*> createLegendMarker(QLegend* legend);
-                QAbstractAxis* createAxisX();
+                QAbstractAxis* createAxisX(QObject* parent = 0);
-                QAbstractAxis* createAxisY();
+                QAbstractAxis* createAxisY(QObject* parent = 0);
                 bool append(QBarSet *set);
                 bool remove(QBarSet *set);

src/chartdataset.cpp +44 -110

             QTCOMMERCIALCHART_BEGIN_NAMESPACE
             ChartDataSet::ChartDataSet(QChart *parent):QObject(parent),
-                m_axisX(new QValuesAxis(this)),
+                m_domainIndex(0)
-                m_axisY(new QValuesAxis(this)),
-                m_domainIndex(0),
-                m_axisXInitialized(false),
-                m_axisYInitialized(false)
             {
-                //create main domain
-                Domain* domain = new Domain(m_axisY);
-                m_axisDomainMap.insert(m_axisY,domain);
-                QObject::connect(m_axisY->d_ptr.data(),SIGNAL(changed(qreal,qreal,int,bool)),domain,SLOT(handleAxisYChanged(qreal,qreal,int,bool)));
-                QObject::connect(m_axisX->d_ptr.data(),SIGNAL(changed(qreal,qreal,int,bool)),domain,SLOT(handleAxisXChanged(qreal,qreal,int,bool)));
-                QObject::connect(domain,SIGNAL(rangeYChanged(qreal,qreal,int)),m_axisY->d_ptr.data(),SLOT(handleAxisRangeChanged(qreal,qreal,int)));
-                QObject::connect(domain,SIGNAL(rangeXChanged(qreal,qreal,int)),m_axisX->d_ptr.data(),SLOT(handleAxisRangeChanged(qreal,qreal,int)));
             }
             ChartDataSet::~ChartDataSet()
                     return;
                 }
-                QAbstractAxis* axisX = series->d_ptr->createAxisX();
+                QAbstractAxis* axisX = series->d_ptr->createAxisX(this);
-                QAbstractAxis* axisY = m_axisY ; //series->d_ptr->createAxisY();
+                QAbstractAxis* axisY = series->d_ptr->createAxisY(this);
                 series->setParent(this); // take ownership
-                //axisY->setParent(this); // take ownership
-                Domain* domain = m_axisDomainMap.value(axisY);
+                Domain* domain = new Domain(series);
-                if(!domain) {
+                if(axisX){
-                    domain = new Domain(axisY);
+                    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_seriesAxisYMap.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(axisX->d_ptr.data(),SIGNAL(changed(qreal,qreal,int,bool)),domain,SLOT(handleAxisXChanged(qreal,qreal,int)));
                     QObject::connect(domain,SIGNAL(rangeYChanged(qreal,qreal,int)),axisY->d_ptr.data(),SLOT(handleAxisRangeChanged(qreal,qreal,int)));
-                    //initialize
+                    axisY->d_ptr->m_orientation=Qt::Vertical;
-                    m_axisDomainMap.insert(axisY,domain);
                     emit axisAdded(axisY,domain);
+                    m_seriesAxisYMap.insert(series,axisY);
                 }
-                if(!m_axisXInitialized){
+                m_seriesDomainMap.insert(series,domain);
-                   m_axisXInitialized=true;
-            //       emit axisAdded(m_axisX,domain);
-                   emit axisAdded(axisX,domain);
-                if(!m_axisYInitialized && axisY==m_axisY){
-                   m_axisYInitialized=true;
-                   emit axisAdded(m_axisY,domain);
                 series->d_ptr->scaleDomain(*domain);
-                if (series->type()== QAbstractSeries::SeriesTypePie && m_seriesAxisXMap.count() == 0) {
-                    axisX->hide();
-                    axisY->hide();
-                m_seriesAxisXMap.insert(series,axisY);
                 QMapIterator<int, QAbstractSeries*> i(m_indexSeriesMap);
                 int key=0;
             }
-            QAbstractAxis* ChartDataSet::removeSeries(QAbstractSeries* series)
+            void ChartDataSet::removeSeries(QAbstractSeries* series)
             {
-                QAbstractAxis* axis = m_seriesAxisXMap.value(series);
+                Domain* domain = m_seriesDomainMap.take(series);
-                if(!axis){
+                if(!domain) {
                     qWarning()<<"Can not remove series. Series not found on the chart.";
-                    return 0;
+                else {
+                    delete domain;
+                    domain =0;
                 }
                 emit seriesRemoved(series);
-                m_seriesAxisXMap.remove(series);
+                QAbstractAxis* axisX = m_seriesAxisXMap.take(series);
+                QAbstractAxis* axisY = m_seriesAxisYMap.take(series);
                 int key = seriesIndex(series);
                 Q_ASSERT(key!=-1);
                 series->d_ptr->m_chart = 0;
                 series->d_ptr->m_dataset = 0;
-                QList<QAbstractAxis*> axes =  m_seriesAxisXMap.values();
+                QList<QAbstractAxis*> axesX = m_seriesAxisXMap.values();
+                QList<QAbstractAxis*> axesY = m_seriesAxisYMap.values();
-                int i = axes.indexOf(axis);
+                int x = axesX.indexOf(axisX);
+                int y = axesY.indexOf(axisY);
-                if(i==-1){
+                if(x==-1) {
-                    Domain* domain = m_axisDomainMap.take(axis);
+                    emit axisRemoved(axisX);
-                    emit axisRemoved(axis);
+                    delete axisX;
-                    if(axis!=m_axisY){
-                        axis->setParent(0);
-                        delete domain;
-                    }else{
-                        m_axisYInitialized=false;
-                        m_axisDomainMap.insert(m_axisY,domain);
                 }
-                if(m_seriesAxisXMap.values().size()==0)
+                if(y==-1) {
+                    emit axisRemoved(axisY);
-                    m_axisXInitialized=false;
+                    delete axisY;
-                    emit axisRemoved(m_axisX);
                 }
-                return axis;
             }
             void ChartDataSet::removeAllSeries()
             {
-                QList<QAbstractSeries*> series =  m_seriesAxisXMap.keys();
+                QList<QAbstractSeries*> series =   m_seriesDomainMap.keys();
-                QList<QAbstractAxis*> axes;
                 foreach(QAbstractSeries *s , series) {
-                    QAbstractAxis* axis  = removeSeries(s);
+                    removeSeries(s);
-                    if(axis==m_axisY) continue;
-                    int i = axes.indexOf(axis);
-                    if(i==-1){
-                        axes<<axis;
                 }
                 Q_ASSERT(m_seriesAxisXMap.count()==0);
-                Q_ASSERT(m_axisDomainMap.count()==1);
+                Q_ASSERT(m_seriesAxisXMap.count()==0);
+                Q_ASSERT(m_seriesDomainMap.count()==0);
                 qDeleteAll(series);
-                qDeleteAll(axes);
             }
             void ChartDataSet::zoomInDomain(const QRectF& rect, const QSizeF& size)
             {
-                QMapIterator<QAbstractAxis*, Domain*> i(m_axisDomainMap);
+                QMapIterator<QAbstractSeries*, Domain*> i(m_seriesDomainMap);
-                //main domain has to be the last one;
-                Domain *domain = m_axisDomainMap.value(m_axisY);
-                Q_ASSERT(domain);
                 while (i.hasNext()) {
                     i.next();
-                    if(i.value()==domain) continue;
                     i.value()->zoomIn(rect,size);
                 }
-                domain->zoomIn(rect,size);
             }
             void ChartDataSet::zoomOutDomain(const QRectF& rect, const QSizeF& size)
             {
-                QMapIterator<QAbstractAxis*, Domain*> i(m_axisDomainMap);
+                QMapIterator<QAbstractSeries*, Domain*> i(m_seriesDomainMap);
-                //main domain has to be the last one;
-                Domain *domain = m_axisDomainMap.value(m_axisY);
-                Q_ASSERT(domain);
                 while (i.hasNext()) {
                     i.next();
-                    if(i.value()==domain) continue;
                     i.value()->zoomOut(rect,size);
                 }
-                domain->zoomOut(rect,size);
             }
             int ChartDataSet::seriesCount(QAbstractSeries::SeriesType type)
             QAbstractAxis* ChartDataSet::axisX(QAbstractSeries *series) const
             {
-                qDebug() << "axisX";
-                if (series == 0) return m_axisX;
                 return m_seriesAxisXMap.value(series);
             }
             QAbstractAxis* ChartDataSet::axisY(QAbstractSeries *series) const
             {
-                if(series == 0) return m_axisY;
                 return m_seriesAxisYMap.value(series);
             }
                 m_seriesAxisYMap.insert(series,axis);
             }
-            Domain* ChartDataSet::domain(QAbstractSeries *series) const
-                QAbstractAxis* axis = m_seriesAxisXMap.value(series);
-            	if(axis){
-            		return m_axisDomainMap.value(axis);
-            	}else
-            		return 0;
-            Domain* ChartDataSet::domain(QAbstractAxis* axis) const
-                if(!axis || axis==m_axisX) {
-                    return  m_axisDomainMap.value(m_axisY);
-                else {
-                    return m_axisDomainMap.value(axis);
             void ChartDataSet::scrollDomain(qreal dx,qreal dy,const QSizeF& size)
             {
-                QMapIterator<QAbstractAxis*, Domain*> i( m_axisDomainMap);
+                QMapIterator<QAbstractSeries*, Domain*> i(m_seriesDomainMap);
-                //main domain has to be the last one;
-                Domain *domain = m_axisDomainMap.value(m_axisY);
                 while (i.hasNext()) {
                     i.next();
-                    if(i.value()==domain) continue;
                     i.value()->move(dx,dy,size);
                 }
-                domain->move(dx,dy,size);
             }
             QList<QAbstractSeries*> ChartDataSet::series() const

src/chartdataset_p.h +3 -10

                 virtual ~ChartDataSet();
                 void addSeries(QAbstractSeries* series);
-                QAbstractAxis* removeSeries(QAbstractSeries* series);
+                void removeSeries(QAbstractSeries* series);
                 void removeAllSeries();
                 void updateSeries(QAbstractSeries* series);
                 int seriesCount(QAbstractSeries::SeriesType type);
                 int seriesIndex(QAbstractSeries *series);
-                Domain* domain(QAbstractSeries* series) const;
-                Domain* domain(QAbstractAxis* axis) const;
                 QAbstractAxis* axisX(QAbstractSeries *series) const;
                 QAbstractAxis* axisY(QAbstractSeries *series) const;
             private:
                 QMap<QAbstractSeries*, QAbstractAxis*> m_seriesAxisXMap;
                 QMap<QAbstractSeries*, QAbstractAxis*> m_seriesAxisYMap;
-                QMap<QAbstractAxis*, Domain*> m_axisDomainMap;
+                QMap<QAbstractSeries*, Domain*> m_seriesDomainMap;
                 QMap<int, QAbstractSeries*> m_indexSeriesMap;
-                QAbstractAxis* m_axisX;
-                QAbstractAxis* m_axisY;
                 int m_domainIndex;
-                bool m_axisXInitialized;
-                bool m_axisYInitialized;
             };
             QTCOMMERCIALCHART_END_NAMESPACE

src/chartpresenter.cpp +22 -20

             #include "qchart.h"
             #include "qchart_p.h"
             #include "qabstractaxis.h"
+            #include "qabstractaxis_p.h"
             #include "chartdataset_p.h"
             #include "charttheme_p.h"
             #include "chartanimator_p.h"
             void ChartPresenter::handleAxisAdded(QAbstractAxis* axis,Domain* domain)
             {
-                ChartAxis* item;
+                ChartAxis* item = axis->d_ptr->createGraphics(this);
+                item->setDomain(domain);
-                if(axis == m_dataset->axisX(0)){
-                    item = new ChartAxisX(axis,this);
-                }else{
-                    item = new ChartAxisY(axis,this);
                 if(m_options.testFlag(QChart::GridAxisAnimations)){
                     item->setAnimator(m_animator);
                     item->setAnimation(new AxisAnimation(item));
                 }
-                if(axis==m_dataset->axisX(0)){
+                if(item->axisType()==ChartAxis::X_AXIS){
                     m_chartTheme->decorate(axis,true);
                     QObject::connect(domain,SIGNAL(rangeXChanged(qreal,qreal,int)),item,SLOT(handleRangeChanged(qreal,qreal,int)));
                     //initialize
             {
                 Chart *item = series->d_ptr->createGraphics(this);
                 Q_ASSERT(item);
+                item->setDomain(domain);
                 QObject::connect(this,SIGNAL(geometryChanged(QRectF)),item,SLOT(handleGeometryChanged(QRectF)));
                 QObject::connect(domain,SIGNAL(domainChanged(qreal,qreal,qreal,qreal)),item,SLOT(handleDomainChanged(qreal,qreal,qreal,qreal)));
                 //initialize
             void ChartPresenter::resetAllElements()
             {
-                QList<QAbstractAxis*> axisList = m_axisItems.uniqueKeys();
+                QMapIterator<QAbstractAxis*, ChartAxis*> i(m_axisItems);
-                QList<QAbstractSeries *> seriesList = m_chartItems.uniqueKeys();
+                while (i.hasNext()) {
+                       i.next();
-                foreach(QAbstractAxis *axis, axisList) {
+                       Domain* domain = i.value()->domain();
-                    handleAxisRemoved(axis);
+                       QAbstractAxis* axis = i.key();
-                    handleAxisAdded(axis,m_dataset->domain(axis));
+                       handleAxisRemoved(axis);
+                       handleAxisAdded(axis,domain);
-                foreach(QAbstractSeries *series, seriesList) {
-                    handleSeriesRemoved(series);
-                    handleSeriesAdded(series,m_dataset->domain(series));
-            //        m_dataset->removeSeries(series);
-            //        m_dataset->addSeries(series);
                 }
+                QMapIterator<QAbstractSeries*, Chart*> j(m_chartItems);
+                   while (j.hasNext()) {
+                          j.next();
+                          Domain* domain = j.value()->domain();
+                          QAbstractSeries* series = j.key();
+                          handleSeriesRemoved(series);
+                          handleSeriesAdded(series,domain);
+                   }
             }
             void ChartPresenter::zoomIn(qreal factor)

src/linechart/qlineseries.cpp 0 -13

             #include "chartdataset_p.h"
             #include "charttheme_p.h"
             #include "chartanimator_p.h"
-            #include "qvaluesaxis.h"
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
                 return line;
             }
-            QAbstractAxis* QLineSeriesPrivate::createAxisX()
-                // TODO: parent?
-                return new QValuesAxis(this);
-            QAbstractAxis* QLineSeriesPrivate::createAxisY()
-                // TODO: parent?
-                return new QValuesAxis(this);
             #include "moc_qlineseries.cpp"
             QTCOMMERCIALCHART_END_NAMESPACE

src/linechart/qlineseries_p.h 0 -2

             public:
                 QLineSeriesPrivate(QLineSeries* q);
                 Chart* createGraphics(ChartPresenter* presenter);
-                QAbstractAxis* createAxisX();
-                QAbstractAxis* createAxisY();
             private:
                 Q_DECLARE_PUBLIC(QLineSeries);

src/piechart/qpieseries.cpp +4 -2

                 return markers;
             }
-            QAbstractAxis* QPieSeriesPrivate::createAxisX()
+            QAbstractAxis* QPieSeriesPrivate::createAxisX(QObject* parent)
             {
+                Q_UNUSED(parent);
                 return 0;
             }
-            QAbstractAxis* QPieSeriesPrivate::createAxisY()
+            QAbstractAxis* QPieSeriesPrivate::createAxisY(QObject* parent)
             {
+                Q_UNUSED(parent);
                 return 0;
             }

src/piechart/qpieseries_p.h +2 -2

                 void scaleDomain(Domain& domain);
                 Chart* createGraphics(ChartPresenter *presenter);
                 QList<LegendMarker*> createLegendMarker(QLegend *legend);
-                QAbstractAxis* createAxisX();
+                QAbstractAxis* createAxisX(QObject* parent);
-                QAbstractAxis* createAxisY();
+                QAbstractAxis* createAxisY(QObject* parent);
                 void updateDerivativeData();

src/qabstractseries_p.h +2 -2

                 virtual void scaleDomain(Domain& domain) = 0;
                 virtual Chart* createGraphics(ChartPresenter* presenter) = 0;
                 virtual QList<LegendMarker*> createLegendMarker(QLegend* legend) = 0;
-                virtual QAbstractAxis* createAxisX() = 0;
+                virtual QAbstractAxis* createAxisX(QObject* parent) = 0;
-                virtual QAbstractAxis* createAxisY() = 0;
+                virtual QAbstractAxis* createAxisY(QObject* parent) = 0;
             protected:
                 QAbstractSeries *q_ptr;

src/qchart.cpp 0 -4

             void QChart::setAxisX(QAbstractSeries *series, QAbstractAxis* axis)
             {
-            //    Q_UNUSED(series);
-            //    Q_UNUSED(axis);
                 d_ptr->m_dataset->setAxisX(series, axis);
             }
             void QChart::setAxisY(QAbstractSeries *series, QAbstractAxis* axis)
             {
-            //    Q_UNUSED(series);
-            //    Q_UNUSED(axis);
                 d_ptr->m_dataset->setAxisY(series, axis);
             }

src/scatterchart/qscatterseries.cpp 0 -14

             #include "chartdataset_p.h"
             #include "charttheme_p.h"
             #include "chartanimator_p.h"
-            #include "qvaluesaxis.h"
             /*!
                 \class QScatterSeries
                 return scatter;
             }
-            QAbstractAxis* QScatterSeriesPrivate::createAxisX()
-                // TODO: parent?
-                return new QValuesAxis(this);
-            QAbstractAxis* QScatterSeriesPrivate::createAxisY()
-                // TODO: parent?
-                return new QValuesAxis(this);
             #include "moc_qscatterseries.cpp"
             QTCOMMERCIALCHART_END_NAMESPACE

src/scatterchart/qscatterseries_p.h 0 -2

             public:
                 QScatterSeriesPrivate(QScatterSeries* q);
                 Chart* createGraphics(ChartPresenter* presenter);
-                QAbstractAxis* createAxisX();
-                QAbstractAxis* createAxisY();
             private:
                 QScatterSeries::MarkerShape m_shape;

src/xychart/qxyseries.cpp +11 0

             #include "qxyseries_p.h"
             #include "domain_p.h"
             #include "legendmarker_p.h"
+            #include "qvaluesaxis.h"
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
                 return list << new XYLegendMarker(q,legend);
             }
+            QAbstractAxis* QXYSeriesPrivate::createAxisX(QObject* parent)
+            {
+                return new QValuesAxis(parent);
+            }
+            QAbstractAxis* QXYSeriesPrivate::createAxisY(QObject* parent)
+            {
+                return new QValuesAxis(parent);
+            }
             #include "moc_qxyseries.cpp"
             #include "moc_qxyseries_p.cpp"

src/xychart/qxyseries_p.h +4 0

             QTCOMMERCIALCHART_BEGIN_NAMESPACE
             class QXYSeries;
+            class QAbstractAxis;
             class QXYSeriesPrivate: public QAbstractSeriesPrivate
             {
                 void scaleDomain(Domain& domain);
                 QList<LegendMarker*> createLegendMarker(QLegend* legend);
+                QAbstractAxis* createAxisX(QObject* parent);
+                QAbstractAxis* createAxisY(QObject* parent);
             Q_SIGNALS:
                 void updated();
             //    void pointReplaced(int index);

src/xychart/xychart_p.h +1 0

             #include "qchartglobal.h"
             #include "chartitem_p.h"
             #include "xyanimation_p.h"
+            #include "qvaluesaxis.h"
             #include <QPen>
             QTCOMMERCIALCHART_BEGIN_NAMESPACE

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