HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/qtcharts Commit - r338:7289fb2b50fb

Naming convention change for barcharts. QBarChartSeries is now QBarSeries etc.

sauimone -

r338:7289fb2b50fb

parent child

Context file:

r338:7289fb2b50fb

Expand all files

example/barchart/main.cpp +2 -2

             #include <QApplication>
             #include <QMainWindow>
             #include <qchartview.h>
-            #include <qbarchartseries.h>
+            #include <qbarseries.h>
             #include <qbarset.h>
             #include <qbarcategory.h>
                 //! [3]
                 // Create series and add sets to it
-                QBarChartSeries* series= new QBarChartSeries(category);
+                QBarSeries* series= new QBarSeries(category);
                 series->addBarSet(set0);
                 series->addBarSet(set1);

example/chartview/main.cpp +2 -2

             #include <qchartview.h>
             #include <qlinechartseries.h>
             #include <qscatterseries.h>
-            #include <qbarchartseries.h>
+            #include <qbarseries.h>
             #include <qbarset.h>
             #include <qbarcategory.h>
             #include <qpieseries.h>
                 *barCategory << "Jan"
                              << "Feb"
                              << "Mar";
-                QBarChartSeries *bar = new QBarChartSeries(barCategory);
+                QBarSeries *bar = new QBarSeries(barCategory);
                 QBarSet *barSet = new QBarSet("Sales");
                 *barSet << 123.2
                         << 301.3

example/gdpbarchart/widget.cpp +1 -1

                     QBarCategory* category = new QBarCategory;
                     for (int i = 0; i < selectedCountriesStrings.size(); i++)
                         *category << selectedCountriesStrings[i];
-                    series0 = new QBarChartSeries(category);
+                    series0 = new QBarSeries(category);
                     // prepare the selected counries SQL query
                     QString countriesQuery = "country IN (";

example/gdpbarchart/widget.h +2 -2

             #include <QtGui/QWidget>
             #include <qchartview.h>
-            #include <qbarchartseries.h>
+            #include <qbarseries.h>
             #include <QSqlDatabase>
             QTCOMMERCIALCHART_USE_NAMESPACE
                 QListWidget* countrieslist;
                 QListWidget* yearslist;
                 QSqlDatabase db;
-                QBarChartSeries* series0;
+                QBarSeries* series0;
                 QRadioButton* barChartRadioButton;
                 QRadioButton* scatterChartRadioButton;
             };

example/percentbarchart/main.cpp +2 -2

             #include <QApplication>
             #include <QMainWindow>
             #include <QStandardItemModel>
-            #include <qpercentbarchartseries.h>
+            #include <qpercentbarseries.h>
             #include <qbarcategory.h>
             #include <qchartview.h>
             #include <qbarset.h>
                 //! [3]
                 // Create series and add sets to it
-                QPercentBarChartSeries* series = new QPercentBarChartSeries(category);
+                QPercentBarSeries* series = new QPercentBarSeries(category);
                 series->addBarSet(set0);
                 series->addBarSet(set1);

example/stackedbarchart/main.cpp +2 -2

             #include <QApplication>
             #include <QMainWindow>
             #include <qchartview.h>
-            #include <qstackedbarchartseries.h>
+            #include <qstackedbarseries.h>
             #include <qbarset.h>
             #include <qbarcategory.h>
                 //! [3]
                 // Create series and add sets to it
-                QStackedBarChartSeries* series = new QStackedBarChartSeries(category);
+                QStackedBarSeries* series = new QStackedBarSeries(category);
                 series->addBarSet(set0);
                 series->addBarSet(set1);

src/barchart/barchart.pri +6 -6

                 $$PWD/barpresenterbase.cpp \
                 $$PWD/percentbarpresenter.cpp \
                 $$PWD/qbarcategory.cpp \
-                $$PWD/qbarchartseries.cpp \
+                $$PWD/qbarseries.cpp \
                 $$PWD/qbarset.cpp \
-                $$PWD/qpercentbarchartseries.cpp \
+                $$PWD/qpercentbarseries.cpp \
-                $$PWD/qstackedbarchartseries.cpp \
+                $$PWD/qstackedbarseries.cpp \
                 $$PWD/separator.cpp \
                 $$PWD/stackedbarpresenter.cpp \
                 $$PWD/barvalue.cpp
             PUBLIC_HEADERS += \
                 $$PWD/qbarcategory.h \
-                $$PWD/qbarchartseries.h \
+                $$PWD/qbarseries.h \
                 $$PWD/qbarset.h \
-                $$PWD/qpercentbarchartseries.h \
+                $$PWD/qpercentbarseries.h \
-                $$PWD/qstackedbarchartseries.h
+                $$PWD/qstackedbarseries.h

src/barchart/barpresenter.cpp +1 -1

             QTCOMMERCIALCHART_BEGIN_NAMESPACE
-            BarPresenter::BarPresenter(QBarChartSeries *series, QGraphicsItem *parent) :
+            BarPresenter::BarPresenter(QBarSeries *series, QGraphicsItem *parent) :
                 BarPresenterBase(series, parent)
             {
                 mBarDefaultWidth = 15;

src/barchart/barpresenter.h +2 -2

             QTCOMMERCIALCHART_BEGIN_NAMESPACE
-            class QBarChartSeries;
+            class QBarSeries;
             // Presenter for parallel bars. Grouping of bars is done on category basis.
             class BarPresenter : public BarPresenterBase
             {
                 Q_OBJECT
             public:
-                explicit BarPresenter(QBarChartSeries *series, QGraphicsItem *parent = 0);
+                explicit BarPresenter(QBarSeries *series, QGraphicsItem *parent = 0);
             private:

src/barchart/barpresenterbase.cpp +2 -2

             #include "barlabel_p.h"
             #include "separator_p.h"
             #include "qbarset.h"
-            #include "qbarchartseries.h"
+            #include "qbarseries.h"
             #include <QDebug>
             #include <QToolTip>
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
-            BarPresenterBase::BarPresenterBase(QBarChartSeries *series, QGraphicsItem *parent)
+            BarPresenterBase::BarPresenterBase(QBarSeries *series, QGraphicsItem *parent)
                 : ChartItem(parent)
                 ,mBarDefaultWidth(20) // TODO: remove hard coding, when we have layout code ready
                 ,mLayoutSet(false)

src/barchart/barpresenterbase.h +3 -3

             #define BARPRESENTERBASE_H
             #include "chartitem_p.h"
-            #include "qbarchartseries.h"
+            #include "qbarseries.h"
             #include <QPen>
             #include <QBrush>
             #include <QGraphicsItem>
             {
                 Q_OBJECT
             public:
-                BarPresenterBase(QBarChartSeries *series, QGraphicsItem *parent = 0);
+                BarPresenterBase(QBarSeries *series, QGraphicsItem *parent = 0);
                 ~BarPresenterBase();
             public:
                 bool mSeparatorsEnabled;
                 // Owned
-                QBarChartSeries* mSeries;
+                QBarSeries* mSeries;
                 // Not owned.
                 QList<Bar*> mBars;

src/barchart/percentbarpresenter.cpp +1 -1

             QTCOMMERCIALCHART_BEGIN_NAMESPACE
-            PercentBarPresenter::PercentBarPresenter(QBarChartSeries *series, QGraphicsItem *parent) :
+            PercentBarPresenter::PercentBarPresenter(QBarSeries *series, QGraphicsItem *parent) :
                 BarPresenterBase(series, parent)
             {
             }

src/barchart/percentbarpresenter.h +2 -2

             #include "chartitem_p.h"
             #include "bar_p.h"
-            #include "qpercentbarchartseries.h"
+            #include "qpercentbarseries.h"
             #include "barpresenterbase.h"
             #include <QGraphicsItem>
             {
                 Q_OBJECT
             public:
-                PercentBarPresenter(QBarChartSeries *series, QGraphicsItem *parent = 0);
+                PercentBarPresenter(QBarSeries *series, QGraphicsItem *parent = 0);
             private:

src/barchart/qbarcategory.cpp +1 -1

                 Example on how to create a category:
                 \snippet ../example/barchart/main.cpp 1
-                \sa QBarChartSeries, QStackedBarChartSeries, QPercentBarChartSeries
+                \sa QBarSeries, QStackedBarSeries, QPercentBarSeries
             */
             /*!

src/barchart/qbarseries.cpp ~~src/barchart/qbarchartseries.cpp~~ renamed +33 -33

             #include <QDebug>
-            #include "qbarchartseries.h"
+            #include "qbarseries.h"
             #include "qbarcategory.h"
             #include "qbarset.h"
             #include "barchartmodel_p.h"
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
             /*!
-                \class QBarChartSeries
+                \class QBarSeries
                 \brief part of QtCommercial chart API.
-                QBarChartSeries represents a series of data shown as bars. One QBarChartSeries can contain multible
+                QBarSeries represents a series of data shown as bars. One QBarSeries can contain multible
-                QBarSet data sets. QBarChartSeries groups the data from sets to categories, which are defined
+                QBarSet data sets. QBarSeries groups the data from sets to categories, which are defined
                 by QBarCategory class.
                 \mainclass
                 Example on how to create view and apply theme:
                 \snippet ../example/barchart/main.cpp 5
-                \sa QBarCategory, QBarSet, QStackedBarChartSeries, QPercentBarChartSeries
+                \sa QBarCategory, QBarSet, QStackedBarSeries, QPercentBarSeries
             */
             /*!
-                \fn virtual QChartSeriesType QBarChartSeries::type() const
+                \fn virtual QChartSeriesType QBarSeries::type() const
                 \brief Returns type of series.
                 \sa QChartSeries, QChartSeriesType
             */
             /*!
-                \fn void QBarChartSeries::changed(int index)
+                \fn void QBarSeries::changed(int index)
                 \brief \internal \a index
             */
             /*!
-                \fn void QBarChartSeries::floatingValuesEnabled(bool enabled)
+                \fn void QBarSeries::floatingValuesEnabled(bool enabled)
                 \brief \internal \a enabled
             */
             /*!
-                \fn void QBarChartSeries::toolTipEnabled(bool enabled)
+                \fn void QBarSeries::toolTipEnabled(bool enabled)
                 \brief \internal \a enabled
             */
             /*!
-                \fn void QBarChartSeries::separatorsEnabled(bool enabled)
+                \fn void QBarSeries::separatorsEnabled(bool enabled)
                 \brief \internal \a enabled
             */
             /*!
-                \fn void QBarChartSeries::showToolTip(QPoint pos, QString tip)
+                \fn void QBarSeries::showToolTip(QPoint pos, QString tip)
                 \brief \internal \a pos \a tip
             */
             /*!
-                Constructs empty QBarChartSeries. Parameter \a category defines the categories for chart.
+                Constructs empty QBarSeries. Parameter \a category defines the categories for chart.
                 Takes ownership of \a category.
-                QBarChartSeries is QObject which is a child of a \a parent.
+                QBarSeries is QObject which is a child of a \a parent.
             */
-            QBarChartSeries::QBarChartSeries(QBarCategory *category, QObject *parent)
+            QBarSeries::QBarSeries(QBarCategory *category, QObject *parent)
                 : QChartSeries(parent)
                 ,mModel(new BarChartModel(category, this))
             {
             /*!
                 Adds a set of bars to series. Takes ownership of \a set
             */
-            void QBarChartSeries::addBarSet(QBarSet *set)
+            void QBarSeries::addBarSet(QBarSet *set)
             {
                 mModel->addBarSet(set);
             }
             /*!
                 Removes a set of bars from series. Releases ownership of \a set. Doesnt delete \a set.
             */
-            void QBarChartSeries::removeBarSet(QBarSet *set)
+            void QBarSeries::removeBarSet(QBarSet *set)
             {
                 mModel->removeBarSet(set);
             }
             /*!
                 Returns number of sets in series.
             */
-            int QBarChartSeries::countSets()
+            int QBarSeries::countSets()
             {
                 return mModel->countSets();
             }
             /*!
                 Returns number of categories in series
             */
-            int QBarChartSeries::countCategories()
+            int QBarSeries::countCategories()
             {
                 return mModel->countCategories();
             }
                 If series is empty, returns 0.
                 Returns 0 after last set.
             */
-            QBarSet* QBarChartSeries::nextSet(bool getFirst)
+            QBarSet* QBarSeries::nextSet(bool getFirst)
             {
                 return mModel->nextSet(getFirst);
             }
                 Assumes that \a index is between 0 and number of sets. Use countSets() to get valid index bound.
                 \sa countSets()
             */
-            QBarSet* QBarChartSeries::setAt(int index)
+            QBarSet* QBarSeries::setAt(int index)
             {
                 return mModel->setAt(index);
             }
             /*!
                 Returns legend of series. Legend is a list of set names in series.
             */
-            QList<QString> QBarChartSeries::legend()
+            QList<QString> QBarSeries::legend()
             {
                 return mModel->legend();
             }
             /*!
                 \internal \a category
             */
-            QString QBarChartSeries::label(int category)
+            QString QBarSeries::label(int category)
             {
                 return mModel->label(category);
             }
                 Floating values are bar values, that are displayed on top of each bar.
                 Calling without parameter \a enabled, enables the floating values
             */
-            void QBarChartSeries::enableFloatingValues(bool enabled)
+            void QBarSeries::enableFloatingValues(bool enabled)
             {
                 if (enabled) {
                     for (int i=0; i<mModel->countSets(); i++) {
                 Tooltip shows the name of set, when mouse is hovering on top of bar.
                 Calling without parameter \a enabled, enables the tooltip
             */
-            void QBarChartSeries::enableToolTip(bool enabled)
+            void QBarSeries::enableToolTip(bool enabled)
             {
                 if (enabled) {
                     for (int i=0; i<mModel->countSets(); i++) {
                 Separators are visual elements that are drawn between categories.
                 Calling without parameter \a enabled, enables the separators
             */
-            void QBarChartSeries::enableSeparators(bool enabled)
+            void QBarSeries::enableSeparators(bool enabled)
             {
                 emit separatorsEnabled(enabled);
             }
             /*!
                 \internal
             */
-            qreal QBarChartSeries::min()
+            qreal QBarSeries::min()
             {
                 return mModel->min();
             }
             /*!
                 \internal
             */
-            qreal QBarChartSeries::max()
+            qreal QBarSeries::max()
             {
                 return mModel->max();
             }
             /*!
                 \internal \a set \a category
             */
-            qreal QBarChartSeries::valueAt(int set, int category)
+            qreal QBarSeries::valueAt(int set, int category)
             {
                 return mModel->valueAt(set,category);
             }
             /*!
                 \internal \a set \a category
             */
-            qreal QBarChartSeries::percentageAt(int set, int category)
+            qreal QBarSeries::percentageAt(int set, int category)
             {
                 return mModel->percentageAt(set,category);
             }
             /*!
                 \internal \a category
             */
-            qreal QBarChartSeries::categorySum(int category)
+            qreal QBarSeries::categorySum(int category)
             {
                 return mModel->categorySum(category);
             }
             /*!
                 \internal
             */
-            qreal QBarChartSeries::maxCategorySum()
+            qreal QBarSeries::maxCategorySum()
             {
                 return mModel->maxCategorySum();
             }
             /*!
                 \internal
             */
-            BarChartModel& QBarChartSeries::model()
+            BarChartModel& QBarSeries::model()
             {
                 return *mModel;
             }
-            #include "moc_qbarchartseries.cpp"
+            #include "moc_qbarseries.cpp"
             QTCOMMERCIALCHART_END_NAMESPACE

src/barchart/qbarseries.h ~~src/barchart/qbarchartseries.h~~ renamed +5 -5

-            #ifndef BARCHARTSERIES_H
+            #ifndef BARSERIES_H
-            #define BARCHARTSERIES_H
+            #define BARSERIES_H
             #include "qchartseries.h"
             class BarChartModel;
             // Container for series
-            class QTCOMMERCIALCHART_EXPORT QBarChartSeries : public QChartSeries
+            class QTCOMMERCIALCHART_EXPORT QBarSeries : public QChartSeries
             {
                 Q_OBJECT
             public:
-                QBarChartSeries(QBarCategory *category, QObject* parent=0);
+                QBarSeries(QBarCategory *category, QObject* parent=0);
                 virtual QChartSeriesType type() const { return QChartSeries::SeriesTypeBar; }
             QTCOMMERCIALCHART_END_NAMESPACE
-            #endif // BARCHARTSERIES_H
+            #endif // BARSERIES_H

src/barchart/qbarset.cpp +1 -1

                 Example on how to create sets of data:
                 \snippet ../example/barchart/main.cpp 2
-                \sa QBarCategory, QBarChartSeries, QStackedBarChartSeries, QPercentBarChartSeries
+                \sa QBarCategory, QBarSeries, QStackedBarSeries, QPercentBarSeries
             */
             /*!

src/barchart/qpercentbarseries.cpp ~~src/barchart/qstackedbarchartseries.cpp~~ renamed +12 -12

-            #include "qstackedbarchartseries.h"
+            #include "qpercentbarseries.h"
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
             /*!
-                \class QStackedBarChartSeries
+                \class QPercentBarSeries
                 \brief part of QtCommercial chart API.
-                QStackedBarChartSeries represents a series of data shown as bars. All bars in same category are
+                QPercentBarSeries represents a series of data shown as bars. Each bar of QBarSet is shown as percentage
-                stacked on top of each other. One QStackedBarChartSeries can contain multible QBarSet data sets.
+                of all bars in category. One QPercentBarSeries can contain multible QBarSet data sets.
-                QStackedBarChartSeries groups the data from sets to categories, which are defined by QBarCategory class.
+                QBarSeries groups the data from sets to categories, which are defined by QBarCategory class.
                 \mainclass
                 Example on how to create view and apply theme:
                 \snippet ../example/barchart/main.cpp 5
-                \sa QBarCategory, QBarSet, QPercentBarChartSeries, QBarChartSeries
+                \sa QBarCategory, QBarSet, QStackedBarSeries, QBarSeries
             */
             /*!
-                \fn virtual QChartSeriesType QStackedBarChartSeries::type() const
+                \fn virtual QChartSeriesType QPercentBarSeries::type() const
                 \brief Returns type of series.
                 \sa QChartSeries, QChartSeriesType
             */
             /*!
-                Constructs empty QStackedBarChartSeries. Parameter \a category defines the categories for chart.
+                Constructs empty QPercentBarSeries. Parameter \a category defines the categories for chart.
-                QStackedBarChartSeries is QObject which is a child of a \a parent.
+                QPercentBarSeries is QObject which is a child of a \a parent.
             */
-            QStackedBarChartSeries::QStackedBarChartSeries(QBarCategory *category, QObject *parent)
+            QPercentBarSeries::QPercentBarSeries(QBarCategory *category, QObject *parent)
-                : QBarChartSeries(category, parent)
+                : QBarSeries(category, parent)
             {
             }
-            #include "moc_qstackedbarchartseries.cpp"
+            #include "moc_qpercentbarseries.cpp"
             QTCOMMERCIALCHART_END_NAMESPACE

src/barchart/qpercentbarseries.h ~~src/barchart/qpercentbarchartseries.h~~ renamed +6 -6

-            #ifndef PERCENTBARCHARTSERIES_H
+            #ifndef PERCENTBARSERIES_H
-            #define PERCENTBARCHARTSERIES_H
+            #define PERCENTBARSERIES_H
-            #include "qbarchartseries.h"
+            #include "qbarseries.h"
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
-            class QTCOMMERCIALCHART_EXPORT QPercentBarChartSeries : public QBarChartSeries
+            class QTCOMMERCIALCHART_EXPORT QPercentBarSeries : public QBarSeries
             {
                 Q_OBJECT
             public:
-                QPercentBarChartSeries(QBarCategory *category, QObject* parent=0);
+                QPercentBarSeries(QBarCategory *category, QObject* parent=0);
                 virtual QChartSeriesType type() const { return QChartSeries::SeriesTypePercentBar; }
             };
             QTCOMMERCIALCHART_END_NAMESPACE
-            #endif // PERCENTBARCHARTSERIES_H
+            #endif // PERCENTBARSERIES_H

src/barchart/qstackedbarseries.cpp ~~src/barchart/qpercentbarchartseries.cpp~~ renamed +12 -12

-            #include "qpercentbarchartseries.h"
+            #include "qstackedbarseries.h"
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
             /*!
-                \class QPercentBarChartSeries
+                \class QStackedBarSeries
                 \brief part of QtCommercial chart API.
-                QPercentBarChartSeries represents a series of data shown as bars. Each bar of QBarSet is shown as percentage
+                QStackedBarSeries represents a series of data shown as bars. All bars in same category are
-                of all bars in category. One QPercentBarChartSeries can contain multible QBarSet data sets.
+                stacked on top of each other. One QStackedBarSeries can contain multible QBarSet data sets.
-                QBarChartSeries groups the data from sets to categories, which are defined by QBarCategory class.
+                QStackedBarSeries groups the data from sets to categories, which are defined by QBarCategory class.
                 \mainclass
                 Example on how to create view and apply theme:
                 \snippet ../example/barchart/main.cpp 5
-                \sa QBarCategory, QBarSet, QStackedBarChartSeries, QBarChartSeries
+                \sa QBarCategory, QBarSet, QPercentBarSeries, QBarSeries
             */
             /*!
-                \fn virtual QChartSeriesType QPercentBarChartSeries::type() const
+                \fn virtual QChartSeriesType QStackedBarSeries::type() const
                 \brief Returns type of series.
                 \sa QChartSeries, QChartSeriesType
             */
             /*!
-                Constructs empty QPercentBarChartSeries. Parameter \a category defines the categories for chart.
+                Constructs empty QStackedBarSeries. Parameter \a category defines the categories for chart.
-                QPercentBarChartSeries is QObject which is a child of a \a parent.
+                QStackedBarSeries is QObject which is a child of a \a parent.
             */
-            QPercentBarChartSeries::QPercentBarChartSeries(QBarCategory *category, QObject *parent)
+            QStackedBarSeries::QStackedBarSeries(QBarCategory *category, QObject *parent)
-                : QBarChartSeries(category, parent)
+                : QBarSeries(category, parent)
             {
             }
-            #include "moc_qpercentbarchartseries.cpp"
+            #include "moc_qstackedbarseries.cpp"
             QTCOMMERCIALCHART_END_NAMESPACE

src/barchart/qstackedbarseries.h ~~src/barchart/qstackedbarchartseries.h~~ renamed +6 -6

-            #ifndef STACKEDBARCHARTSERIES_H
+            #ifndef STACKEDBARSERIES_H
-            #define STACKEDBARCHARTSERIES_H
+            #define STACKEDBARSERIES_H
-            #include "qbarchartseries.h"
+            #include "qbarseries.h"
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
             class QBarCategory;
-            class QTCOMMERCIALCHART_EXPORT QStackedBarChartSeries : public QBarChartSeries
+            class QTCOMMERCIALCHART_EXPORT QStackedBarSeries : public QBarSeries
             {
                 Q_OBJECT
             public:
-                QStackedBarChartSeries(QBarCategory *category, QObject* parent=0);
+                QStackedBarSeries(QBarCategory *category, QObject* parent=0);
                 virtual QChartSeriesType type() const { return QChartSeries::SeriesTypeStackedBar; }
             };
             QTCOMMERCIALCHART_END_NAMESPACE
-            #endif // STACKEDBARCHARTSERIES_H
+            #endif // STACKEDBARSERIES_H

src/barchart/stackedbarpresenter.cpp +1 -1

             QTCOMMERCIALCHART_BEGIN_NAMESPACE
-            StackedBarPresenter::StackedBarPresenter(QBarChartSeries *series, QGraphicsItem *parent) :
+            StackedBarPresenter::StackedBarPresenter(QBarSeries *series, QGraphicsItem *parent) :
                 BarPresenterBase(series,parent)
             {
             }

src/barchart/stackedbarpresenter.h +2 -2

             #define STACKEDBARPRESENTER_H
             #include "barpresenterbase.h"
-            #include "qstackedbarchartseries.h"
+            #include "qstackedbarseries.h"
             #include <QGraphicsItem>
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
             {
                 Q_OBJECT
             public:
-                StackedBarPresenter(QBarChartSeries *series, QGraphicsItem *parent = 0);
+                StackedBarPresenter(QBarSeries *series, QGraphicsItem *parent = 0);
             private:
                 // From BarPresenterBase

src/chartdataset.cpp +6 -6

             #include "qchartaxis.h"
             //series
             #include "qlinechartseries.h"
-            #include "qbarchartseries.h"
+            #include "qbarseries.h"
-            #include "qstackedbarchartseries.h"
+            #include "qstackedbarseries.h"
-            #include "qpercentbarchartseries.h"
+            #include "qpercentbarseries.h"
             #include "qpieseries.h"
             #include "qscatterseries.h"
                     }
                     case QChartSeries::SeriesTypeBar: {
                     qDebug() << "QChartSeries::SeriesTypeBar";
-                        QBarChartSeries* barSeries = static_cast<QBarChartSeries*>(series);
+                        QBarSeries* barSeries = static_cast<QBarSeries*>(series);
                         qreal x = barSeries->countCategories();
                         qreal y = barSeries->max();
                         domain.m_minX = qMin(domain.m_minX,x);
                     case QChartSeries::SeriesTypeStackedBar: {
                     qDebug() << "QChartSeries::SeriesTypeStackedBar";
-                        QStackedBarChartSeries* stackedBarSeries = static_cast<QStackedBarChartSeries*>(series);
+                        QStackedBarSeries* stackedBarSeries = static_cast<QStackedBarSeries*>(series);
                         qreal x = stackedBarSeries->countCategories();
                         qreal y = stackedBarSeries->maxCategorySum();
                         domain.m_minX = qMin(domain.m_minX,x);
                     case QChartSeries::SeriesTypePercentBar: {
                     qDebug() << "QChartSeries::SeriesTypePercentBar";
-                        QPercentBarChartSeries* percentBarSeries = static_cast<QPercentBarChartSeries*>(series);
+                        QPercentBarSeries* percentBarSeries = static_cast<QPercentBarSeries*>(series);
                         qreal x = percentBarSeries->countCategories();
                         domain.m_minX = qMin(domain.m_minX,x);
                         domain.m_minY = 0;

src/chartpresenter.cpp +6 -6

             #include "chartdataset_p.h"
             #include "charttheme_p.h"
             //series
-            #include "qbarchartseries.h"
+            #include "qbarseries.h"
-            #include "qstackedbarchartseries.h"
+            #include "qstackedbarseries.h"
-            #include "qpercentbarchartseries.h"
+            #include "qpercentbarseries.h"
             #include "qlinechartseries.h"
             #include "qpieseries.h"
             #include "qscatterseries.h"
                     }
                     case QChartSeries::SeriesTypeBar: {
-                        QBarChartSeries* barSeries = static_cast<QBarChartSeries*>(series);
+                        QBarSeries* barSeries = static_cast<QBarSeries*>(series);
                         BarPresenter* item = new BarPresenter(barSeries,m_chart);
                         m_chartTheme->decorate(item,barSeries,m_chartItems.count());
                         QObject::connect(this,SIGNAL(geometryChanged(const QRectF&)),item,SLOT(handleGeometryChanged(const QRectF&)));
                     case QChartSeries::SeriesTypeStackedBar: {
-                        QStackedBarChartSeries* stackedBarSeries = static_cast<QStackedBarChartSeries*>(series);
+                        QStackedBarSeries* stackedBarSeries = static_cast<QStackedBarSeries*>(series);
                         StackedBarPresenter* item = new StackedBarPresenter(stackedBarSeries,m_chart);
                         m_chartTheme->decorate(item,stackedBarSeries,m_chartItems.count());
                         QObject::connect(this,SIGNAL(geometryChanged(const QRectF&)),item,SLOT(handleGeometryChanged(const QRectF&)));
                     case QChartSeries::SeriesTypePercentBar: {
-                        QPercentBarChartSeries* percentBarSeries = static_cast<QPercentBarChartSeries*>(series);
+                        QPercentBarSeries* percentBarSeries = static_cast<QPercentBarSeries*>(series);
                         PercentBarPresenter* item = new PercentBarPresenter(percentBarSeries,m_chart);
                         m_chartTheme->decorate(item,percentBarSeries ,m_chartItems.count());
                         QObject::connect(this,SIGNAL(geometryChanged(const QRectF&)),item,SLOT(handleGeometryChanged(const QRectF&)));

src/charttheme.cpp +9 -9

             //series
             #include "qbarset.h"
-            #include "qbarchartseries.h"
+            #include "qbarseries.h"
-            #include "qstackedbarchartseries.h"
+            #include "qstackedbarseries.h"
-            #include "qpercentbarchartseries.h"
+            #include "qpercentbarseries.h"
             #include "qlinechartseries.h"
             #include "qscatterseries.h"
             #include "qpieseries.h"
                         break;
                     }
                     case QChartSeries::SeriesTypeBar: {
-                        QBarChartSeries* b = static_cast<QBarChartSeries*>(series);
+                        QBarSeries* b = static_cast<QBarSeries*>(series);
                         BarPresenter* i = static_cast<BarPresenter*>(item);
                         decorate(i,b,count);
                         break;
                     }
                     case QChartSeries::SeriesTypeStackedBar: {
-                        QStackedBarChartSeries* s = static_cast<QStackedBarChartSeries*>(series);
+                        QStackedBarSeries* s = static_cast<QStackedBarSeries*>(series);
                         StackedBarPresenter* i = static_cast<StackedBarPresenter*>(item);
                         decorate(i,s,count);
                         break;
                     }
                     case QChartSeries::SeriesTypePercentBar: {
-                        QPercentBarChartSeries* s = static_cast<QPercentBarChartSeries*>(series);
+                        QPercentBarSeries* s = static_cast<QPercentBarSeries*>(series);
                         PercentBarPresenter* i = static_cast<PercentBarPresenter*>(item);
                         decorate(i,s,count);
                         break;
                 item->setPen(pen);
             }
-            void ChartTheme::decorate(BarPresenter* item, QBarChartSeries* series,int count)
+            void ChartTheme::decorate(BarPresenter* item, QBarSeries* series,int count)
             {
                 for (int i=0; i<series->countSets(); i++) {
                     series->nextSet(0==i)->setBrush(QBrush(m_seriesColor.at(i%m_seriesColor.count())));
                 }
             }
-            void ChartTheme::decorate(StackedBarPresenter* item, QStackedBarChartSeries* series,int count)
+            void ChartTheme::decorate(StackedBarPresenter* item, QStackedBarSeries* series,int count)
             {
                 for (int i=0; i<series->countSets(); i++) {
                     series->nextSet(0==i)->setBrush(QBrush(m_seriesColor.at(i%m_seriesColor.count())));
                 }
             }
-            void ChartTheme::decorate(PercentBarPresenter* item, QPercentBarChartSeries* series,int count)
+            void ChartTheme::decorate(PercentBarPresenter* item, QPercentBarSeries* series,int count)
             {
                 for (int i=0; i<series->countSets(); i++) {
                     series->nextSet(0==i)->setBrush(QBrush(m_seriesColor.at(i%m_seriesColor.count())));

src/charttheme_p.h +6 -6

             class LineChartItem;
             class QLineChartSeries;
             class BarPresenter;
-            class QBarChartSeries;
+            class QBarSeries;
             class StackedBarPresenter;
-            class QStackedBarChartSeries;
+            class QStackedBarSeries;
-            class QPercentBarChartSeries;
+            class QPercentBarSeries;
             class PercentBarPresenter;
             class QScatterSeries;
             class ScatterPresenter;
                 void decorate(QChart* chart);
                 void decorate(ChartItem* item, QChartSeries* series,int count);
                 void decorate(LineChartItem* item, QLineChartSeries*, int count);
-                void decorate(BarPresenter* item, QBarChartSeries* series,int count);
+                void decorate(BarPresenter* item, QBarSeries* series,int count);
-                void decorate(StackedBarPresenter* item, QStackedBarChartSeries* series,int count);
+                void decorate(StackedBarPresenter* item, QStackedBarSeries* series,int count);
-                void decorate(PercentBarPresenter* item, QPercentBarChartSeries* series,int count);
+                void decorate(PercentBarPresenter* item, QPercentBarSeries* series,int count);
                 void decorate(ScatterPresenter* presenter, QScatterSeries* series, int count);
                 void decorate(PiePresenter* item, QPieSeries* series, int count);
                 void decorate(QChartAxis* axis,AxisItem* item);

test/chartwidgettest/mainwidget.cpp +7 -7

             #include <qlinechartseries.h>
             #include <qbarset.h>
             #include <qbarcategory.h>
-            #include <qbarchartseries.h>
+            #include <qbarseries.h>
-            #include <qstackedbarchartseries.h>
+            #include <qstackedbarseries.h>
-            #include <qpercentbarchartseries.h>
+            #include <qpercentbarseries.h>
             #include <QPushButton>
             #include <QComboBox>
             #include <QSpinBox>
                     QStringList labels = generateLabels(rowCount);
                     foreach(QString label, labels)
                         *category << label;
-                    QBarChartSeries* series = 0;
+                    QBarSeries* series = 0;
                     if (seriesName == "Bar")
-                        series = new QBarChartSeries(category, this);
+                        series = new QBarSeries(category, this);
                     else if (seriesName == "Stacked bar")
-                        series = new QStackedBarChartSeries(category, this);
+                        series = new QStackedBarSeries(category, this);
                     else
-                        series = new QPercentBarChartSeries(category, this);
+                        series = new QPercentBarSeries(category, this);
                     for (int j(0); j < data.count(); j++) {
                         QList<qreal> column = data.at(j);

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