From 440df83ae867b3342cda133a5a4f06faae4c62e6 2012-06-27 10:17:49
From: sauimone <samu.uimonen@digia.com>
Date: 2012-06-27 10:17:49
Subject: [PATCH] added createAxis methods to private series

---

diff --git a/src/areachart/qareaseries.cpp b/src/areachart/qareaseries.cpp
index fc1de3a..5a380a0 100644
--- a/src/areachart/qareaseries.cpp
+++ b/src/areachart/qareaseries.cpp
@@ -27,6 +27,7 @@
 #include "chartdataset_p.h"
 #include "charttheme_p.h"
 #include "chartanimator_p.h"
+#include "qvaluesaxis.h"
 
 QTCOMMERCIALCHART_BEGIN_NAMESPACE
 
@@ -378,6 +379,19 @@ QList<LegendMarker*> QAreaSeriesPrivate::createLegendMarker(QLegend* legend)
     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"
 
diff --git a/src/areachart/qareaseries_p.h b/src/areachart/qareaseries_p.h
index 0aa2a28..b1376e8 100644
--- a/src/areachart/qareaseries_p.h
+++ b/src/areachart/qareaseries_p.h
@@ -46,6 +46,8 @@ public:
     void scaleDomain(Domain& domain);
     Chart* createGraphics(ChartPresenter* presenter);
     QList<LegendMarker*> createLegendMarker(QLegend* legend);
+    QAbstractAxis* createAxisX();
+    QAbstractAxis* createAxisY();
 
 Q_SIGNALS:
     void updated();
diff --git a/src/barchart/qbarseries.cpp b/src/barchart/qbarseries.cpp
index 88813e9..7784c78 100644
--- a/src/barchart/qbarseries.cpp
+++ b/src/barchart/qbarseries.cpp
@@ -27,6 +27,7 @@
 #include "chartdataset_p.h"
 #include "charttheme_p.h"
 #include "chartanimator_p.h"
+#include "qvaluesaxis.h"
 
 QTCOMMERCIALCHART_BEGIN_NAMESPACE
 
@@ -607,6 +608,18 @@ QList<LegendMarker*> QBarSeriesPrivate::createLegendMarker(QLegend* legend)
     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);
diff --git a/src/barchart/qbarseries_p.h b/src/barchart/qbarseries_p.h
index e7a03a1..fd82a66 100644
--- a/src/barchart/qbarseries_p.h
+++ b/src/barchart/qbarseries_p.h
@@ -56,6 +56,9 @@ public:
     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);
diff --git a/src/barchart/qgroupedbarseries.cpp b/src/barchart/qgroupedbarseries.cpp
index b5a007c..c4a4163 100644
--- a/src/barchart/qgroupedbarseries.cpp
+++ b/src/barchart/qgroupedbarseries.cpp
@@ -24,6 +24,8 @@
 #include "chartdataset_p.h"
 #include "charttheme_p.h"
 #include "chartanimator_p.h"
+#include "qcategoriesaxis.h"
+#include "qvaluesaxis.h"
 
 QTCOMMERCIALCHART_BEGIN_NAMESPACE
 
@@ -110,6 +112,18 @@ Chart* QGroupedBarSeriesPrivate::createGraphics(ChartPresenter* presenter)
     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
diff --git a/src/barchart/qgroupedbarseries_p.h b/src/barchart/qgroupedbarseries_p.h
index 796673c..b5a4a61 100644
--- a/src/barchart/qgroupedbarseries_p.h
+++ b/src/barchart/qgroupedbarseries_p.h
@@ -42,6 +42,8 @@ public:
     QGroupedBarSeriesPrivate(QGroupedBarSeries* q);
     Chart* createGraphics(ChartPresenter* presenter);
     void scaleDomain(Domain& domain);
+    QAbstractAxis* createAxisX();
+    QAbstractAxis* createAxisY();
 
 private:
     Q_DECLARE_PUBLIC(QGroupedBarSeries)
diff --git a/src/barchart/qpercentbarseries.cpp b/src/barchart/qpercentbarseries.cpp
index 8a58b49..01fbae7 100644
--- a/src/barchart/qpercentbarseries.cpp
+++ b/src/barchart/qpercentbarseries.cpp
@@ -24,6 +24,8 @@
 #include "chartdataset_p.h"
 #include "charttheme_p.h"
 #include "chartanimator_p.h"
+#include "qcategoriesaxis.h"
+#include "qvaluesaxis.h"
 
 QTCOMMERCIALCHART_BEGIN_NAMESPACE
 
@@ -109,6 +111,18 @@ Chart* QPercentBarSeriesPrivate::createGraphics(ChartPresenter* presenter)
     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
diff --git a/src/barchart/qpercentbarseries_p.h b/src/barchart/qpercentbarseries_p.h
index f2c254d..9029e2e 100644
--- a/src/barchart/qpercentbarseries_p.h
+++ b/src/barchart/qpercentbarseries_p.h
@@ -42,6 +42,8 @@ public:
     QPercentBarSeriesPrivate(QPercentBarSeries* q);
     void scaleDomain(Domain& domain);
     Chart* createGraphics(ChartPresenter* presenter);
+    QAbstractAxis* createAxisX();
+    QAbstractAxis* createAxisY();
 
 private:
     Q_DECLARE_PUBLIC(QPercentBarSeries)
diff --git a/src/barchart/qstackedbarseries.cpp b/src/barchart/qstackedbarseries.cpp
index 689792e..57ca097 100644
--- a/src/barchart/qstackedbarseries.cpp
+++ b/src/barchart/qstackedbarseries.cpp
@@ -24,6 +24,8 @@
 #include "chartdataset_p.h"
 #include "charttheme_p.h"
 #include "chartanimator_p.h"
+#include "qcategoriesaxis.h"
+#include "qvaluesaxis.h"
 
 QTCOMMERCIALCHART_BEGIN_NAMESPACE
 
@@ -111,6 +113,19 @@ Chart* QStackedBarSeriesPrivate::createGraphics(ChartPresenter* presenter)
     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
diff --git a/src/barchart/qstackedbarseries_p.h b/src/barchart/qstackedbarseries_p.h
index bf04717..698df15 100644
--- a/src/barchart/qstackedbarseries_p.h
+++ b/src/barchart/qstackedbarseries_p.h
@@ -42,6 +42,8 @@ public:
     QStackedBarSeriesPrivate(QStackedBarSeries* q);
     Chart* createGraphics(ChartPresenter* presenter);
     void scaleDomain(Domain& domain);
+    QAbstractAxis* createAxisX();
+    QAbstractAxis* createAxisY();
 
 private:
     Q_DECLARE_PUBLIC(QStackedBarSeries)
diff --git a/src/linechart/qlineseries.cpp b/src/linechart/qlineseries.cpp
index 70f52dd..334cde7 100644
--- a/src/linechart/qlineseries.cpp
+++ b/src/linechart/qlineseries.cpp
@@ -24,6 +24,7 @@
 #include "chartdataset_p.h"
 #include "charttheme_p.h"
 #include "chartanimator_p.h"
+#include "qvaluesaxis.h"
 
 QTCOMMERCIALCHART_BEGIN_NAMESPACE
 
@@ -129,6 +130,18 @@ Chart* QLineSeriesPrivate::createGraphics(ChartPresenter* presenter)
     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
diff --git a/src/linechart/qlineseries_p.h b/src/linechart/qlineseries_p.h
index ae3f411..0b3cf33 100644
--- a/src/linechart/qlineseries_p.h
+++ b/src/linechart/qlineseries_p.h
@@ -40,6 +40,9 @@ class QLineSeriesPrivate: public QXYSeriesPrivate
 public:
     QLineSeriesPrivate(QLineSeries* q);
     Chart* createGraphics(ChartPresenter* presenter);
+    QAbstractAxis* createAxisX();
+    QAbstractAxis* createAxisY();
+
 private:
     Q_DECLARE_PUBLIC(QLineSeries);
 
diff --git a/src/piechart/qpieseries.cpp b/src/piechart/qpieseries.cpp
index fdd1acb..9f83914 100644
--- a/src/piechart/qpieseries.cpp
+++ b/src/piechart/qpieseries.cpp
@@ -27,6 +27,7 @@
 #include "charttheme_p.h"
 #include "chartanimator_p.h"
 #include "legendmarker_p.h"
+#include "qabstractaxis.h"
 
 QTCOMMERCIALCHART_BEGIN_NAMESPACE
 
@@ -754,6 +755,16 @@ QList<LegendMarker*> QPieSeriesPrivate::createLegendMarker(QLegend* legend)
     return markers;
 }
 
+QAbstractAxis* QPieSeriesPrivate::createAxisX()
+{
+    return 0;
+}
+
+QAbstractAxis* QPieSeriesPrivate::createAxisY()
+{
+    return 0;
+}
+
 #include "moc_qpieseries.cpp"
 #include "moc_qpieseries_p.cpp"
 
diff --git a/src/piechart/qpieseries_p.h b/src/piechart/qpieseries_p.h
index 42d1431..396d16f 100644
--- a/src/piechart/qpieseries_p.h
+++ b/src/piechart/qpieseries_p.h
@@ -47,6 +47,8 @@ public:
     void scaleDomain(Domain& domain);
     Chart* createGraphics(ChartPresenter *presenter);
     QList<LegendMarker*> createLegendMarker(QLegend *legend);
+    QAbstractAxis* createAxisX();
+    QAbstractAxis* createAxisY();
 
     void updateDerivativeData();
 
diff --git a/src/qabstractseries_p.h b/src/qabstractseries_p.h
index e65be3d..238a7c6 100644
--- a/src/qabstractseries_p.h
+++ b/src/qabstractseries_p.h
@@ -52,8 +52,8 @@ public:
     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; }
+    virtual QAbstractAxis* createAxisX() = 0;
+    virtual QAbstractAxis* createAxisY() = 0;
 
 protected:
     QAbstractSeries *q_ptr;
diff --git a/src/scatterchart/qscatterseries.cpp b/src/scatterchart/qscatterseries.cpp
index e03776b..d8f0ceb 100644
--- a/src/scatterchart/qscatterseries.cpp
+++ b/src/scatterchart/qscatterseries.cpp
@@ -24,6 +24,7 @@
 #include "chartdataset_p.h"
 #include "charttheme_p.h"
 #include "chartanimator_p.h"
+#include "qvaluesaxis.h"
 
 /*!
     \class QScatterSeries
@@ -249,6 +250,19 @@ Chart* QScatterSeriesPrivate::createGraphics(ChartPresenter* presenter)
     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
diff --git a/src/scatterchart/qscatterseries_p.h b/src/scatterchart/qscatterseries_p.h
index 6dba063..b5b2b56 100644
--- a/src/scatterchart/qscatterseries_p.h
+++ b/src/scatterchart/qscatterseries_p.h
@@ -39,6 +39,8 @@ class QScatterSeriesPrivate: public QXYSeriesPrivate
 public:
     QScatterSeriesPrivate(QScatterSeries* q);
     Chart* createGraphics(ChartPresenter* presenter);
+    QAbstractAxis* createAxisX();
+    QAbstractAxis* createAxisY();
 
 private:
     QScatterSeries::MarkerShape m_shape;