HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/qtcharts Commit - r1612:859a2158b75a

Refactor CategoriesAxis to BarCategoriesAxis part 1 of 2

Michal Klocek -

r1612:859a2158b75a

parent child

Context file:

r1612:859a2158b75a

Expand all files

demos/qmlchart/qml/qmlchart/View6.qml +1 -1

                     title: "Bar series"
                     anchors.fill: parent
                     legend.alignment: Qt.AlignBottom
-                    CategoriesAxis {
+                    BarCategoriesAxis {
                         id:myAxis
                         categories: ["2007", "2008", "2009", "2010", "2011", "2012" ]
                         }

demos/qmlchart/qml/qmlchart/View7.qml +1 -1

                     title: "Stacked Bar series"
                     anchors.fill: parent
                     legend.alignment: Qt.AlignBottom
-                    CategoriesAxis {
+                    BarCategoriesAxis {
                         id: myAxis;
                         categories: ["2007", "2008", "2009", "2010", "2011", "2012" ]
                         }

demos/qmlchart/qml/qmlchart/View8.qml +1 -1

                     title: "Percent Bar series"
                     anchors.fill: parent
                     legend.alignment: Qt.AlignBottom
-                    CategoriesAxis {
+                    BarCategoriesAxis {
                         id: myAxis
                         categories: ["2007", "2008", "2009", "2010", "2011", "2012" ]
                         }

demos/qmlcustommodel/qml/qmlcustommodel/main.qml +1 -1

                     anchors.fill: parent
                     animationOptions: ChartView.SeriesAnimations
-                    CategoriesAxis {
+                    BarCategoriesAxis {
                         id: categoryAxis
                         categories: ["2007", "2008", "2009", "2010", "2011", "2012" ]
                     }

examples/barchart/main.cpp +1 -1

             //![4]
                 QStringList categories;
                 categories << "Jan" << "Feb" << "Mar" << "Apr" << "May" << "Jun";
-                QCategoriesAxis* axis = new QCategoriesAxis();
+                QBarCategoriesAxis* axis = new QBarCategoriesAxis();
                 axis->append(categories);
                 chart->setAxisX(axis,series);
             //![4]

examples/barmodelmapper/tablewidget.cpp +1 -1

                 //! [6]
                 QStringList categories;
                 categories << "April" << "May" << "June" << "July" << "August";
-                QCategoriesAxis* axis = new QCategoriesAxis();
+                QBarCategoriesAxis* axis = new QBarCategoriesAxis();
                 axis->append(categories);
                 chart->createDefaultAxes();
                 chart->setAxisX(axis, series);

examples/percentbarchart/main.cpp +1 -1

             //![4]
                 QStringList categories;
                 categories << "Jan" << "Feb" << "Mar" << "Apr" << "May" << "Jun";
-                QCategoriesAxis* axis = new QCategoriesAxis();
+                QBarCategoriesAxis* axis = new QBarCategoriesAxis();
                 axis->append(categories);
                 chart->createDefaultAxes();
                 chart->setAxisX(axis,series);

examples/stackedbarchart/main.cpp +1 -1

             //![4]
                 QStringList categories;
                 categories << "Jan" << "Feb" << "Mar" << "Apr" << "May" << "Jun";
-                QCategoriesAxis* axis = new QCategoriesAxis();
+                QBarCategoriesAxis* axis = new QBarCategoriesAxis();
                 axis->append(categories);
                 chart->setAxisX(axis,series);
             //![4]

examples/stackedbarchartdrilldown/drilldownchart.cpp +1 -1

                 m_currentSeries = series;
                 // Reset axis
-                QCategoriesAxis* axis = new QCategoriesAxis();
+                QBarCategoriesAxis* axis = new QBarCategoriesAxis();
                 axis->append(m_currentSeries->categories());
                 addSeries(series);

plugins/declarative/plugin.cpp +1 -1

                     qmlRegisterType<QHBarModelMapper>(uri, 1, 0, "HBarModelMapper");
                     qmlRegisterType<QVBarModelMapper>(uri, 1, 0, "VBarModelMapper");
                     qmlRegisterType<QValuesAxis>(uri, 1, 0, "ValuesAxis");
-                    qmlRegisterType<QCategoriesAxis>(uri, 1, 0, "CategoriesAxis");
+                    qmlRegisterType<QBarCategoriesAxis>(uri, 1, 0, "BarCategoriesAxis");
                     qmlRegisterUncreatableType<QLegend>(uri, 1, 0, "Legend",
                                                       QLatin1String("Trying to create uncreatable: Legend."));

src/axis/chartcategoriesaxisx.cpp +1 -1

             QTCOMMERCIALCHART_BEGIN_NAMESPACE
-            ChartCategoriesAxisX::ChartCategoriesAxisX(QCategoriesAxis *axis,ChartPresenter *presenter) : ChartAxis(axis,presenter),
+            ChartCategoriesAxisX::ChartCategoriesAxisX(QBarCategoriesAxis *axis,ChartPresenter *presenter) : ChartAxis(axis,presenter),
               m_categoriesAxis(axis)
             {

src/axis/chartcategoriesaxisx_p.h +3 -3

             class QAbstractAxis;
             class ChartPresenter;
-            class QCategoriesAxis;
+            class QBarCategoriesAxis;
             class ChartCategoriesAxisX : public ChartAxis
             {
             public:
-                ChartCategoriesAxisX(QCategoriesAxis *axis, ChartPresenter *presenter);
+                ChartCategoriesAxisX(QBarCategoriesAxis *axis, ChartPresenter *presenter);
                 ~ChartCategoriesAxisX();
                 AxisType axisType() const { return X_AXIS;}
                 void updateGeometry();
             private:
-                QCategoriesAxis *m_categoriesAxis;
+                QBarCategoriesAxis *m_categoriesAxis;
             };
             QTCOMMERCIALCHART_END_NAMESPACE

src/axis/chartcategoriesaxisy_p.h +2 -2

             QTCOMMERCIALCHART_BEGIN_NAMESPACE
             class QAbstractAxis;
-            class QCategoriesAxis;
+            class QBarCategoriesAxis;
             class ChartPresenter;
             class ChartCategoriesAxisY : public ChartAxis
                 void updateGeometry();
             private:
-                QCategoriesAxis *m_categoriesAxis;
+                QBarCategoriesAxis *m_categoriesAxis;
             };
             QTCOMMERCIALCHART_END_NAMESPACE

src/axis/qcategoriesaxis.cpp +45 -45

             QTCOMMERCIALCHART_BEGIN_NAMESPACE
-            QCategoriesAxis::QCategoriesAxis(QObject *parent):
+            QBarCategoriesAxis::QBarCategoriesAxis(QObject *parent):
-                QAbstractAxis(*new QCategoriesAxisPrivate(this),parent)
+                QAbstractAxis(*new QBarCategoriesAxisPrivate(this),parent)
             {
             }
-            QCategoriesAxis::~QCategoriesAxis()
+            QBarCategoriesAxis::~QBarCategoriesAxis()
             {
             }
-            QCategoriesAxis::QCategoriesAxis(QCategoriesAxisPrivate &d,QObject *parent):QAbstractAxis(d,parent)
+            QBarCategoriesAxis::QBarCategoriesAxis(QBarCategoriesAxisPrivate &d,QObject *parent):QAbstractAxis(d,parent)
             {
             }
             /*!
                 Appends \a categories to axis
             */
-            void QCategoriesAxis::append(const QStringList &categories)
+            void QBarCategoriesAxis::append(const QStringList &categories)
             {
-                Q_D(QCategoriesAxis);
+                Q_D(QBarCategoriesAxis);
                 if (d->m_categories.isEmpty()) {
                 	d->m_categories.append(categories);
                 	setRange(categories.first(),categories.last());
             /*!
                 Appends \a category to axis
             */
-            void QCategoriesAxis::append(const QString &category)
+            void QBarCategoriesAxis::append(const QString &category)
             {
-            	Q_D(QCategoriesAxis);
+            	Q_D(QBarCategoriesAxis);
             	if (d->m_categories.isEmpty()) {
             		d->m_categories.append(category);
             		setRange(category,category);
             /*!
                 Removes \a category from axis
             */
-            void QCategoriesAxis::remove(const QString &category)
+            void QBarCategoriesAxis::remove(const QString &category)
             {
-                Q_D(QCategoriesAxis);
+                Q_D(QBarCategoriesAxis);
                 if (d->m_categories.contains(category)) {
                     d->m_categories.removeAt(d->m_categories.indexOf(category));
                     setRange(d->m_categories.first(),d->m_categories.last());
             /*!
                 Inserts \a category to axis at \a index
             */
-            void QCategoriesAxis::insert(int index, const QString &category)
+            void QBarCategoriesAxis::insert(int index, const QString &category)
             {
-                Q_D(QCategoriesAxis);
+                Q_D(QBarCategoriesAxis);
                 if (d->m_categories.isEmpty()) {
                 	d->m_categories.insert(index,category);
                 	setRange(category,category);
             /*!
               Removes all categories.
              */
-            void QCategoriesAxis::clear()
+            void QBarCategoriesAxis::clear()
             {
-                Q_D(QCategoriesAxis);
+                Q_D(QBarCategoriesAxis);
                 d->m_categories.clear();
                 setRange(QString::null,QString::null);
                 emit categoriesChanged();
             }
-            void QCategoriesAxis::setCategories(const QStringList &categories)
+            void QBarCategoriesAxis::setCategories(const QStringList &categories)
             {
-                Q_D(QCategoriesAxis);
+                Q_D(QBarCategoriesAxis);
                 if(d->m_categories!=categories){
                 d->m_categories = categories;
                 setRange(categories.first(),categories.last());
                 }
             }
-            QStringList QCategoriesAxis::categories()
+            QStringList QBarCategoriesAxis::categories()
             {
-                Q_D(QCategoriesAxis);
+                Q_D(QBarCategoriesAxis);
                 return d->m_categories;
             }
             /*!
               Returns number of categories.
              */
-            int QCategoriesAxis::count() const
+            int QBarCategoriesAxis::count() const
             {
-                Q_D(const QCategoriesAxis);
+                Q_D(const QBarCategoriesAxis);
                 return d->m_categories.count();
             }
             /*!
                 Returns category at \a index. Index must be valid.
             */
-            QString QCategoriesAxis::at(int index) const
+            QString QBarCategoriesAxis::at(int index) const
             {
-                Q_D(const QCategoriesAxis);
+                Q_D(const QBarCategoriesAxis);
                 return d->m_categories.at(index);
             }
             /*!
                 Sets minimum category to \a min.
             */
-            void QCategoriesAxis::setMin(const QString& min)
+            void QBarCategoriesAxis::setMin(const QString& min)
             {
-                Q_D(QCategoriesAxis);
+                Q_D(QBarCategoriesAxis);
                 setRange(min,d->m_maxCategory);
             }
             /*!
                 Returns minimum category.
             */
-            QString QCategoriesAxis::min() const
+            QString QBarCategoriesAxis::min() const
             {
-                Q_D(const QCategoriesAxis);
+                Q_D(const QBarCategoriesAxis);
                 return d->m_minCategory;
             }
             /*!
                 Sets maximum category to \a max.
             */
-            void QCategoriesAxis::setMax(const QString& max)
+            void QBarCategoriesAxis::setMax(const QString& max)
             {
-                Q_D(QCategoriesAxis);
+                Q_D(QBarCategoriesAxis);
                 setRange(d->m_minCategory,max);
             }
             /*!
                 Returns maximum category
             */
-            QString QCategoriesAxis::max() const
+            QString QBarCategoriesAxis::max() const
             {
-                Q_D(const QCategoriesAxis);
+                Q_D(const QBarCategoriesAxis);
                 return d->m_maxCategory;
             }
             /*!
                 Sets range from \a minCategory to \a maxCategory
             */
-            void QCategoriesAxis::setRange(const QString& minCategory, const QString& maxCategory)
+            void QBarCategoriesAxis::setRange(const QString& minCategory, const QString& maxCategory)
             {
-                Q_D(QCategoriesAxis);
+                Q_D(QBarCategoriesAxis);
                 int minIndex = d->m_categories.indexOf(minCategory);
                 if (minIndex == -1) {
             /*!
                 Returns the type of axis.
             */
-            QAbstractAxis::AxisType QCategoriesAxis::type() const
+            QAbstractAxis::AxisType QBarCategoriesAxis::type() const
             {
                 return AxisTypeCategories;
             }
             //////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-            QCategoriesAxisPrivate::QCategoriesAxisPrivate(QCategoriesAxis* q):
+            QBarCategoriesAxisPrivate::QBarCategoriesAxisPrivate(QBarCategoriesAxis* q):
                 QAbstractAxisPrivate(q)
             {
             }
-            QCategoriesAxisPrivate::~QCategoriesAxisPrivate()
+            QBarCategoriesAxisPrivate::~QBarCategoriesAxisPrivate()
             {
             }
-            void QCategoriesAxisPrivate::setMin(const QVariant &min)
+            void QBarCategoriesAxisPrivate::setMin(const QVariant &min)
             {
                 setRange(min,m_maxCategory);
             }
-            void QCategoriesAxisPrivate::setMax(const QVariant &max)
+            void QBarCategoriesAxisPrivate::setMax(const QVariant &max)
             {
                 setRange(m_minCategory,max);
             }
-            void QCategoriesAxisPrivate::setRange(const QVariant &min, const QVariant &max)
+            void QBarCategoriesAxisPrivate::setRange(const QVariant &min, const QVariant &max)
             {
-                Q_Q(QCategoriesAxis);
+                Q_Q(QBarCategoriesAxis);
                 QString value1 = min.toString();
                 QString value2 = max.toString();
                 q->setRange(value1,value2);
             }
-            int QCategoriesAxisPrivate::ticksCount() const
+            int QBarCategoriesAxisPrivate::ticksCount() const
             {
                 return m_categories.count()+1;
             }
-            void QCategoriesAxisPrivate::handleAxisRangeChanged(qreal min, qreal max,int count)
+            void QBarCategoriesAxisPrivate::handleAxisRangeChanged(qreal min, qreal max,int count)
             {
                 m_min = min;
                 m_max = max;
                 m_ticksCount = count;
             }
-            ChartAxis* QCategoriesAxisPrivate::createGraphics(ChartPresenter* presenter)
+            ChartAxis* QBarCategoriesAxisPrivate::createGraphics(ChartPresenter* presenter)
             {
-                Q_Q( QCategoriesAxis);
+                Q_Q( QBarCategoriesAxis);
                 if(m_orientation == Qt::Vertical){
                     return new ChartCategoriesAxisY(q,presenter);
                 }else{
                 }
             }
-            void QCategoriesAxisPrivate::emitRange()
+            void QBarCategoriesAxisPrivate::emitRange()
             {
-            	Q_Q( QCategoriesAxis);
+            	Q_Q( QBarCategoriesAxis);
             	if(!q->signalsBlocked()) {
             		emit changed(m_min -0.5, m_max +0.5, qCeil(m_max + 0.5) -qCeil(m_min - 0.5) +1, false);
             	}

src/axis/qcategoriesaxis.h +7 -7

             QTCOMMERCIALCHART_BEGIN_NAMESPACE
-            class QCategoriesAxisPrivate;
+            class QBarCategoriesAxisPrivate;
-            class QTCOMMERCIALCHART_EXPORT QCategoriesAxis : public QAbstractAxis
+            class QTCOMMERCIALCHART_EXPORT QBarCategoriesAxis : public QAbstractAxis
             {
                 Q_OBJECT
                 Q_PROPERTY(QStringList categories READ categories WRITE setCategories NOTIFY categoriesChanged)
                 Q_PROPERTY(QString max READ max WRITE setMax NOTIFY maxChanged)
             public:
-                explicit QCategoriesAxis(QObject *parent = 0);
+                explicit QBarCategoriesAxis(QObject *parent = 0);
-                ~QCategoriesAxis();
+                ~QBarCategoriesAxis();
             protected:
-                QCategoriesAxis(QCategoriesAxisPrivate &d,QObject *parent = 0);
+                QBarCategoriesAxis(QBarCategoriesAxisPrivate &d,QObject *parent = 0);
             public:
                 AxisType type() const;
             	void rangeChanged(const QString &min, const QString &max);
             private:
-                Q_DECLARE_PRIVATE(QCategoriesAxis)
+                Q_DECLARE_PRIVATE(QBarCategoriesAxis)
-                Q_DISABLE_COPY(QCategoriesAxis)
+                Q_DISABLE_COPY(QBarCategoriesAxis)
             };
             QTCOMMERCIALCHART_END_NAMESPACE

src/axis/qcategoriesaxis_p.h +4 -4

             QTCOMMERCIALCHART_BEGIN_NAMESPACE
-            class QCategoriesAxisPrivate : public QAbstractAxisPrivate
+            class QBarCategoriesAxisPrivate : public QAbstractAxisPrivate
             {
                 Q_OBJECT
             public:
-                QCategoriesAxisPrivate(QCategoriesAxis *q);
+                QBarCategoriesAxisPrivate(QBarCategoriesAxis *q);
-                ~QCategoriesAxisPrivate();
+                ~QBarCategoriesAxisPrivate();
             public:
                 ChartAxis* createGraphics(ChartPresenter* presenter);
                 QString m_maxCategory;
             private:
-                Q_DECLARE_PUBLIC(QCategoriesAxis)
+                Q_DECLARE_PUBLIC(QBarCategoriesAxis)
             };
             QTCOMMERCIALCHART_END_NAMESPACE

src/barchart/qabstractbarseries.cpp +1 -1

             {
                 if(axis->type()==QAbstractAxis::AxisTypeCategories)
                 {
-                    QCategoriesAxis* cataxis = qobject_cast<QCategoriesAxis*>(axis);
+                    QBarCategoriesAxis* cataxis = qobject_cast<QBarCategoriesAxis*>(axis);
                     Q_ASSERT(cataxis);
                     QStringList categories;
                     for (int i(1); i < categoryCount()+1; i++)

src/chartdataset.cpp +1 -1

                     axis = new QValuesAxis(this);
                     break;
                     case QAbstractAxis::AxisTypeCategories:
-                    axis = new QCategoriesAxis(this);
+                    axis = new QBarCategoriesAxis(this);
                     break;
                     default:
                     axis = 0;

tests/chartwidgettest/mainwidget.cpp +3 -3

                     QAbstractBarSeries* series = 0;
                     if (seriesName == "Bar") {
                         series = new QBarSeries(this);
-                        QCategoriesAxis* axis = new QCategoriesAxis();
+                        QBarCategoriesAxis* axis = new QBarCategoriesAxis();
                         axis->append(category);
                         m_chart->setAxisX(axis,series);
                     } else if (seriesName == "Stacked bar") {
                         series = new QStackedBarSeries(this);
-                        QCategoriesAxis* axis = new QCategoriesAxis();
+                        QBarCategoriesAxis* axis = new QBarCategoriesAxis();
                         axis->append(category);
                         m_chart->setAxisX(axis,series);
                     } else {
                         series = new QPercentBarSeries(this);
-                        QCategoriesAxis* axis = new QCategoriesAxis();
+                        QBarCategoriesAxis* axis = new QBarCategoriesAxis();
                         axis->append(category);
                         m_chart->setAxisX(axis,series);
                     }

tests/qmlchartproperties/qml/qmlchartproperties/BarChart.qml +1 -1

                 property variant series: mySeries
-                CategoriesAxis {
+                BarCategoriesAxis {
                     id:myAxis;
                     categories: ["2007", "2008", "2009", "2010", "2011", "2012" ] }

tests/qmlchartproperties/qml/qmlchartproperties/PercentBarChart.qml +1 -1

                 property variant series: mySeries
-                CategoriesAxis {
+                BarCategoriesAxis {
                     id: myAxis
                     categories: ["2007", "2008", "2009", "2010", "2011", "2012" ]
                 }

tests/qmlchartproperties/qml/qmlchartproperties/StackedBarChart.qml +1 -1

                 property variant series: mySeries
-                CategoriesAxis {
+                BarCategoriesAxis {
                     id: myAxis
                     categories: ["2007", "2008", "2009", "2010", "2011", "2012" ]
                 }

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