HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/qtcharts Commit - r1707:a9fe09868de9

Refactor barchart...

Michal Klocek -

r1707:a9fe09868de9

parent child

Context file:

r1707:a9fe09868de9

Expand all files

src/barchart/horizontal/bar/bar.pri created 644 +13 0

@@ -0,0 +1,13
	1	INCLUDEPATH += $$PWD
	2	DEPENDPATH += $$PWD
	3
	4	SOURCES += \
	5	$$PWD/qhorizontalbarseries.cpp \
	6	$$PWD/horizontalbarchartitem.cpp
	7
	8	PRIVATE_HEADERS += \
	9	$$PWD/qhorizontalbarseries_p.h \
	10	$$PWD/horizontalbarchartitem_p.h
	11
	12	PUBLIC_HEADERS += \
	13	$$PWD/qhorizontalbarseries.h

src/barchart/horizontal/horizontal.pri created 644 +3 0

@@ -0,0 +1,3
	1	include(bar/bar.pri)
	2	include(percent/percent.pri)
	3	include(stacked/stacked.pri) No newline at end of file

src/barchart/horizontal/percent/percent.pri created 644 +13 0

@@ -0,0 +1,13
	1	INCLUDEPATH += $$PWD
	2	DEPENDPATH += $$PWD
	3
	4	SOURCES += \
	5	$$PWD/qhorizontalpercentbarseries.cpp \
	6	$$PWD/horizontalpercentbarchartitem.cpp
	7
	8	PRIVATE_HEADERS += \
	9	$$PWD/qhorizontalpercentbarseries_p.h \
	10	$$PWD/horizontalpercentbarchartitem_p.h
	11
	12	PUBLIC_HEADERS += \
	13	$$PWD/qhorizontalpercentbarseries.h

src/barchart/horizontal/stacked/stacked.pri created 644 +15 0

@@ -0,0 +1,15
	1	INCLUDEPATH += $$PWD
	2	DEPENDPATH += $$PWD
	3
	4	SOURCES += \
	5	$$PWD/qhorizontalstackedbarseries.cpp \
	6	$$PWD/horizontalstackedbarchartitem.cpp
	7
	8
	9	PRIVATE_HEADERS += \
	10	$$PWD/qhorizontalstackedbarseries_p.h \
	11	$$PWD/horizontalstackedbarchartitem_p.h
	12
	13	PUBLIC_HEADERS += \
	14	$$PWD/qhorizontalstackedbarseries.h
	15

src/barchart/vertical/bar/bar.pri created 644 +13 0

@@ -0,0 +1,13
	1	INCLUDEPATH += $$PWD
	2	DEPENDPATH += $$PWD
	3
	4	SOURCES += \
	5	$$PWD/barchartitem.cpp \
	6	$$PWD/qbarseries.cpp
	7
	8	PRIVATE_HEADERS += \
	9	$$PWD/barchartitem_p.h \
	10	$$PWD/qbarseries_p.h
	11
	12	PUBLIC_HEADERS += \
	13	$$PWD/qbarseries.h

src/barchart/vertical/percent/percent.pri created 644 +14 0

@@ -0,0 +1,14
	1	INCLUDEPATH += $$PWD
	2	DEPENDPATH += $$PWD
	3
	4	SOURCES += \
	5	$$PWD/percentbarchartitem.cpp \
	6	$$PWD/qpercentbarseries.cpp
	7
	8
	9	PRIVATE_HEADERS += \
	10	$$PWD/percentbarchartitem_p.h \
	11	$$PWD/qpercentbarseries_p.h
	12
	13	PUBLIC_HEADERS += \
	14	$$PWD/qpercentbarseries.h

src/barchart/vertical/stacked/stacked.pri created 644 +13 0

@@ -0,0 +1,13
	1	INCLUDEPATH += $$PWD
	2	DEPENDPATH += $$PWD
	3
	4	SOURCES += \
	5	$$PWD/qstackedbarseries.cpp \
	6	$$PWD/stackedbarchartitem.cpp
	7
	8	PRIVATE_HEADERS += \
	9	$$PWD/stackedbarchartitem_p.h \
	10	$$PWD/qstackedbarseries_p.h
	11
	12	PUBLIC_HEADERS += \
	13	$$PWD/qstackedbarseries.h

src/barchart/vertical/vertical.pri created 644 +3 0

@@ -0,0 +1,3
	1	include(bar/bar.pri)
	2	include(percent/percent.pri)
	3	include(stacked/stacked.pri) No newline at end of file

src/barchart/barchart.pri +6 -33

@@ -1,55 +1,28
		1	include(vertical/vertical.pri)
		2	include(horizontal/horizontal.pri)
		3
1	INCLUDEPATH += $$PWD	4	INCLUDEPATH += $$PWD
2	DEPENDPATH += $$PWD	5	DEPENDPATH += $$PWD
3		6
4	SOURCES += \	7	SOURCES += \
5	$$PWD/bar.cpp \	8	$$PWD/bar.cpp \
6	$$PWD/abstractbarchartitem.cpp \	9	$$PWD/abstractbarchartitem.cpp \
7	$$PWD/percentbarchartitem.cpp \
8	$$PWD/barchartitem.cpp \
9	$$PWD/qabstractbarseries.cpp \	10	$$PWD/qabstractbarseries.cpp \
10	$$PWD/qbarset.cpp \	11	$$PWD/qbarset.cpp \
11	$$PWD/qpercentbarseries.cpp \
12	$$PWD/qstackedbarseries.cpp \
13	$$PWD/qbarseries.cpp \
14	$$PWD/stackedbarchartitem.cpp \
15	$$PWD/qbarmodelmapper.cpp \	12	$$PWD/qbarmodelmapper.cpp \
16	$$PWD/qvbarmodelmapper.cpp \	13	$$PWD/qvbarmodelmapper.cpp \
17	$$PWD/qhbarmodelmapper.cpp \	14	$$PWD/qhbarmodelmapper.cpp \
18	$$PWD/qhorizontalbarseries.cpp \
19	$$PWD/horizontalbarchartitem.cpp \
20	$$PWD/qhorizontalstackedbarseries.cpp \
21	$$PWD/horizontalstackedbarchartitem.cpp \
22	$$PWD/qhorizontalpercentbarseries.cpp \
23	$$PWD/horizontalpercentbarchartitem.cpp
24		15
25	PRIVATE_HEADERS += \	16	PRIVATE_HEADERS += \
26	$$PWD/bar_p.h \	17	$$PWD/bar_p.h \
27	$$PWD/abstractbarchartitem_p.h \
28	$$PWD/percentbarchartitem_p.h \
29	$$PWD/stackedbarchartitem_p.h \
30	$$PWD/barchartitem_p.h \
31	$$PWD/qbarset_p.h \	18	$$PWD/qbarset_p.h \
		19	$$PWD/abstractbarchartitem_p.h \
32	$$PWD/qabstractbarseries_p.h \	20	$$PWD/qabstractbarseries_p.h \
33	$$PWD/q~~stackedbarseries_p.h\~~	21	$$PWD/qbarmodelmapper_p.h
34	$$PWD/qpercentbarseries_p.h \
35	$$PWD/qbarseries_p.h \
36	$$PWD/qbarmodelmapper_p.h \
37	$$PWD/qhorizontalbarseries_p.h \
38	$$PWD/horizontalbarchartitem_p.h \
39	$$PWD/qhorizontalstackedbarseries_p.h \
40	$$PWD/horizontalstackedbarchartitem_p.h \
41	$$PWD/qhorizontalpercentbarseries_p.h \
42	$$PWD/horizontalpercentbarchartitem_p.h
43		22
44	PUBLIC_HEADERS += \	23	PUBLIC_HEADERS += \
45	$$PWD/qabstractbarseries.h \	24	$$PWD/qabstractbarseries.h \
46	$$PWD/qbarset.h \	25	$$PWD/qbarset.h \
47	$$PWD/qpercentbarseries.h \
48	$$PWD/qstackedbarseries.h \
49	$$PWD/qbarseries.h \
50	$$PWD/qbarmodelmapper.h \	26	$$PWD/qbarmodelmapper.h \
51	$$PWD/qvbarmodelmapper.h \	27	$$PWD/qvbarmodelmapper.h \
52	$$PWD/qhbarmodelmapper.h \	28	$$PWD/qhbarmodelmapper.h
53	$$PWD/qhorizontalbarseries.h \
54	$$PWD/qhorizontalstackedbarseries.h \
55	$$PWD/qhorizontalpercentbarseries.h

src/barchart/horizontal/bar/horizontalbarchartitem.cpp ~~src/barchart/horizontalbarchartitem.cpp~~ renamed 0 0

NO CONTENT: file renamed from src/barchart/horizontalbarchartitem.cpp to src/barchart/horizontal/bar/horizontalbarchartitem.cpp

src/barchart/horizontal/bar/horizontalbarchartitem_p.h ~~src/barchart/horizontalbarchartitem_p.h~~ renamed 0 0

NO CONTENT: file renamed from src/barchart/horizontalbarchartitem_p.h to src/barchart/horizontal/bar/horizontalbarchartitem_p.h

src/barchart/horizontal/bar/qhorizontalbarseries.cpp ~~src/barchart/qhorizontalbarseries.cpp~~ renamed +20 -27

+            /****************************************************************************
+            **
+            ** Copyright (C) 2012 Digia Plc
+            ** All rights reserved.
+            ** For any questions to Digia, please use contact form at http://qt.digia.com
+            **
+            ** This file is part of the Qt Commercial Charts Add-on.
+            **
+            ** $QT_BEGIN_LICENSE$
+            ** Licensees holding valid Qt Commercial licenses may use this file in
+            ** accordance with the Qt Commercial License Agreement provided with the
+            ** Software or, alternatively, in accordance with the terms contained in
+            ** a written agreement between you and Digia.
+            **
+            ** If you have questions regarding the use of this file, please use
+            ** contact form at http://qt.digia.com
+            ** $QT_END_LICENSE$
+            **
+            ****************************************************************************/
             #include "qhorizontalbarseries.h"
             #include "qhorizontalbarseries_p.h"
             #include "horizontalbarchartitem_p.h"
             #include "horizontalbaranimation_p.h"
             #include "qbarcategoriesaxis.h"
             #include "chartdataset_p.h"
             #include "charttheme_p.h"
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
             QHorizontalBarSeries::QHorizontalBarSeries(QObject *parent) :
                 QAbstractBarSeries(*new QHorizontalBarSeriesPrivate(this), parent)
             {
             }
             QAbstractSeries::SeriesType QHorizontalBarSeries::type() const
             {
                 return QAbstractSeries::SeriesTypeHorizontalBar;
             }
             ///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
             QHorizontalBarSeriesPrivate::QHorizontalBarSeriesPrivate(QHorizontalBarSeries *q) : QAbstractBarSeriesPrivate(q)
             {
             }
             void QHorizontalBarSeriesPrivate::scaleDomain(Domain& domain)
             {
                 qreal minX(domain.minX());
                 qreal minY(domain.minY());
                 qreal maxX(domain.maxX());
                 qreal maxY(domain.maxY());
                 qreal y = categoryCount();
                 qreal x = max();
                 minX = qMin(minX, x);
                 minY = qMin(minY, - (qreal)0.5);
                 maxX = qMax(maxX, x);
                 maxY = qMax(maxY, y - (qreal)0.5);
                 domain.setRange(minX,maxX,minY,maxY);
             }
             Chart* QHorizontalBarSeriesPrivate::createGraphics(ChartPresenter* presenter)
             {
                 Q_Q(QHorizontalBarSeries);
                 HorizontalBarChartItem* bar = new HorizontalBarChartItem(q,presenter);
                 if(presenter->animationOptions().testFlag(QChart::SeriesAnimations)) {
                     bar->setAnimator(presenter->animator());
                     bar->setAnimation(new HorizontalBarAnimation(bar));
                 }
                 presenter->chartTheme()->decorate(q, presenter->dataSet()->seriesIndex(q));
                 return bar;
             }
-            void QHorizontalBarSeriesPrivate::initializeAxis(QAbstractAxis* axis)
-                if(axis->type()==QAbstractAxis::AxisTypeCategories && axis->orientation()==Qt::Vertical)
-                    QBarCategoriesAxis* cataxis = qobject_cast<QBarCategoriesAxis*>(axis);
-                    Q_ASSERT(cataxis);
-                    QStringList categories;
-                    if(cataxis->categories().isEmpty()){
-                    for (int i(1); i < categoryCount()+1; i++)
-                    categories << QString::number(i);
-                    cataxis->append(categories);
-            QAbstractAxis::AxisType QHorizontalBarSeriesPrivate::defaultAxisType(Qt::Orientation orientation) const
-                if(orientation==Qt::Vertical)
-                    return QAbstractAxis::AxisTypeCategories;
-                else
-                    return QAbstractAxis::AxisTypeValues;
             #include "moc_qhorizontalbarseries.cpp"
             QTCOMMERCIALCHART_END_NAMESPACE

src/barchart/horizontal/bar/qhorizontalbarseries.h ~~src/barchart/qhorizontalbarseries.h~~ renamed 0 0

NO CONTENT: file renamed from src/barchart/qhorizontalbarseries.h to src/barchart/horizontal/bar/qhorizontalbarseries.h

src/barchart/horizontal/bar/qhorizontalbarseries_p.h ~~src/barchart/qhorizontalbarseries_p.h~~ renamed 0 -3

             /****************************************************************************
             **
             ** Copyright (C) 2012 Digia Plc
             ** All rights reserved.
             ** For any questions to Digia, please use contact form at http://qt.digia.com
             **
             ** This file is part of the Qt Commercial Charts Add-on.
             **
             ** $QT_BEGIN_LICENSE$
             ** Licensees holding valid Qt Commercial licenses may use this file in
             ** accordance with the Qt Commercial License Agreement provided with the
             ** Software or, alternatively, in accordance with the terms contained in
             ** a written agreement between you and Digia.
             **
             ** If you have questions regarding the use of this file, please use
             ** contact form at http://qt.digia.com
             ** $QT_END_LICENSE$
             **
             ****************************************************************************/
             //  W A R N I N G
             //  -------------
             //
             // This file is not part of the QtCommercial Chart API.  It exists purely as an
             // implementation detail.  This header file may change from version to
             // version without notice, or even be removed.
             //
             // We mean it.
             #ifndef QHORIZONTALBARSERIES_P_H
             #define QHORIZONTALBARSERIES_P_H
             #include "qabstractbarseries_p.h"
             #include "domain_p.h"
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
             class QHorizontalBarSeriesPrivate: public QAbstractBarSeriesPrivate
             {
             public:
                 QHorizontalBarSeriesPrivate(QHorizontalBarSeries* q);
                 Chart* createGraphics(ChartPresenter* presenter);
                 void scaleDomain(Domain& domain);
-                void initializeAxis(QAbstractAxis* axis);
-                QAbstractAxis::AxisType defaultAxisType(Qt::Orientation orientation) const;
             private:
                 Q_DECLARE_PUBLIC(QHorizontalBarSeries)
             };
             QTCOMMERCIALCHART_END_NAMESPACE
             #endif // QHORIZONTALBARSERIES_P_H

src/barchart/horizontal/percent/horizontalpercentbarchartitem.cpp ~~src/barchart/horizontalpercentbarchartitem.cpp~~ renamed 0 0

NO CONTENT: file renamed from src/barchart/horizontalpercentbarchartitem.cpp to src/barchart/horizontal/percent/horizontalpercentbarchartitem.cpp

src/barchart/horizontal/percent/horizontalpercentbarchartitem_p.h ~~src/barchart/horizontalpercentbarchartitem_p.h~~ renamed 0 0

NO CONTENT: file renamed from src/barchart/horizontalpercentbarchartitem_p.h to src/barchart/horizontal/percent/horizontalpercentbarchartitem_p.h

src/barchart/horizontal/percent/qhorizontalpercentbarseries.cpp ~~src/barchart/qhorizontalpercentbarseries.cpp~~ renamed 0 0

NO CONTENT: file renamed from src/barchart/qhorizontalpercentbarseries.cpp to src/barchart/horizontal/percent/qhorizontalpercentbarseries.cpp

src/barchart/horizontal/percent/qhorizontalpercentbarseries.h ~~src/barchart/qhorizontalpercentbarseries.h~~ renamed 0 0

NO CONTENT: file renamed from src/barchart/qhorizontalpercentbarseries.h to src/barchart/horizontal/percent/qhorizontalpercentbarseries.h

src/barchart/horizontal/percent/qhorizontalpercentbarseries_p.h ~~src/barchart/qhorizontalpercentbarseries_p.h~~ renamed 0 -1

             /****************************************************************************
             **
             ** Copyright (C) 2012 Digia Plc
             ** All rights reserved.
             ** For any questions to Digia, please use contact form at http://qt.digia.com
             **
             ** This file is part of the Qt Commercial Charts Add-on.
             **
             ** $QT_BEGIN_LICENSE$
             ** Licensees holding valid Qt Commercial licenses may use this file in
             ** accordance with the Qt Commercial License Agreement provided with the
             ** Software or, alternatively, in accordance with the terms contained in
             ** a written agreement between you and Digia.
             **
             ** If you have questions regarding the use of this file, please use
             ** contact form at http://qt.digia.com
             ** $QT_END_LICENSE$
             **
             ****************************************************************************/
             //  W A R N I N G
             //  -------------
             //
             // This file is not part of the QtCommercial Chart API.  It exists purely as an
             // implementation detail.  This header file may change from version to
             // version without notice, or even be removed.
             //
             // We mean it.
             #ifndef QHORIZONTALPERCENTBARSERIES_P_H
             #define QHORIZONTALPERCENTBARSERIES_P_H
             #include "qabstractbarseries_p.h"
             #include "domain_p.h"
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
             class QHorizontalPercentBarSeriesPrivate: public QAbstractBarSeriesPrivate
             {
             public:
                 QHorizontalPercentBarSeriesPrivate(QHorizontalPercentBarSeries* q);
                 Chart* createGraphics(ChartPresenter* presenter);
                 void scaleDomain(Domain& domain);
             private:
                 Q_DECLARE_PUBLIC(QHorizontalPercentBarSeries)
             };
             QTCOMMERCIALCHART_END_NAMESPACE
             #endif // QHORIZONTALPERCENTBARSERIES_P_H

src/barchart/horizontal/stacked/horizontalstackedbarchartitem.cpp ~~src/barchart/horizontalstackedbarchartitem.cpp~~ renamed 0 0

NO CONTENT: file renamed from src/barchart/horizontalstackedbarchartitem.cpp to src/barchart/horizontal/stacked/horizontalstackedbarchartitem.cpp

src/barchart/horizontal/stacked/horizontalstackedbarchartitem_p.h ~~src/barchart/horizontalstackedbarchartitem_p.h~~ renamed 0 0

NO CONTENT: file renamed from src/barchart/horizontalstackedbarchartitem_p.h to src/barchart/horizontal/stacked/horizontalstackedbarchartitem_p.h

src/barchart/horizontal/stacked/qhorizontalstackedbarseries.cpp ~~src/barchart/qhorizontalstackedbarseries.cpp~~ renamed 0 -11

             #include "qhorizontalstackedbarseries.h"
             #include "qhorizontalstackedbarseries_p.h"
             #include "horizontalstackedbarchartitem_p.h"
             #include "horizontalstackedbaranimation_p.h"
             #include "chartdataset_p.h"
             #include "charttheme_p.h"
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
             QHorizontalStackedBarSeries::QHorizontalStackedBarSeries(QObject *parent) :
                 QAbstractBarSeries(*new QHorizontalStackedBarSeriesPrivate(this), parent)
             {
             }
             QAbstractSeries::SeriesType QHorizontalStackedBarSeries::type() const
             {
                 return QAbstractSeries::SeriesTypeHorizontalStackedBar;
             }
             ///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
             QHorizontalStackedBarSeriesPrivate::QHorizontalStackedBarSeriesPrivate(QHorizontalStackedBarSeries *q) : QAbstractBarSeriesPrivate(q)
             {
             }
             void QHorizontalStackedBarSeriesPrivate::scaleDomain(Domain& domain)
             {
                 qreal minX(domain.minX());
                 qreal minY(domain.minY());
                 qreal maxX(domain.maxX());
                 qreal maxY(domain.maxY());
                 qreal y = categoryCount();
                 qreal x = maxCategorySum();
                 minX = qMin(minX, x);
                 minY = qMin(minY, - (qreal)0.5);
                 maxX = qMax(maxX, x);
                 maxY = qMax(maxY, y - (qreal)0.5);
                 domain.setRange(minX,maxX,minY,maxY);
             }
             Chart* QHorizontalStackedBarSeriesPrivate::createGraphics(ChartPresenter* presenter)
             {
                 Q_Q(QHorizontalStackedBarSeries);
                 HorizontalStackedBarChartItem* bar = new HorizontalStackedBarChartItem(q,presenter);
                 if(presenter->animationOptions().testFlag(QChart::SeriesAnimations)) {
                     bar->setAnimator(presenter->animator());
                     bar->setAnimation(new HorizontalStackedBarAnimation(bar));
                 }
                 presenter->chartTheme()->decorate(q, presenter->dataSet()->seriesIndex(q));
                 return bar;
             }
-            QAbstractAxis::AxisType QHorizontalStackedBarSeriesPrivate::defaultAxisXType() const
-                return QAbstractAxis::AxisTypeValues;
-            QAbstractAxis::AxisType QHorizontalStackedBarSeriesPrivate::defaultAxisYType() const
-                return QAbstractAxis::AxisTypeCategories;
             #include "moc_qhorizontalstackedbarseries.cpp"
             QTCOMMERCIALCHART_END_NAMESPACE

src/barchart/horizontal/stacked/qhorizontalstackedbarseries.h ~~src/barchart/qhorizontalstackedbarseries.h~~ renamed 0 0

NO CONTENT: file renamed from src/barchart/qhorizontalstackedbarseries.h to src/barchart/horizontal/stacked/qhorizontalstackedbarseries.h

src/barchart/horizontal/stacked/qhorizontalstackedbarseries_p.h ~~src/barchart/qhorizontalstackedbarseries_p.h~~ renamed 0 -3

             /****************************************************************************
             **
             ** Copyright (C) 2012 Digia Plc
             ** All rights reserved.
             ** For any questions to Digia, please use contact form at http://qt.digia.com
             **
             ** This file is part of the Qt Commercial Charts Add-on.
             **
             ** $QT_BEGIN_LICENSE$
             ** Licensees holding valid Qt Commercial licenses may use this file in
             ** accordance with the Qt Commercial License Agreement provided with the
             ** Software or, alternatively, in accordance with the terms contained in
             ** a written agreement between you and Digia.
             **
             ** If you have questions regarding the use of this file, please use
             ** contact form at http://qt.digia.com
             ** $QT_END_LICENSE$
             **
             ****************************************************************************/
             //  W A R N I N G
             //  -------------
             //
             // This file is not part of the QtCommercial Chart API.  It exists purely as an
             // implementation detail.  This header file may change from version to
             // version without notice, or even be removed.
             //
             // We mean it.
             #ifndef QHORIZONTALSTACKEDBARSERIES_P_H
             #define QHORIZONTALSTACKEDBARSERIES_P_H
             #include "qabstractbarseries_p.h"
             #include "domain_p.h"
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
             class QHorizontalStackedBarSeriesPrivate: public QAbstractBarSeriesPrivate
             {
             public:
                 QHorizontalStackedBarSeriesPrivate(QHorizontalStackedBarSeries* q);
                 Chart* createGraphics(ChartPresenter* presenter);
                 void scaleDomain(Domain& domain);
-                QAbstractAxis::AxisType defaultAxisXType() const;
-                QAbstractAxis::AxisType defaultAxisYType() const;
             private:
                 Q_DECLARE_PUBLIC(QHorizontalStackedBarSeries)
             };
             QTCOMMERCIALCHART_END_NAMESPACE
             #endif // QHORIZONTALSTACKEDBARSERIES_P_H

src/barchart/qabstractbarseries.cpp +72 -14

             /****************************************************************************
             **
             ** Copyright (C) 2012 Digia Plc
             ** All rights reserved.
             ** For any questions to Digia, please use contact form at http://qt.digia.com
             **
             ** This file is part of the Qt Commercial Charts Add-on.
             **
             ** $QT_BEGIN_LICENSE$
             ** Licensees holding valid Qt Commercial licenses may use this file in
             ** accordance with the Qt Commercial License Agreement provided with the
             ** Software or, alternatively, in accordance with the terms contained in
             ** a written agreement between you and Digia.
             **
             ** If you have questions regarding the use of this file, please use
             ** contact form at http://qt.digia.com
             ** $QT_END_LICENSE$
             **
             ****************************************************************************/
             #include "qabstractbarseries.h"
             #include "qabstractbarseries_p.h"
             #include "qbarset.h"
             #include "qbarset_p.h"
             #include "domain_p.h"
             #include "legendmarker_p.h"
             #include "chartdataset_p.h"
             #include "charttheme_p.h"
             #include "chartanimator_p.h"
             #include "qvaluesaxis.h"
             #include "qbarcategoriesaxis.h"
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
             /*!
                 \class QAbstractBarSeries
                 \brief Series for creating a bar chart
                 \mainclass
                 QAbstractBarSeries represents a series of data shown as bars. The purpose of this class is to draw bars to
                 the position defined by data. Single bar is defined by QPointF, where x value is the x-coordinate of the bar
                 and y-value is the height of the bar. The category names are ignored with this series and x-axis
                 shows the x-values.
                 See the \l {BarChart Example} {bar chart example} to learn how to create a simple bar chart.
                 \image examples_barchart.png
                 \sa QBarSet, QStackedBarSeries, QPercentBarSeries
             */
             /*!
                 \qmlclass AbstractBarSeries QAbstractBarSeries
                 \inherits QAbstractSeries
                 The following QML shows how to create a simple bar chart:
                 \snippet ../demos/qmlchart/qml/qmlchart/View6.qml 1
                 \beginfloatleft
                 \image demos_qmlchart6.png
                 \endfloat
                 \clearfloat
             */
             /*!
                 \property QAbstractBarSeries::barWidth
                 The width of the bars of the series. The unit of \a width is the unit of x-axis. The minimum width for bars
                 is zero and negative values are treated as zero. Setting the width to zero means that width of the bar on screen
                 is one pixel no matter what the scale of x-axis is. Bars wider than zero are scaled with x-axis.
                 Note that with QBarSeries this value means the width of one group of bars instead of just one bar.
                 \sa QBarSeries
             */
             /*!
                 \qmlproperty real AbstractBarSeries::barWidth
                 The width of the bars of the series. The unit of width is the unit of x-axis. The minimum width for bars
                 is zero and negative values are treated as zero. Setting the width to zero means that width of the bar on screen
                 is one pixel no matter what the scale of x-axis is. Bars wider than zero are scaled with x-axis.
                 Note that with QBarSeries this value means the width of one group of bars instead of just one bar.
             */
             /*!
                 \property QAbstractBarSeries::count
                 Holds the number of sets in series.
             */
             /*!
                 \qmlproperty int AbstractBarSeries::count
                 Holds the number of sets in series.
             */
             /*!
                 \property QAbstractBarSeries::labelsVisible
                 Defines the visibility of the labels in series
             */
             /*!
                 \qmlproperty bool AbstractBarSeries::labelsVisible
                 Defines the visibility of the labels in series
             */
             /*!
                 \fn void QAbstractBarSeries::clicked(int index, QBarSet *barset)
                 The signal is emitted if the user clicks with a mouse on top of QBarSet \a barset.
                 Clicked bar inside set is indexed by \a index
             */
             /*!
                 \qmlsignal AbstractBarSeries::onClicked(int index, BarSet barset)
                 The signal is emitted if the user clicks with a mouse on top of BarSet.
                 Clicked bar inside set is indexed by \a index
             */
             /*!
                 \fn void QAbstractBarSeries::hovered(bool status, QBarSet* barset)
                 The signal is emitted if mouse is hovered on top of series.
                 Parameter \a barset is the pointer of barset, where hover happened.
                 Parameter \a status is true, if mouse entered on top of series, false if mouse left from top of series.
             */
             /*!
                 \qmlsignal AbstractBarSeries::onHovered(bool status, BarSet barset)
                 The signal is emitted if mouse is hovered on top of series.
                 Parameter \a barset is the pointer of barset, where hover happened.
                 Parameter \a status is true, if mouse entered on top of series, false if mouse left from top of series.
             */
             /*!
                 \fn void QAbstractBarSeries::countChanged()
                 This signal is emitted when barset count has been changed, for example by append or remove.
             */
             /*!
                 \qmlsignal AbstractBarSeries::onCountChanged()
                 This signal is emitted when barset count has been changed, for example by append or remove.
             */
             /*!
                 \fn void QAbstractBarSeries::labelsVisibleChanged()
                 This signal is emitted when labels visibility have changed.
                 \sa isLabelsVisible(), setLabelsVisible()
             */
             /*!
                 \fn void QAbstractBarSeries::barsetsAdded(QList<QBarSet*> sets)
                 This signal is emitted when \a sets have been added to the series.
                 \sa append(), insert()
             */
             /*!
                 \qmlsignal AbstractBarSeries::onAdded(BarSet barset)
                 Emitted when \a barset has been added to the series.
             */
             /*!
                 \fn void QAbstractBarSeries::barsetsRemoved(QList<QBarSet*> sets)
                 This signal is emitted when \a sets have been removed from the series.
                 \sa remove()
             */
             /*!
                 \qmlsignal AbstractBarSeries::onRemoved(BarSet barset)
                 Emitted when \a barset has been removed from the series.
             */
             /*!
                 \qmlmethod BarSet AbstractBarSeries::at(int index)
                 Returns bar set at \a index. Returns null if the index is not valid.
             */
             /*!
                 \qmlmethod BarSet AbstractBarSeries::append(string label, VariantList values)
                 Adds a new bar set with \a label and \a values to \a index. Values can be a list of reals or a list of XYPoints.
                 For example:
                 \code
                     myBarSeries.append("set 1", [0, 0.2, 0.2, 0.5, 0.4, 1.5, 0.9]);
                     myBarSeries.append("set 2", [Qt.point(0, 1), Qt.point(2, 2.5), Qt.point(3.5, 2.2)]);
                 \endcode
             */
             /*!
                 \qmlmethod BarSet AbstractBarSeries::insert(int index, string label, VariantList values)
                 Inserts a new bar set with \a label and \a values to \a index. Values can be a list of reals or a list of XYPoints.
                 If index is zero or smaller, the new barset is prepended. If the index is count or bigger, the new barset is
                 appended.
                 \sa AbstractBarSeries::append()
             */
             /*!
                 \qmlmethod bool AbstractBarSeries::remove(BarSet barset)
                 Removes the barset from the series. Returns true if successfull, false otherwise.
             */
             /*!
                 \qmlmethod AbstractBarSeries::clear()
                 Removes all barsets from the series.
             */
             /*!
-                Constructs empty QAbstractBarSeries.
+                This is depreciated constructor.
-                QAbstractBarSeries is QObject which is a child of a \a parent.
             */
             QAbstractBarSeries::QAbstractBarSeries(QObject *parent) :
-                QAbstractSeries(*new QAbstractBarSeriesPrivate(this),parent)
+                QAbstractSeries(*(QAbstractBarSeriesPrivate*)(0),parent)
             {
             }
             /*!
                 Destructs abstractbarseries and owned barsets.
             */
             QAbstractBarSeries::~QAbstractBarSeries()
             {
                 Q_D(QAbstractBarSeries);
                 if(d->m_dataset){
                     d->m_dataset->removeSeries(this);
                 }
             }
             /*!
                 \internal
             */
             QAbstractBarSeries::QAbstractBarSeries(QAbstractBarSeriesPrivate &d, QObject *parent) :
                 QAbstractSeries(d,parent)
             {
             }
             /*!
                 Sets the width of the bars of the series. The unit of \a width is the unit of x-axis. The minimum width for bars
                 is zero and negative values are treated as zero. Setting the width to zero means that width of the bar on screen
                 is one pixel no matter what the scale of x-axis is. Bars wider than zero are scaled with x-axis.
                 Note that with \link QBarSeries \endlink this value means the width of one group of bars instead of just one bar.
             */
             void QAbstractBarSeries::setBarWidth(qreal width)
             {
                 Q_D(QAbstractBarSeries);
                 d->setBarWidth(width);
             }
             /*!
                 Returns the width of the bars of the series.
                 \sa setBarWidth()
             */
             qreal QAbstractBarSeries::barWidth() const
             {
                 Q_D(const QAbstractBarSeries);
                 return d->barWidth();
             }
             /*!
                 Adds a set of bars to series. Takes ownership of \a set. If the set is null or is already in series, it won't be appended.
                 Returns true, if appending succeeded.
             */
             bool QAbstractBarSeries::append(QBarSet *set)
             {
                 Q_D(QAbstractBarSeries);
                 bool success = d->append(set);
                 if (success) {
                     QList<QBarSet*> sets;
                     sets.append(set);
                     emit barsetsAdded(sets);
                     emit countChanged();
                 }
                 return success;
             }
             /*!
                 Removes a set of bars from series. Releases ownership of \a set. Doesn't delete \a set.
                 Returns true, if set was removed.
             */
             bool QAbstractBarSeries::remove(QBarSet *set)
             {
                 Q_D(QAbstractBarSeries);
                 bool success = d->remove(set);
                 if (success) {
                     QList<QBarSet*> sets;
                     sets.append(set);
                     emit barsetsRemoved(sets);
                     emit countChanged();
                 }
                 return success;
             }
             /*!
                 Adds a list of barsets to series. Takes ownership of \a sets.
                 Returns true, if all sets were appended succesfully. If any of the sets is null or is already appended to series,
                 nothing is appended and function returns false. If any of the sets is in list more than once, nothing is appended
                 and function returns false.
             */
             bool QAbstractBarSeries::append(QList<QBarSet* > sets)
             {
                 Q_D(QAbstractBarSeries);
                 bool success = d->append(sets);
                 if (success) {
                     emit barsetsAdded(sets);
                     emit countChanged();
                 }
                 return success;
             }
             /*!
                 Insert a set of bars to series at \a index postion. Takes ownership of \a set. If the set is null or is already in series, it won't be appended.
                 Returns true, if inserting succeeded.
             */
             bool QAbstractBarSeries::insert(int index, QBarSet *set)
             {
                 Q_D(QAbstractBarSeries);
                 bool success = d->insert(index, set);
                 if (success) {
                     QList<QBarSet*> sets;
                     sets.append(set);
                     emit barsetsAdded(sets);
                     emit countChanged();
                 }
                 return success;
             }
             /*!
                 Removes all of the bar sets from the series
             */
             void QAbstractBarSeries::clear()
             {
                 Q_D(QAbstractBarSeries);
                 QList<QBarSet *> sets = barSets();
                 bool success = d->remove(sets);
                 if (success) {
                     emit barsetsRemoved(sets);
                     emit countChanged();
                 }
             }
             /*!
                 Returns number of sets in series.
             */
             int QAbstractBarSeries::count() const
             {
                 Q_D(const QAbstractBarSeries);
                 return d->m_barSets.count();
             }
             /*!
                 Returns a list of sets in series. Keeps ownership of sets.
              */
             QList<QBarSet*> QAbstractBarSeries::barSets() const
             {
                 Q_D(const QAbstractBarSeries);
                 return d->m_barSets;
             }
             /*!
                 Sets the visibility of labels in series to \a visible
             */
             void QAbstractBarSeries::setLabelsVisible(bool visible)
             {
                 Q_D(QAbstractBarSeries);
                 if (d->m_labelsVisible != visible) {
                     d->setLabelsVisible(visible);
                     emit labelsVisibleChanged();
                 }
             }
             /*!
                 Returns the visibility of labels
             */
             bool QAbstractBarSeries::isLabelsVisible() const
             {
                 Q_D(const QAbstractBarSeries);
                 return d->m_labelsVisible;
             }
             ///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
             QAbstractBarSeriesPrivate::QAbstractBarSeriesPrivate(QAbstractBarSeries *q) :
                 QAbstractSeriesPrivate(q),
                 m_barWidth(0.5),  // Default value is 50% of category width
                 m_labelsVisible(false),
                 m_visible(true)
             {
             }
             int QAbstractBarSeriesPrivate::categoryCount() const
             {
                 // No categories defined. return count of longest set.
                 int count = 0;
                 for (int i=0; i<m_barSets.count(); i++) {
                     if (m_barSets.at(i)->count() > count) {
                         count = m_barSets.at(i)->count();
                     }
                 }
                 return count;
             }
             void QAbstractBarSeriesPrivate::setBarWidth(qreal width)
             {
                 if (width < 0.0) {
                     width = 0.0;
                 }
                 m_barWidth = width;
                 emit updatedBars();
             }
             qreal QAbstractBarSeriesPrivate::barWidth() const
             {
                 return m_barWidth;
             }
             QBarSet* QAbstractBarSeriesPrivate::barsetAt(int index)
             {
                 return m_barSets.at(index);
             }
             void QAbstractBarSeriesPrivate::setVisible(bool visible)
             {
                 m_visible = visible;
                 emit updatedBars();
             }
             void QAbstractBarSeriesPrivate::setLabelsVisible(bool visible)
             {
                 m_labelsVisible = visible;
                 emit labelsVisibleChanged(visible);
             }
             qreal QAbstractBarSeriesPrivate::min()
             {
                 if (m_barSets.count() <= 0) {
                     return 0;
                 }
                 qreal min = INT_MAX;
                 for (int i = 0; i < m_barSets.count(); i++) {
                     int categoryCount = m_barSets.at(i)->count();
                     for (int j = 0; j < categoryCount; j++) {
                         qreal temp = m_barSets.at(i)->at(j);
                         if (temp < min)
                             min = temp;
                     }
                 }
                 return min;
             }
             qreal QAbstractBarSeriesPrivate::max()
             {
                 if (m_barSets.count() <= 0) {
                     return 0;
                 }
                 qreal max = INT_MIN;
                 for (int i = 0; i < m_barSets.count(); i++) {
                     int categoryCount = m_barSets.at(i)->count();
                     for (int j = 0; j < categoryCount; j++) {
                         qreal temp = m_barSets.at(i)->at(j);
                         if (temp > max)
                             max = temp;
                     }
                 }
                 return max;
             }
             qreal QAbstractBarSeriesPrivate::valueAt(int set, int category)
             {
                 if ((set < 0) || (set >= m_barSets.count())) {
                     // No set, no value.
                     return 0;
                 } else if ((category < 0) || (category >= m_barSets.at(set)->count())) {
                     // No category, no value.
                     return 0;
                 }
                 return m_barSets.at(set)->at(category);
             }
             qreal QAbstractBarSeriesPrivate::percentageAt(int set, int category)
             {
                 if ((set < 0) || (set >= m_barSets.count())) {
                     // No set, no value.
                     return 0;
                 } else if ((category < 0) || (category >= m_barSets.at(set)->count())) {
                     // No category, no value.
                     return 0;
                 }
                 qreal value = m_barSets.at(set)->at(category);
                 qreal sum = categorySum(category);
                 if ( qFuzzyIsNull(sum) ) {
                     return 0;
                 }
                 return value / sum;
             }
             qreal QAbstractBarSeriesPrivate::categorySum(int category)
             {
                 qreal sum(0);
                 int count = m_barSets.count(); // Count sets
                 for (int set = 0; set < count; set++) {
                     if (category < m_barSets.at(set)->count())
                         sum += m_barSets.at(set)->at(category);
                 }
                 return sum;
             }
             qreal QAbstractBarSeriesPrivate::absoluteCategorySum(int category)
             {
                 qreal sum(0);
                 int count = m_barSets.count(); // Count sets
                 for (int set = 0; set < count; set++) {
                     if (category < m_barSets.at(set)->count())
                         sum += qAbs(m_barSets.at(set)->at(category));
                 }
                 return sum;
             }
             qreal QAbstractBarSeriesPrivate::maxCategorySum()
             {
                 qreal max = INT_MIN;
                 int count = categoryCount();
                 for (int i = 0; i < count; i++) {
                     qreal sum = categorySum(i);
                     if (sum > max)
                         max = sum;
                 }
                 return max;
             }
             qreal QAbstractBarSeriesPrivate::minX()
             {
                 if (m_barSets.count() <= 0) {
                     return 0;
                 }
                 qreal min = INT_MAX;
                 for (int i = 0; i < m_barSets.count(); i++) {
                     int categoryCount = m_barSets.at(i)->count();
                     for (int j = 0; j < categoryCount; j++) {
                         qreal temp = m_barSets.at(i)->d_ptr.data()->m_values.at(j).x();
                         if (temp < min)
                             min = temp;
                     }
                 }
                 return min;
             }
             qreal QAbstractBarSeriesPrivate::maxX()
             {
                 if (m_barSets.count() <= 0) {
                     return 0;
                 }
                 qreal max = INT_MIN;
                 for (int i = 0; i < m_barSets.count(); i++) {
                     int categoryCount = m_barSets.at(i)->count();
                     for (int j = 0; j < categoryCount; j++) {
                         qreal temp = m_barSets.at(i)->d_ptr.data()->m_values.at(j).x();
                         if (temp > max)
                             max = temp;
                     }
                 }
                 return max;
             }
             void QAbstractBarSeriesPrivate::scaleDomain(Domain& domain)
             {
                 qreal minX(domain.minX());
                 qreal minY(domain.minY());
                 qreal maxX(domain.maxX());
                 qreal maxY(domain.maxY());
                 qreal seriesMinX = this->minX();
                 qreal seriesMaxX = this->maxX();
                 qreal y = max();
                 minX = qMin(minX, seriesMinX - (qreal)0.5);
                 minY = qMin(minY, y);
                 maxX = qMax(maxX, seriesMaxX + (qreal)0.5);
                 maxY = qMax(maxY, y);
                 domain.setRange(minX,maxX,minY,maxY);
             }
             Chart* QAbstractBarSeriesPrivate::createGraphics(ChartPresenter* presenter)
             {
                 Q_UNUSED(presenter);
                 qWarning() << "QAbstractBarSeriesPrivate::createGraphics called";
                 return 0;
             }
             QList<LegendMarker*> QAbstractBarSeriesPrivate::createLegendMarker(QLegend* legend)
             {
                 Q_Q(QAbstractBarSeries);
                 QList<LegendMarker*> markers;
                 foreach(QBarSet* set, q->barSets()) {
                     BarLegendMarker* marker = new BarLegendMarker(q,set,legend);
                     markers << marker;
                 }
                 return markers;
             }
             bool QAbstractBarSeriesPrivate::append(QBarSet *set)
             {
                 Q_Q(QAbstractBarSeries);
                 if ((m_barSets.contains(set)) || (set == 0)) {
                     // Fail if set is already in list or set is null.
                     return false;
                 }
                 m_barSets.append(set);
                 QObject::connect(set->d_ptr.data(), SIGNAL(updatedBars()), this, SIGNAL(updatedBars()));
                 QObject::connect(set->d_ptr.data(), SIGNAL(restructuredBars()), this, SIGNAL(restructuredBars()));
                 emit restructuredBars();      // this notifies barchartitem
                 if (m_dataset) {
                     m_dataset->updateSeries(q);   // this notifies legend
                 }
                 return true;
             }
             bool QAbstractBarSeriesPrivate::remove(QBarSet *set)
             {
                 Q_Q(QAbstractBarSeries);
                 if (!m_barSets.contains(set)) {
                     // Fail if set is not in list
                     return false;
                 }
                 m_barSets.removeOne(set);
                 QObject::disconnect(set->d_ptr.data(), SIGNAL(updatedBars()), this, SIGNAL(updatedBars()));
                 QObject::disconnect(set->d_ptr.data(), SIGNAL(restructuredBars()), this, SIGNAL(restructuredBars()));
                 emit restructuredBars();        // this notifies barchartitem
                 if (m_dataset) {
                     m_dataset->updateSeries(q);   // this notifies legend
                 }
                 return true;
             }
             bool QAbstractBarSeriesPrivate::append(QList<QBarSet* > sets)
             {
                 Q_Q(QAbstractBarSeries);
                 foreach (QBarSet* set, sets) {
                     if ((set == 0) || (m_barSets.contains(set))) {
                         // Fail if any of the sets is null or is already appended.
                         return false;
                     }
                     if (sets.count(set) != 1) {
                         // Also fail if same set is more than once in given list.
                         return false;
                     }
                 }
                 foreach (QBarSet* set, sets) {
                     m_barSets.append(set);
                     QObject::connect(set->d_ptr.data(), SIGNAL(updatedBars()), this, SIGNAL(updatedBars()));
                     QObject::connect(set->d_ptr.data(), SIGNAL(restructuredBars()), this, SIGNAL(restructuredBars()));
                 }
                 emit restructuredBars();        // this notifies barchartitem
                 if (m_dataset) {
                     m_dataset->updateSeries(q);   // this notifies legend
                 }
                 return true;
             }
             bool QAbstractBarSeriesPrivate::remove(QList<QBarSet* > sets)
             {
                 Q_Q(QAbstractBarSeries);
                 if (sets.count() == 0) {
                     return false;
                 }
                 foreach (QBarSet* set, sets) {
                     if ((set == 0) || (!m_barSets.contains(set))) {
                         // Fail if any of the sets is null or is not in series
                         return false;
                     }
                     if (sets.count(set) != 1) {
                         // Also fail if same set is more than once in given list.
                         return false;
                     }
                 }
                 foreach (QBarSet* set, sets) {
                     m_barSets.removeOne(set);
                     QObject::disconnect(set->d_ptr.data(), SIGNAL(updatedBars()), this, SIGNAL(updatedBars()));
                     QObject::disconnect(set->d_ptr.data(), SIGNAL(restructuredBars()), this, SIGNAL(restructuredBars()));
                 }
                 emit restructuredBars();        // this notifies barchartitem
                 if (m_dataset) {
                     m_dataset->updateSeries(q);   // this notifies legend
                 }
                 return true;
             }
             bool QAbstractBarSeriesPrivate::insert(int index, QBarSet *set)
             {
                 Q_Q(QAbstractBarSeries);
                 if ((m_barSets.contains(set)) || (set == 0)) {
                     // Fail if set is already in list or set is null.
                     return false;
                 }
                 m_barSets.insert(index, set);
                 QObject::connect(set->d_ptr.data(), SIGNAL(updatedBars()), this, SIGNAL(updatedBars()));
                 QObject::connect(set->d_ptr.data(), SIGNAL(restructuredBars()), this, SIGNAL(restructuredBars()));
                 emit restructuredBars();      // this notifies barchartitem
                 if (m_dataset) {
                     m_dataset->updateSeries(q);   // this notifies legend
                 }
                 return true;
             }
             void QAbstractBarSeriesPrivate::initializeAxis(QAbstractAxis* axis)
             {
-                if(axis->type()==QAbstractAxis::AxisTypeCategories && axis->orientation()==Qt::Horizontal)
+                Q_Q(QAbstractBarSeries);
-                    QBarCategoriesAxis* cataxis = qobject_cast<QBarCategoriesAxis*>(axis);
+                if(axis->type()==QAbstractAxis::AxisTypeCategories) {
-                    Q_ASSERT(cataxis);
-                    QStringList categories;
+                    switch(q->type()) {
-                    if(cataxis->categories().isEmpty()){
-                    for (int i(1); i < categoryCount()+1; i++)
+                        case QAbstractSeries::SeriesTypeHorizontalBar:
-                    categories << QString::number(i);
+                        case QAbstractSeries::SeriesTypeHorizontalPercentBar:
-                    cataxis->append(categories);
+                        case QAbstractSeries::SeriesTypeHorizontalStackedBar: {
+                            if(axis->orientation()==Qt::Vertical)
+                            {
+                                populateCategories(qobject_cast<QBarCategoriesAxis*>(axis));
+                            }
+                            break;
+                        }
+                        case QAbstractSeries::SeriesTypeBar:
+                        case QAbstractSeries::SeriesTypePercentBar:
+                        case QAbstractSeries::SeriesTypeStackedBar: {
+                            if(axis->orientation()==Qt::Horizontal)
+                            {
+                                populateCategories(qobject_cast<QBarCategoriesAxis*>(axis));
+                            }
+                            break;
+                        }
+                        default:
+                        qWarning()<<"Unexpected series type";
+                        break;
                     }
                 }
             }
             QAbstractAxis::AxisType QAbstractBarSeriesPrivate::defaultAxisType(Qt::Orientation orientation) const
             {
-                Q_UNUSED(orientation);
+                Q_Q(const QAbstractBarSeries);
-                return QAbstractAxis::AxisTypeNoAxis;
+                switch(q->type()) {
+                    case QAbstractSeries::SeriesTypeHorizontalBar:
+                    case QAbstractSeries::SeriesTypeHorizontalPercentBar:
+                    case QAbstractSeries::SeriesTypeHorizontalStackedBar: {
+                        if(orientation==Qt::Vertical)
+                        {
+                            return QAbstractAxis::AxisTypeCategories;
+                        }
+                        break;
+                    }
+                    case QAbstractSeries::SeriesTypeBar:
+                    case QAbstractSeries::SeriesTypePercentBar:
+                    case QAbstractSeries::SeriesTypeStackedBar: {
+                        if(orientation==Qt::Horizontal)
+                        {
+                            return QAbstractAxis::AxisTypeCategories;
+                        }
+                        break;
+                    }
+                    default:
+                    qWarning()<<"Unexpected series type";
+                    break;
+                }
+                return QAbstractAxis::AxisTypeValues;
             }
+            void QAbstractBarSeriesPrivate::populateCategories(QBarCategoriesAxis* axis)
+            {
+                QStringList categories;
+                if(axis->categories().isEmpty()) {
+                    for (int i(1); i < categoryCount()+1; i++)
+                    categories << QString::number(i);
+                    axis->append(categories);
+                }
+            }
             #include "moc_qabstractbarseries.cpp"
             #include "moc_qabstractbarseries_p.cpp"
             QTCOMMERCIALCHART_END_NAMESPACE

src/barchart/qabstractbarseries.h +1 0

             /****************************************************************************
             **
             ** Copyright (C) 2012 Digia Plc
             ** All rights reserved.
             ** For any questions to Digia, please use contact form at http://qt.digia.com
             **
             ** This file is part of the Qt Commercial Charts Add-on.
             **
             ** $QT_BEGIN_LICENSE$
             ** Licensees holding valid Qt Commercial licenses may use this file in
             ** accordance with the Qt Commercial License Agreement provided with the
             ** Software or, alternatively, in accordance with the terms contained in
             ** a written agreement between you and Digia.
             **
             ** If you have questions regarding the use of this file, please use
             ** contact form at http://qt.digia.com
             ** $QT_END_LICENSE$
             **
             ****************************************************************************/
             #ifndef ABSTRACTBARSERIES_H
             #define ABSTRACTBARSERIES_H
             #include <qabstractseries.h>
             #include <QStringList>
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
             class QBarSet;
             class QAbstractBarSeriesPrivate;
             // Container for series
             class QTCOMMERCIALCHART_EXPORT QAbstractBarSeries : public QAbstractSeries
             {
                 Q_OBJECT
                 Q_PROPERTY(qreal barWidth READ barWidth WRITE setBarWidth)
                 Q_PROPERTY(int count READ count NOTIFY countChanged)
                 Q_PROPERTY(bool labelsVisible READ isLabelsVisible WRITE setLabelsVisible NOTIFY labelsVisibleChanged)
             protected:
+                //TODO DEPRECIATED
                 explicit QAbstractBarSeries(QObject *parent = 0);
             public:
                 virtual ~QAbstractBarSeries();
                 void setBarWidth(qreal width);
                 qreal barWidth() const;
                 bool append(QBarSet *set);
                 bool remove(QBarSet *set);
                 bool append(QList<QBarSet* > sets);
                 bool insert(int index, QBarSet *set);
                 int count() const;
                 QList<QBarSet*> barSets() const;
                 void clear();
                 void setLabelsVisible(bool visible = true);
                 bool isLabelsVisible() const;
             protected:
                 explicit QAbstractBarSeries(QAbstractBarSeriesPrivate &d,QObject *parent = 0);
             Q_SIGNALS:
                 void clicked(int index, QBarSet *barset);
                 void hovered(bool status, QBarSet *barset);
                 void countChanged();
                 void labelsVisibleChanged();
                 void barsetsAdded(QList<QBarSet*> sets);
                 void barsetsRemoved(QList<QBarSet*> sets);
             protected:
                 Q_DECLARE_PRIVATE(QAbstractBarSeries)
                 friend class AbstractBarChartItem;
                 friend class PercentBarChartItem;
                 friend class StackedBarChartItem;
                 friend class BarChartItem;
                 friend class HorizontalBarChartItem;
                 friend class HorizontalStackedBarChartItem;
                 friend class HorizontalPercentBarChartItem;
             };
             QTCOMMERCIALCHART_END_NAMESPACE
             #endif // ABSTRACTBARSERIES_H

src/barchart/qabstractbarseries_p.h +4 0

             /****************************************************************************
             **
             ** Copyright (C) 2012 Digia Plc
             ** All rights reserved.
             ** For any questions to Digia, please use contact form at http://qt.digia.com
             **
             ** This file is part of the Qt Commercial Charts Add-on.
             **
             ** $QT_BEGIN_LICENSE$
             ** Licensees holding valid Qt Commercial licenses may use this file in
             ** accordance with the Qt Commercial License Agreement provided with the
             ** Software or, alternatively, in accordance with the terms contained in
             ** a written agreement between you and Digia.
             **
             ** If you have questions regarding the use of this file, please use
             ** contact form at http://qt.digia.com
             ** $QT_END_LICENSE$
             **
             ****************************************************************************/
             //  W A R N I N G
             //  -------------
             //
             // This file is not part of the QtCommercial Chart API.  It exists purely as an
             // implementation detail.  This header file may change from version to
             // version without notice, or even be removed.
             //
             // We mean it.
             #ifndef QABSTRACTBARSERIES_P_H
             #define QABSTRACTBARSERIES_P_H
             #include "qabstractbarseries.h"
             #include "qabstractseries_p.h"
             #include <QStringList>
             #include <QAbstractSeries>
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
             class QBarModelMapper;
+            class QBarCategoriesAxis;
             class QAbstractBarSeriesPrivate : public QAbstractSeriesPrivate
             {
                 Q_OBJECT
             public:
                 QAbstractBarSeriesPrivate(QAbstractBarSeries *parent);
                 int categoryCount() const;
                 void setBarWidth(qreal width);
                 qreal barWidth() const;
                 void setVisible(bool visible);
                 void setLabelsVisible(bool visible);
                 void scaleDomain(Domain& domain);
                 Chart* createGraphics(ChartPresenter* presenter);
                 QList<LegendMarker*> createLegendMarker(QLegend* legend);
                 void initializeAxis(QAbstractAxis* axis);
                 QAbstractAxis::AxisType defaultAxisType(Qt::Orientation orientation) const;
                 bool append(QBarSet *set);
                 bool remove(QBarSet *set);
                 bool append(QList<QBarSet* > sets);
                 bool remove(QList<QBarSet* > sets);
                 bool insert(int index, QBarSet *set);
                 QBarSet* barsetAt(int index);
                 qreal min();
                 qreal max();
                 qreal valueAt(int set, int category);
                 qreal percentageAt(int set, int category);
                 qreal categorySum(int category);
                 qreal absoluteCategorySum(int category);
                 qreal maxCategorySum();
                 qreal minX();
                 qreal maxX();
             Q_SIGNALS:
                 void clicked(int index, QBarSet *barset);
                 void updatedBars();
                 void restructuredBars();
                 void labelsVisibleChanged(bool visible);
+            private:
+                void populateCategories(QBarCategoriesAxis* axis);
             protected:
                 QList<QBarSet *> m_barSets;
                 qreal m_barWidth;
                 bool m_labelsVisible;
                 bool m_visible;
             private:
                 Q_DECLARE_PUBLIC(QAbstractBarSeries)
             };
             QTCOMMERCIALCHART_END_NAMESPACE
             #endif // QABSTRACTBARSERIES_P_H

src/barchart/vertical/bar/barchartitem.cpp ~~src/barchart/barchartitem.cpp~~ renamed 0 0

NO CONTENT: file renamed from src/barchart/barchartitem.cpp to src/barchart/vertical/bar/barchartitem.cpp

src/barchart/vertical/bar/barchartitem_p.h ~~src/barchart/barchartitem_p.h~~ renamed 0 0

NO CONTENT: file renamed from src/barchart/barchartitem_p.h to src/barchart/vertical/bar/barchartitem_p.h

src/barchart/vertical/bar/qbarseries.cpp ~~src/barchart/qbarseries.cpp~~ renamed +1 -8

             /****************************************************************************
             **
             ** Copyright (C) 2012 Digia Plc
             ** All rights reserved.
             ** For any questions to Digia, please use contact form at http://qt.digia.com
             **
             ** This file is part of the Qt Commercial Charts Add-on.
             **
             ** $QT_BEGIN_LICENSE$
             ** Licensees holding valid Qt Commercial licenses may use this file in
             ** accordance with the Qt Commercial License Agreement provided with the
             ** Software or, alternatively, in accordance with the terms contained in
             ** a written agreement between you and Digia.
             **
             ** If you have questions regarding the use of this file, please use
             ** contact form at http://qt.digia.com
             ** $QT_END_LICENSE$
             **
             ****************************************************************************/
             #include "qbarseries.h"
             #include "qbarseries_p.h"
             #include "barchartitem_p.h"
             #include "chartdataset_p.h"
             #include "charttheme_p.h"
             #include "chartanimator_p.h"
             #include "baranimation_p.h"
             #include "qvaluesaxis.h"
+            #include "qbarcategoriesaxis.h"
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
             /*!
                 \class QBarSeries
                 \brief Series for creating bar chart
                 \mainclass
                 QBarSeries represents a series of data shown as bars. The purpose of this class is to draw bars
                 as groups, where bars in same category are grouped next to each other. QBarSeries groups the data
                 from sets to categories, which are defined by a QStringList.
                 See the \l {BarChart Example} {bar chart example} to learn how to create a grouped bar chart.
                 \image examples_barchart.png
                 \sa QBarSet, QPercentBarSeries, QAbstractBarSeries, QStackedBarSeries
             */
             /*!
                 \qmlclass BarSeries QBarSeries
                 \inherits AbstractBarSeries
                 The following QML shows how to create a simple grouped bar chart:
                 \snippet ../demos/qmlchart/qml/qmlchart/View6.qml 1
                 \beginfloatleft
                 \image demos_qmlchart6.png
                 \endfloat
                 \clearfloat
             */
             /*!
                 Constructs empty QBarSeries.
                 QBarSeries is QObject which is a child of a \a parent.
             */
             QBarSeries::QBarSeries(QObject *parent)
                 : QAbstractBarSeries(*new QBarSeriesPrivate(this), parent)
             {
             }
             /*!
                 Returns QChartSeries::SeriesTypeBar.
             */
             QAbstractSeries::SeriesType QBarSeries::type() const
             {
                 return QAbstractSeries::SeriesTypeBar;
             }
             ///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
             QBarSeriesPrivate::QBarSeriesPrivate(QBarSeries *q) : QAbstractBarSeriesPrivate(q)
             {
             }
             void QBarSeriesPrivate::scaleDomain(Domain& domain)
             {
                 qreal minX(domain.minX());
                 qreal minY(domain.minY());
                 qreal maxX(domain.maxX());
                 qreal maxY(domain.maxY());
                 qreal x = categoryCount();
                 qreal y = max();
                 minX = qMin(minX, - (qreal)0.5);
                 minY = qMin(minY, y);
                 maxX = qMax(maxX, x - (qreal)0.5);
                 maxY = qMax(maxY, y);
                 domain.setRange(minX,maxX,minY,maxY);
             }
             Chart* QBarSeriesPrivate::createGraphics(ChartPresenter* presenter)
             {
                 Q_Q(QBarSeries);
                 BarChartItem* bar = new BarChartItem(q,presenter);
                 if(presenter->animationOptions().testFlag(QChart::SeriesAnimations)) {
                     bar->setAnimator(presenter->animator());
                     bar->setAnimation(new BarAnimation(bar));
                 }
                 presenter->chartTheme()->decorate(q, presenter->dataSet()->seriesIndex(q));
                 return bar;
             }
-            QAbstractAxis::AxisType QBarSeriesPrivate::defaultAxisType(Qt::Orientation orientation) const
-                if(orientation==Qt::Horizontal)
-                    return QAbstractAxis::AxisTypeCategories;
-                else
-                    return QAbstractAxis::AxisTypeValues;
             #include "moc_qbarseries.cpp"
             QTCOMMERCIALCHART_END_NAMESPACE

src/barchart/vertical/bar/qbarseries.h ~~src/barchart/qbarseries.h~~ renamed 0 0

NO CONTENT: file renamed from src/barchart/qbarseries.h to src/barchart/vertical/bar/qbarseries.h

src/barchart/vertical/bar/qbarseries_p.h ~~src/barchart/qbarseries_p.h~~ renamed 0 -4

             /****************************************************************************
             **
             ** Copyright (C) 2012 Digia Plc
             ** All rights reserved.
             ** For any questions to Digia, please use contact form at http://qt.digia.com
             **
             ** This file is part of the Qt Commercial Charts Add-on.
             **
             ** $QT_BEGIN_LICENSE$
             ** Licensees holding valid Qt Commercial licenses may use this file in
             ** accordance with the Qt Commercial License Agreement provided with the
             ** Software or, alternatively, in accordance with the terms contained in
             ** a written agreement between you and Digia.
             **
             ** If you have questions regarding the use of this file, please use
             ** contact form at http://qt.digia.com
             ** $QT_END_LICENSE$
             **
             ****************************************************************************/
             //  W A R N I N G
             //  -------------
             //
             // This file is not part of the QtCommercial Chart API.  It exists purely as an
             // implementation detail.  This header file may change from version to
             // version without notice, or even be removed.
             //
             // We mean it.
             #ifndef QBARSERIES_P_H
             #define QBARSERIES_P_H
             #include "qabstractbarseries_p.h"
             #include "domain_p.h"
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
             class QBarSeriesPrivate: public QAbstractBarSeriesPrivate
             {
             public:
                 QBarSeriesPrivate(QBarSeries* q);
                 Chart* createGraphics(ChartPresenter* presenter);
                 void scaleDomain(Domain& domain);
-                QAbstractAxis::AxisType defaultAxisType(Qt::Orientation orientation) const;
             private:
                 Q_DECLARE_PUBLIC(QBarSeries)
             };
             QTCOMMERCIALCHART_END_NAMESPACE
             #endif // QBARSERIES_P_H

src/barchart/vertical/percent/percentbarchartitem.cpp ~~src/barchart/percentbarchartitem.cpp~~ renamed 0 0

NO CONTENT: file renamed from src/barchart/percentbarchartitem.cpp to src/barchart/vertical/percent/percentbarchartitem.cpp

src/barchart/vertical/percent/percentbarchartitem_p.h ~~src/barchart/percentbarchartitem_p.h~~ renamed 0 0

NO CONTENT: file renamed from src/barchart/percentbarchartitem_p.h to src/barchart/vertical/percent/percentbarchartitem_p.h

src/barchart/vertical/percent/qpercentbarseries.cpp ~~src/barchart/qpercentbarseries.cpp~~ renamed 0 -9

             /****************************************************************************
             **
             ** Copyright (C) 2012 Digia Plc
             ** All rights reserved.
             ** For any questions to Digia, please use contact form at http://qt.digia.com
             **
             ** This file is part of the Qt Commercial Charts Add-on.
             **
             ** $QT_BEGIN_LICENSE$
             ** Licensees holding valid Qt Commercial licenses may use this file in
             ** accordance with the Qt Commercial License Agreement provided with the
             ** Software or, alternatively, in accordance with the terms contained in
             ** a written agreement between you and Digia.
             **
             ** If you have questions regarding the use of this file, please use
             ** contact form at http://qt.digia.com
             ** $QT_END_LICENSE$
             **
             ****************************************************************************/
             #include "qpercentbarseries.h"
             #include "qpercentbarseries_p.h"
             #include "percentbarchartitem_p.h"
             #include "chartdataset_p.h"
             #include "charttheme_p.h"
             #include "chartanimator_p.h"
             #include "qvaluesaxis.h"
             #include "percentbaranimation_p.h"
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
             /*!
                 \class QPercentBarSeries
                 \brief Series for creating percent bar chart
                 \mainclass
                 QPercentBarSeries represents a series of data shown as bars. The purpose of this class is to draw bars
                 as stacks, where each bar is shown as percentage of all bars in that category.
                 QPercentBarSeries groups the data from sets to categories, which are defined by a QStringList.
                 See the \l {PercentbarChart Example} {percent bar chart example} to learn how to create a percent bar chart.
                 \image examples_percentbarchart.png
                 \sa QBarSet, QStackedBarSeries, QAbstractBarSeries
             */
             /*!
                 \qmlclass PercentBarSeries QPercentBarSeries
                 \inherits QAbstractBarSeries
                 The following QML shows how to create a simple percent bar chart:
                 \snippet ../demos/qmlchart/qml/qmlchart/View8.qml 1
                 \beginfloatleft
                 \image demos_qmlchart8.png
                 \endfloat
                 \clearfloat
             */
             /*!
                 Constructs empty QPercentBarSeries.
                 QPercentBarSeries is QObject which is a child of a \a parent.
             */
             QPercentBarSeries::QPercentBarSeries(QObject *parent)
                 : QAbstractBarSeries(*new QPercentBarSeriesPrivate(this), parent)
             {
             }
             /*!
                 Returns QChartSeries::SeriesTypePercentBar.
             */
             QAbstractSeries::SeriesType QPercentBarSeries::type() const
             {
                 return QAbstractSeries::SeriesTypePercentBar;
             }
             ///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
             QPercentBarSeriesPrivate::QPercentBarSeriesPrivate(QPercentBarSeries *q) : QAbstractBarSeriesPrivate(q)
             {
             }
             void QPercentBarSeriesPrivate::scaleDomain(Domain& domain)
             {
                 qreal minX(domain.minX());
                 qreal minY(domain.minY());
                 qreal maxX(domain.maxX());
                 qreal maxY(domain.maxY());
                 qreal x = categoryCount();
                 minX = qMin(minX, - (qreal)0.5);
                 maxX = qMax(maxX, x - (qreal)0.5);
                 minY = 0;
                 maxY = 100;
                 domain.setRange(minX,maxX,minY,maxY);
             }
             Chart* QPercentBarSeriesPrivate::createGraphics(ChartPresenter* presenter)
             {
                 Q_Q(QPercentBarSeries);
                 PercentBarChartItem* bar = new PercentBarChartItem(q,presenter);
                 if(presenter->animationOptions().testFlag(QChart::SeriesAnimations)) {
                     bar->setAnimator(presenter->animator());
                     bar->setAnimation(new PercentBarAnimation(bar));
                 }
                 presenter->chartTheme()->decorate(q, presenter->dataSet()->seriesIndex(q));
                 return bar;
             }
-            QAbstractAxis::AxisType QPercentBarSeriesPrivate::defaultAxisType(Qt::Orientation orientation) const
-                if(orientation==Qt::Horizontal)
-                    return QAbstractAxis::AxisTypeCategories;
-                else
-                    return QAbstractAxis::AxisTypeValues;
             #include "moc_qpercentbarseries.cpp"
             QTCOMMERCIALCHART_END_NAMESPACE

src/barchart/vertical/percent/qpercentbarseries.h ~~src/barchart/qpercentbarseries.h~~ renamed 0 0

NO CONTENT: file renamed from src/barchart/qpercentbarseries.h to src/barchart/vertical/percent/qpercentbarseries.h

src/barchart/vertical/percent/qpercentbarseries_p.h ~~src/barchart/qpercentbarseries_p.h~~ renamed 0 -2

             /****************************************************************************
             **
             ** Copyright (C) 2012 Digia Plc
             ** All rights reserved.
             ** For any questions to Digia, please use contact form at http://qt.digia.com
             **
             ** This file is part of the Qt Commercial Charts Add-on.
             **
             ** $QT_BEGIN_LICENSE$
             ** Licensees holding valid Qt Commercial licenses may use this file in
             ** accordance with the Qt Commercial License Agreement provided with the
             ** Software or, alternatively, in accordance with the terms contained in
             ** a written agreement between you and Digia.
             **
             ** If you have questions regarding the use of this file, please use
             ** contact form at http://qt.digia.com
             ** $QT_END_LICENSE$
             **
             ****************************************************************************/
             //  W A R N I N G
             //  -------------
             //
             // This file is not part of the QtCommercial Chart API.  It exists purely as an
             // implementation detail.  This header file may change from version to
             // version without notice, or even be removed.
             //
             // We mean it.
             #ifndef QPERCENTBARSERIES_P_H
             #define QPERCENTBARSERIES_P_H
             #include "qabstractbarseries_p.h"
             #include "domain_p.h"
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
             class QPercentBarSeriesPrivate: public QAbstractBarSeriesPrivate
             {
             public:
                 QPercentBarSeriesPrivate(QPercentBarSeries* q);
                 void scaleDomain(Domain& domain);
                 Chart* createGraphics(ChartPresenter* presenter);
-                QAbstractAxis::AxisType defaultAxisType(Qt::Orientation orientation) const;
             private:
                 Q_DECLARE_PUBLIC(QPercentBarSeries)
             };
             QTCOMMERCIALCHART_END_NAMESPACE
             #endif

src/barchart/vertical/stacked/qstackedbarseries.cpp ~~src/barchart/qstackedbarseries.cpp~~ renamed 0 -9

             /****************************************************************************
             **
             ** Copyright (C) 2012 Digia Plc
             ** All rights reserved.
             ** For any questions to Digia, please use contact form at http://qt.digia.com
             **
             ** This file is part of the Qt Commercial Charts Add-on.
             **
             ** $QT_BEGIN_LICENSE$
             ** Licensees holding valid Qt Commercial licenses may use this file in
             ** accordance with the Qt Commercial License Agreement provided with the
             ** Software or, alternatively, in accordance with the terms contained in
             ** a written agreement between you and Digia.
             **
             ** If you have questions regarding the use of this file, please use
             ** contact form at http://qt.digia.com
             ** $QT_END_LICENSE$
             **
             ****************************************************************************/
             #include "qstackedbarseries.h"
             #include "qstackedbarseries_p.h"
             #include "stackedbarchartitem_p.h"
             #include "chartdataset_p.h"
             #include "charttheme_p.h"
             #include "chartanimator_p.h"
             #include "qvaluesaxis.h"
             #include "stackedbaranimation_p.h"
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
             /*!
                 \class QStackedBarSeries
                 \brief Series for creating stacked bar chart
                 \mainclass
                 QStackedBarSeries represents a series of data shown as bars. The purpose of this class is to draw bars
                 as stacks, where bars in same category are stacked on top of each other.
                 QStackedBarSeries groups the data from sets to categories, which are defined by QStringList.
                 See the \l {StackedbarChart Example} {stacked bar chart example} to learn how to create a stacked bar chart.
                 \image examples_stackedbarchart.png
                 \sa QBarSet, QPercentBarSeries, QAbstractBarSeries
             */
             /*!
                 \qmlclass StackedBarSeries QStackedBarSeries
                 \inherits AbstractBarSeries
                 The following QML shows how to create a simple stacked bar chart:
                 \snippet ../demos/qmlchart/qml/qmlchart/View7.qml 1
                 \beginfloatleft
                 \image demos_qmlchart7.png
                 \endfloat
                 \clearfloat
             */
             /*!
                 Constructs empty QStackedBarSeries.
                 QStackedBarSeries is QObject which is a child of a \a parent.
             */
             QStackedBarSeries::QStackedBarSeries(QObject *parent)
                 : QAbstractBarSeries(*new QStackedBarSeriesPrivate(this), parent)
             {
             }
             /*!
                 Returns QChartSeries::SeriesTypeStackedBar.
             */
             QAbstractSeries::SeriesType QStackedBarSeries::type() const
             {
                 return QAbstractSeries::SeriesTypeStackedBar;
             }
             ///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
             QStackedBarSeriesPrivate::QStackedBarSeriesPrivate(QStackedBarSeries *q) : QAbstractBarSeriesPrivate(q)
             {
             }
             void QStackedBarSeriesPrivate::scaleDomain(Domain& domain)
             {
                 qreal minX(domain.minX());
                 qreal minY(domain.minY());
                 qreal maxX(domain.maxX());
                 qreal maxY(domain.maxY());
                 qreal x = categoryCount();
                 qreal y = maxCategorySum();
                 minX = qMin(minX, - (qreal)0.5);
                 minY = qMin(minY, y);
                 maxX = qMax(maxX, x - (qreal)0.5);
                 maxY = qMax(maxY, y);
                 domain.setRange(minX,maxX,minY,maxY);
             }
             Chart* QStackedBarSeriesPrivate::createGraphics(ChartPresenter* presenter)
             {
                 Q_Q(QStackedBarSeries);
                 StackedBarChartItem* bar = new StackedBarChartItem(q,presenter);
                 if(presenter->animationOptions().testFlag(QChart::SeriesAnimations)) {
                     bar->setAnimator(presenter->animator());
                     bar->setAnimation(new StackedBarAnimation(bar));
                 }
                 presenter->chartTheme()->decorate(q, presenter->dataSet()->seriesIndex(q));
                 return bar;
             }
-            QAbstractAxis::AxisType QStackedBarSeriesPrivate::defaultAxisType(Qt::Orientation orientation) const
-                if(orientation==Qt::Horizontal)
-                    return QAbstractAxis::AxisTypeCategories;
-                else
-                    return QAbstractAxis::AxisTypeValues;
             #include "moc_qstackedbarseries.cpp"
             QTCOMMERCIALCHART_END_NAMESPACE

src/barchart/vertical/stacked/qstackedbarseries.h ~~src/barchart/qstackedbarseries.h~~ renamed 0 0

NO CONTENT: file renamed from src/barchart/qstackedbarseries.h to src/barchart/vertical/stacked/qstackedbarseries.h

src/barchart/vertical/stacked/qstackedbarseries_p.h ~~src/barchart/qstackedbarseries_p.h~~ renamed 0 -2

             /****************************************************************************
             **
             ** Copyright (C) 2012 Digia Plc
             ** All rights reserved.
             ** For any questions to Digia, please use contact form at http://qt.digia.com
             **
             ** This file is part of the Qt Commercial Charts Add-on.
             **
             ** $QT_BEGIN_LICENSE$
             ** Licensees holding valid Qt Commercial licenses may use this file in
             ** accordance with the Qt Commercial License Agreement provided with the
             ** Software or, alternatively, in accordance with the terms contained in
             ** a written agreement between you and Digia.
             **
             ** If you have questions regarding the use of this file, please use
             ** contact form at http://qt.digia.com
             ** $QT_END_LICENSE$
             **
             ****************************************************************************/
             //  W A R N I N G
             //  -------------
             //
             // This file is not part of the QtCommercial Chart API.  It exists purely as an
             // implementation detail.  This header file may change from version to
             // version without notice, or even be removed.
             //
             // We mean it.
             #ifndef QSTACKEDBARSERIES_P_H
             #define QSTACKEDBARSERIES_P_H
             #include "qabstractbarseries_p.h"
             #include "domain_p.h"
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
             class QStackedBarSeriesPrivate: public QAbstractBarSeriesPrivate
             {
             public:
                 QStackedBarSeriesPrivate(QStackedBarSeries* q);
                 Chart* createGraphics(ChartPresenter* presenter);
                 void scaleDomain(Domain& domain);
-                QAbstractAxis::AxisType defaultAxisType(Qt::Orientation orientation) const;
             private:
                 Q_DECLARE_PUBLIC(QStackedBarSeries)
             };
             QTCOMMERCIALCHART_END_NAMESPACE
             #endif

src/barchart/vertical/stacked/stackedbarchartitem.cpp ~~src/barchart/stackedbarchartitem.cpp~~ renamed 0 0

NO CONTENT: file renamed from src/barchart/stackedbarchartitem.cpp to src/barchart/vertical/stacked/stackedbarchartitem.cpp

src/barchart/vertical/stacked/stackedbarchartitem_p.h ~~src/barchart/stackedbarchartitem_p.h~~ renamed 0 0

NO CONTENT: file renamed from src/barchart/stackedbarchartitem_p.h to src/barchart/vertical/stacked/stackedbarchartitem_p.h

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