HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/qtcharts Commit - r1545:440df83ae867

0

src/areachart/qareaseries.cpp +14 0

             #include "chartdataset_p.h"
             #include "charttheme_p.h"
             #include "chartanimator_p.h"
+            #include "qvaluesaxis.h"
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
                 return list << new AreaLegendMarker(q,legend);
             }
+            QAbstractAxis* QAreaSeriesPrivate::createAxisX()
+            {
+                // TODO: parent?
+                return new QValuesAxis(this);
+            }
+            QAbstractAxis* QAreaSeriesPrivate::createAxisY()
+            {
+                // TODO: parent?
+                return new QValuesAxis(this);
+            }
             #include "moc_qareaseries.cpp"
             #include "moc_qareaseries_p.cpp"

0

src/areachart/qareaseries_p.h +2 0

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

0

src/barchart/qbarseries.cpp +13 0

             #include "chartdataset_p.h"
             #include "charttheme_p.h"
             #include "chartanimator_p.h"
+            #include "qvaluesaxis.h"
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
                 return markers;
             }
+            QAbstractAxis* QBarSeriesPrivate::createAxisX()
+            {
+                // TODO: parent?
+                return new QValuesAxis(this);
+            }
+            QAbstractAxis* QBarSeriesPrivate::createAxisY()
+            {
+                // TODO: parent?
+                return new QValuesAxis(this);
+            }
             bool QBarSeriesPrivate::append(QBarSet *set)
             {
                 Q_Q(QBarSeries);

0

src/barchart/qbarseries_p.h +3 0

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

0

src/barchart/qgroupedbarseries.cpp +14 0

             #include "chartdataset_p.h"
             #include "charttheme_p.h"
             #include "chartanimator_p.h"
+            #include "qcategoriesaxis.h"
+            #include "qvaluesaxis.h"
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
                 return bar;
             }
+            QAbstractAxis* QGroupedBarSeriesPrivate::createAxisX()
+            {
+                // TODO: parent?
+                return new QCategoriesAxis(this);
+            }
+            QAbstractAxis* QGroupedBarSeriesPrivate::createAxisY()
+            {
+                // TODO: parent?
+                return new QValuesAxis(this);
+            }
             #include "moc_qgroupedbarseries.cpp"
             QTCOMMERCIALCHART_END_NAMESPACE

0

src/barchart/qgroupedbarseries_p.h +2 0

                 QGroupedBarSeriesPrivate(QGroupedBarSeries* q);
                 Chart* createGraphics(ChartPresenter* presenter);
                 void scaleDomain(Domain& domain);
+                QAbstractAxis* createAxisX();
+                QAbstractAxis* createAxisY();
             private:
                 Q_DECLARE_PUBLIC(QGroupedBarSeries)

0

src/barchart/qpercentbarseries.cpp +14 0

             #include "chartdataset_p.h"
             #include "charttheme_p.h"
             #include "chartanimator_p.h"
+            #include "qcategoriesaxis.h"
+            #include "qvaluesaxis.h"
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
                 return bar;
             }
+            QAbstractAxis* QPercentBarSeriesPrivate::createAxisX()
+            {
+                // TODO: parent?
+                return new QCategoriesAxis(this);
+            }
+            QAbstractAxis* QPercentBarSeriesPrivate::createAxisY()
+            {
+                // TODO: parent?
+                return new QValuesAxis(this);
+            }
             #include "moc_qpercentbarseries.cpp"
             QTCOMMERCIALCHART_END_NAMESPACE

0

src/barchart/qpercentbarseries_p.h +2 0

                 QPercentBarSeriesPrivate(QPercentBarSeries* q);
                 void scaleDomain(Domain& domain);
                 Chart* createGraphics(ChartPresenter* presenter);
+                QAbstractAxis* createAxisX();
+                QAbstractAxis* createAxisY();
             private:
                 Q_DECLARE_PUBLIC(QPercentBarSeries)

0

src/barchart/qstackedbarseries.cpp +15 0

             #include "chartdataset_p.h"
             #include "charttheme_p.h"
             #include "chartanimator_p.h"
+            #include "qcategoriesaxis.h"
+            #include "qvaluesaxis.h"
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
                 return bar;
             }
+            QAbstractAxis* QStackedBarSeriesPrivate::createAxisX()
+            {
+                // TODO: parent?
+                return new QCategoriesAxis(this);
+            }
+            QAbstractAxis* QStackedBarSeriesPrivate::createAxisY()
+            {
+                // TODO: parent?
+                return new QValuesAxis(this);
+            }
             #include "moc_qstackedbarseries.cpp"
             QTCOMMERCIALCHART_END_NAMESPACE

0

src/barchart/qstackedbarseries_p.h +2 0

                 QStackedBarSeriesPrivate(QStackedBarSeries* q);
                 Chart* createGraphics(ChartPresenter* presenter);
                 void scaleDomain(Domain& domain);
+                QAbstractAxis* createAxisX();
+                QAbstractAxis* createAxisY();
             private:
                 Q_DECLARE_PUBLIC(QStackedBarSeries)

0

src/linechart/qlineseries.cpp +13 0

             #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

0

src/linechart/qlineseries_p.h +3 0

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

0

src/piechart/qpieseries.cpp +11 0

             #include "charttheme_p.h"
             #include "chartanimator_p.h"
             #include "legendmarker_p.h"
+            #include "qabstractaxis.h"
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
                 return markers;
             }
+            QAbstractAxis* QPieSeriesPrivate::createAxisX()
+            {
+                return 0;
+            }
+            QAbstractAxis* QPieSeriesPrivate::createAxisY()
+            {
+                return 0;
+            }
             #include "moc_qpieseries.cpp"
             #include "moc_qpieseries_p.cpp"

0

src/piechart/qpieseries_p.h +2 0

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

0

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() { return 0; }
+                virtual QAbstractAxis* createAxisX() = 0;
-                virtual QAbstractAxis* createAxisY() { return 0; }
+                virtual QAbstractAxis* createAxisY() = 0;
             protected:
                 QAbstractSeries *q_ptr;

0

src/scatterchart/qscatterseries.cpp +14 0

             #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

0

src/scatterchart/qscatterseries_p.h +2 0

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

	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