HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/qtcharts Commit - r1542:6d402eea8412

Adds missing functions to qchart API

Michal Klocek -

r1542:6d402eea8412

parent child

Context file:

r1542:6d402eea8412

Collapse all files

src/axis/qabstractaxis.cpp +2 -1

                 m_labelsAngle(0),
                 m_shadesVisible(false),
                 m_shadesBrush(Qt::SolidPattern),
-                m_shadesOpacity(1.0)
+                m_shadesOpacity(1.0),
+                m_orientation(Qt::Orientation(0))
             {
             }

src/axis/qabstractaxis_p.h +2 0

                 QBrush m_shadesBrush;
                 qreal m_shadesOpacity;
+                Qt::Orientation m_orientation;
                 friend class QAbstractAxis;
             };

src/chartdataset.cpp +20 -14

             void ChartDataSet::addSeries(QAbstractSeries* series)
             {
-                //TODO: if(axisY==0) axisY = m_axisY;
-                QAbstractAxis* axisY = m_axisY;
                 QAbstractAxis* axis = m_seriesAxisMap.value(series);
                 if(axis) {
                     return;
                 }
+                QAbstractAxis* axisX = m_axisX ; //series->d_ptr->createAxisX();
+                QAbstractAxis* axisY = m_axisY ; //series->d_ptr->createAxisY();
                 series->setParent(this); // take ownership
-                axisY->setParent(this); // take ownership
+                //axisY->setParent(this); // take ownership
                 Domain* domain = m_axisDomainMap.value(axisY);
                 if(!domain) {
                     domain = new Domain(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(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
                     m_axisDomainMap.insert(axisY,domain);
                 series->d_ptr->scaleDomain(*domain);
                 if (series->type()== QAbstractSeries::SeriesTypePie && m_seriesAxisMap.count() == 0) {
-                    axisX()->hide();
+                    axisX->hide();
-                    this->axisY()->hide();
+                    axisY->hide();
                 }
                 m_seriesAxisMap.insert(series,axisY);
                 if(m_seriesAxisMap.values().size()==0)
                 {
                     m_axisXInitialized=false;
-                    emit axisRemoved(axisX());
+                    emit axisRemoved(m_axisX);
                 }
                 return axis;
                 QList<QAbstractAxis*> axes;
                 foreach(QAbstractSeries *s , series) {
                     QAbstractAxis* axis  = removeSeries(s);
-                    if(axis==axisY()) continue;
+                    if(axis==m_axisY) continue;
                     int i = axes.indexOf(axis);
                     if(i==-1){
                         axes<<axis;
             {
                 QMapIterator<QAbstractAxis*, Domain*> i(m_axisDomainMap);
                 //main domain has to be the last one;
-                Domain *domain = m_axisDomainMap.value(axisY());
+                Domain *domain = m_axisDomainMap.value(m_axisY);
                 Q_ASSERT(domain);
                 while (i.hasNext()) {
                     i.next();
             {
                 QMapIterator<QAbstractAxis*, Domain*> i(m_axisDomainMap);
                 //main domain has to be the last one;
-                Domain *domain = m_axisDomainMap.value(axisY());
+                Domain *domain = m_axisDomainMap.value(m_axisY);
                 Q_ASSERT(domain);
                 while (i.hasNext()) {
                     i.next();
                 return m_seriesAxisMap.value(series);
             }
+            QAbstractAxis* ChartDataSet::axisX(QAbstractSeries *series) const
+            {
+               Q_UNUSED(series)
+                return m_axisX;
+            }
             Domain* ChartDataSet::domain(QAbstractSeries *series) const
             {
                 QAbstractAxis* axis = m_seriesAxisMap.value(series);
             Domain* ChartDataSet::domain(QAbstractAxis* axis) const
             {
-                if(!axis || axis==axisX()) {
+                if(!axis || axis==m_axisX) {
-                    return  m_axisDomainMap.value(axisY());
+                    return  m_axisDomainMap.value(m_axisY);
                 }
                 else {
                     return m_axisDomainMap.value(axis);
             {
                 QMapIterator<QAbstractAxis*, Domain*> i( m_axisDomainMap);
                 //main domain has to be the last one;
-                Domain *domain = m_axisDomainMap.value(axisY());
+                Domain *domain = m_axisDomainMap.value(m_axisY);
                 while (i.hasNext()) {
                     i.next();
                     if(i.value()==domain) continue;

src/chartdataset_p.h +2 -2

                 Domain* domain(QAbstractSeries* series) const;
                 Domain* domain(QAbstractAxis* axis) const;
-                QAbstractAxis* axisX() const { return m_axisX; }
+                QAbstractAxis* axisX(QAbstractSeries *series) const;
-                QAbstractAxis* axisY(QAbstractSeries *series = 0) const;
+                QAbstractAxis* axisY(QAbstractSeries *series) const;
                 QList<QAbstractSeries*> series() const;

src/chartpresenter.cpp +2 -2

             {
                 ChartAxis* item;
-                if(axis == m_dataset->axisX()){
+                if(axis == m_dataset->axisX(0)){
                     item = new ChartAxisX(axis,this);
                 }else{
                     item = new ChartAxisY(axis,this);
                     item->setAnimation(new AxisAnimation(item));
                 }
-                if(axis==m_dataset->axisX()){
+                if(axis==m_dataset->axisX(0)){
                     m_chartTheme->decorate(axis,true);
                     QObject::connect(domain,SIGNAL(rangeXChanged(qreal,qreal,int)),item,SLOT(handleRangeChanged(qreal,qreal,int)));
                     //initialize

src/qabstractseries_p.h +3 0

             class LegendMarker;
             class QLegend;
             class ChartDataSet;
+            class QAbstractAxis;
             class QAbstractSeriesPrivate : public QObject
             {
                 virtual void scaleDomain(Domain& domain) = 0;
                 virtual Chart* createGraphics(ChartPresenter* presenter) = 0;
                 virtual QList<LegendMarker*> createLegendMarker(QLegend* legend) = 0;
+                virtual QAbstractAxis* createAxisX() { return 0; }
+                virtual QAbstractAxis* createAxisY() { return 0; }
             protected:
                 QAbstractSeries *q_ptr;

src/qchart.cpp +2 -2

             /*!
              Returns the pointer to the x axis object of the chart
              */
-            QAbstractAxis* QChart::axisX() const
+            QAbstractAxis* QChart::axisX(QAbstractSeries* series) const
             {
-                return d_ptr->m_dataset->axisX();
+                return d_ptr->m_dataset->axisX(series);
             }
             /*!

src/qchart.h +3 -3

                 void setAxisX(QAbstractSeries *series, QAbstractAxis* axis);
                 void setAxisY(QAbstractSeries *series, QAbstractAxis* axis);
+                QAbstractAxis* axisX(QAbstractSeries* series = 0) const;
+                QAbstractAxis* axisY(QAbstractSeries* series = 0) const;
                 void setTheme(QChart::ChartTheme theme);
                 QChart::ChartTheme theme() const;
                 void scrollDown();
                 void scroll(const QPointF &delta);
-                QAbstractAxis* axisX() const;
-                QAbstractAxis* axisY(QAbstractSeries* series = 0) const;
                 QLegend* legend() const;
                 void setMarginsMinimum(const QRectF& margins);

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