HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/qtcharts Commit - r216:abacdc3682d1

Common naming convention for barcharts

sauimone -

r216:abacdc3682d1

parent child

Context file:

r216:abacdc3682d1

Expand all files

example/barchart/main.cpp +2 -2

             #include <QApplication>
             #include <QMainWindow>
             #include <QStandardItemModel>
-            #include <barchartseries.h>
+            #include <qbarchartseries.h>
             #include <qbarcategory.h>
             #include <qbarset.h>
             #include "chartwidget.h"
                 QBarCategory *category = new QBarCategory;
                 *category << "Jan" << "Feb" << "Mar" << "Apr" << "May" << "June" << "Jul" << "Aug" << "Sep" << "Oct" << "Nov" << "Dec";
-                BarChartSeries* series0 = new BarChartSeries(category);
+                QBarChartSeries* series0 = new QBarChartSeries(category);
                 QBarSet *set0 = new QBarSet;
                 QBarSet *set1 = new QBarSet;

example/gdpbarchart/widget.cpp +2 -2

             #include <qscatterseries.h>
             #include <qchartview.h>
             #include <qchartaxis.h>
-            #include <barchartseries.h>
+            #include <qbarchartseries.h>
             #include <qbarcategory.h>
             #include <qbarset.h>
             #include <QListWidget>
                 QBarCategory* category = new QBarCategory;
                 for (int i = 0; i < selectedCountriesStrings.size(); i++)
                     *category << selectedCountriesStrings[i];
-                BarChartSeries* series0 = new BarChartSeries(category);
+                QBarChartSeries* series0 = new QBarChartSeries(category);
                 // prepare the selected counries SQL query
                 QString countriesQuery = "country IN (";

example/percentbarchart/main.cpp +2 -2

             #include <QApplication>
             #include <QMainWindow>
             #include <QStandardItemModel>
-            #include <percentbarchartseries.h>
+            #include <qpercentbarchartseries.h>
             #include "chartwidget.h"
             #include <qbarcategory.h>
             #include <qbarset.h>
                 QBarCategory *category = new QBarCategory;
                 *category << "Jan" << "Feb" << "Mar" << "Apr" << "May" << "June" << "Jul" << "Aug" << "Sep" << "Oct" << "Nov" << "Dec";
-                PercentBarChartSeries* series0 = new PercentBarChartSeries(category);
+                QPercentBarChartSeries* series0 = new QPercentBarChartSeries(category);
                 QBarSet *set0 = new QBarSet;
                 QBarSet *set1 = new QBarSet;

example/stackedbarchart/main.cpp +2 -2

             #include <QApplication>
             #include <QMainWindow>
             #include <QStandardItemModel>
-            #include <stackedbarchartseries.h>
+            #include <qstackedbarchartseries.h>
             #include "chartwidget.h"
             #include <qbarset.h>
             #include <qbarcategory.h>
                 QBarCategory *category = new QBarCategory;
                 *category << "Jan" << "Feb" << "Mar" << "Apr" << "May" << "June" << "Jul" << "Aug" << "Sep" << "Oct" << "Nov" << "Dec";
-                StackedBarChartSeries* series0 = new StackedBarChartSeries(category);
+                QStackedBarChartSeries* series0 = new QStackedBarChartSeries(category);
                 QBarSet *set0 = new QBarSet;
                 QBarSet *set1 = new QBarSet;

src/barchart/barpresenter.cpp ~~src/barchart/bargroup.cpp~~ renamed +4 -4

-            #include "bargroup.h"
+            #include "barpresenter.h"
             #include "bar_p.h"
             #include "barlabel_p.h"
             #include "qbarset.h"
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
-            BarGroup::BarGroup(BarChartModel& model, QGraphicsItem *parent) :
+            BarPresenter::BarPresenter(BarChartModel& model, QGraphicsItem *parent) :
-                BarGroupBase(model,parent)
+                BarPresenterBase(model,parent)
             {
                 mBarDefaultWidth = 5;
             }
-            void BarGroup::layoutChanged()
+            void BarPresenter::layoutChanged()
             {
             //    qDebug() << "BarGroup::layoutChanged";
                 // Scale bars to new layout

src/barchart/barpresenter.h ~~src/barchart/bargroup.h~~ renamed +4 -4

             #ifndef QBARGROUP_H
             #define QBARGROUP_H
-            #include "bargroupbase.h"
+            #include "barpresenterbase.h"
-            #include "barchartseries.h"
+            #include "qbarchartseries.h"
             #include <QGraphicsItem>
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
             // Base class for bar groups
-            class BarGroup : public BarGroupBase
+            class BarPresenter : public BarPresenterBase
             {
             public:
-                explicit BarGroup(BarChartModel& model, QGraphicsItem *parent = 0);
+                explicit BarPresenter(BarChartModel& model, QGraphicsItem *parent = 0);
             private:

src/barchart/barpresenterbase.cpp ~~src/barchart/bargroupbase.cpp~~ renamed +11 -11

-            #include "bargroupbase.h"
+            #include "barpresenterbase.h"
             #include "bar_p.h"
             #include "barlabel_p.h"
             #include "separator_p.h"
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
-            BarGroupBase::BarGroupBase(BarChartModel& model, QGraphicsItem *parent)
+            BarPresenterBase::BarPresenterBase(BarChartModel& model, QGraphicsItem *parent)
                 : ChartItem(parent)
                 ,mBarDefaultWidth(20) // TODO: remove hard coding, when we have layout code ready
                 ,mLayoutSet(false)
                 dataChanged();
             }
-            void BarGroupBase::setSeparatorsVisible(bool visible)
+            void BarPresenterBase::setSeparatorsVisible(bool visible)
             {
                 mSeparatorsVisible = visible;
             }
-            void BarGroupBase::paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget)
+            void BarPresenterBase::paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget)
             {
             //    qDebug() << "BarGroupBase::paint" << childItems().count();
                 if (!mLayoutSet) {
             //    }
             }
-            QRectF BarGroupBase::boundingRect() const
+            QRectF BarPresenterBase::boundingRect() const
             {
                 return QRectF(0,0,mWidth,mHeight);
             }
-            void BarGroupBase::setBarWidth( int w )
+            void BarPresenterBase::setBarWidth( int w )
             {
                 mBarDefaultWidth = w;
             }
                 mBrushes.append(brush);
             }
             */
-            void BarGroupBase::dataChanged()
+            void BarPresenterBase::dataChanged()
             {
                 // TODO: performance optimizations. Do we really need to delete and create items every time data is changed or can we reuse them?
             //handlers
-            void BarGroupBase::handleModelChanged(int index)
+            void BarPresenterBase::handleModelChanged(int index)
             {
             //    qDebug() << "BarGroupBase::handleModelChanged" << index;
                 dataChanged();
             }
-            void BarGroupBase::handleDomainChanged(const Domain& domain)
+            void BarPresenterBase::handleDomainChanged(const Domain& domain)
             {
             //    qDebug() << "BarGroupBase::handleDomainChanged";
                 // TODO: Figure out the use case for this.
             //    layoutChanged();
             }
-            void BarGroupBase::handleGeometryChanged(const QRectF& rect)
+            void BarPresenterBase::handleGeometryChanged(const QRectF& rect)
             {
                 mWidth = rect.width();
                 mHeight = rect.height();
                 setPos(rect.topLeft());
             }
-            #include "moc_bargroupbase.cpp"
+            #include "moc_barpresenterbase.cpp"
             QTCOMMERCIALCHART_END_NAMESPACE

src/barchart/barpresenterbase.h ~~src/barchart/bargroupbase.h~~ renamed +2 -2

             QTCOMMERCIALCHART_BEGIN_NAMESPACE
             // Base Class for bar groups. Common implemantation of different groups. Not to be instantiated.
-            class BarGroupBase : public QObject, public ChartItem
+            class BarPresenterBase : public QObject, public ChartItem
             {
                 Q_OBJECT
             public:
-                BarGroupBase(BarChartModel& model, QGraphicsItem *parent = 0);
+                BarPresenterBase(BarChartModel& model, QGraphicsItem *parent = 0);
                 void setSeparatorsVisible(bool visible = true);
             public:

src/barchart/percentbarpresenter.cpp ~~src/barchart/percentbargroup.cpp~~ renamed +4 -4

-            #include "percentbargroup.h"
+            #include "percentbarpresenter.h"
             #include "bar_p.h"
             #include "barlabel_p.h"
             #include "separator_p.h"
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
-            PercentBarGroup::PercentBarGroup(BarChartModel& model, QGraphicsItem *parent) :
+            PercentBarPresenter::PercentBarPresenter(BarChartModel& model, QGraphicsItem *parent) :
-                BarGroupBase(model, parent)
+                BarPresenterBase(model, parent)
             {
             }
-            void PercentBarGroup::layoutChanged()
+            void PercentBarPresenter::layoutChanged()
             {
             //    qDebug() << "PercentBarGroup::layoutChanged";
                 // Scale bars to new layout

src/barchart/percentbarpresenter.h ~~src/barchart/percentbargroup.h~~ renamed +4 -4

             #include "chartitem_p.h"
             #include "bar_p.h"
-            #include "percentbarchartseries.h"
+            #include "qpercentbarchartseries.h"
-            #include "bargroupbase.h"
+            #include "barpresenterbase.h"
             #include <QGraphicsItem>
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
-            class PercentBarGroup : public BarGroupBase
+            class PercentBarPresenter : public BarPresenterBase
             {
             public:
-                PercentBarGroup(BarChartModel& model, QGraphicsItem *parent = 0);
+                PercentBarPresenter(BarChartModel& model, QGraphicsItem *parent = 0);
             private:

src/barchart/qbarchartseries.cpp ~~src/barchart/barchartseries.cpp~~ renamed +13 -13

             #include <QDebug>
-            #include "barchartseries.h"
+            #include "qbarchartseries.h"
             #include "qbarcategory.h"
             #include "qbarset.h"
             #include "barchartmodel_p.h"
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
-            BarChartSeries::BarChartSeries(QBarCategory *category, QObject *parent)
+            QBarChartSeries::QBarChartSeries(QBarCategory *category, QObject *parent)
                 : QChartSeries(parent)
                 ,mModel(new BarChartModel(category, this))
             {
             }
-            void BarChartSeries::addBarSet(QBarSet *set)
+            void QBarChartSeries::addBarSet(QBarSet *set)
             {
                 mModel->addBarSet(set);
             }
-            void BarChartSeries::removeBarSet(QBarSet *set)
+            void QBarChartSeries::removeBarSet(QBarSet *set)
             {
                 mModel->removeBarSet(set);
             }
-            int BarChartSeries::countSets()
+            int QBarChartSeries::countSets()
             {
                 return mModel->countSets();
             }
-            QBarSet* BarChartSeries::nextSet(bool getFirst)
+            QBarSet* QBarChartSeries::nextSet(bool getFirst)
             {
                 return mModel->nextSet(getFirst);
             }
-            int BarChartSeries::countCategories()
+            int QBarChartSeries::countCategories()
             {
                 return mModel->countCategories();
             }
-            qreal BarChartSeries::min()
+            qreal QBarChartSeries::min()
             {
                 return mModel->min();
             }
-            qreal BarChartSeries::max()
+            qreal QBarChartSeries::max()
             {
                 return mModel->max();
             }
-            qreal BarChartSeries::valueAt(int set, int category)
+            qreal QBarChartSeries::valueAt(int set, int category)
             {
                 return mModel->valueAt(set,category);
             }
-            qreal BarChartSeries::maxCategorySum()
+            qreal QBarChartSeries::maxCategorySum()
             {
                 return mModel->maxCategorySum();
             }
-            BarChartModel& BarChartSeries::model()
+            BarChartModel& QBarChartSeries::model()
             {
                 return *mModel;
             }
-            #include "moc_barchartseries.cpp"
+            #include "moc_qbarchartseries.cpp"
             QTCOMMERCIALCHART_END_NAMESPACE

src/barchart/qbarchartseries.h ~~src/barchart/barchartseries.h~~ renamed +4 -4

             class QBarCategory;
             class QBarSet;
-            class BarGroup;
+            class BarPresenter;
             class BarChartModel;
             // Container for series
-            class QTCOMMERCIALCHART_EXPORT BarChartSeries : public QChartSeries
+            class QTCOMMERCIALCHART_EXPORT QBarChartSeries : public QChartSeries
             {
                 Q_OBJECT
             public:
-                BarChartSeries(QBarCategory *category, QObject* parent=0);
+                QBarChartSeries(QBarCategory *category, QObject* parent=0);
                 virtual QChartSeriesType type() const { return QChartSeries::SeriesTypeBar; }
             private:
-                BarGroup* mBarGroup;
+                BarPresenter* mBarGroup;
                 BarChartModel* mModel;
             };

src/barchart/qpercentbarchartseries.cpp ~~src/barchart/stackedbarchartseries.cpp~~ renamed +14 -14

             #include <limits.h>
             #include <QDebug>
-            #include "stackedbarchartseries.h"
+            #include "qpercentbarchartseries.h"
-            #include "qbarcategory.h"
             #include "qbarset.h"
+            #include "qbarcategory.h"
             #include "barchartmodel_p.h"
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
-            StackedBarChartSeries::StackedBarChartSeries(QBarCategory *category, QObject *parent)
+            QPercentBarChartSeries::QPercentBarChartSeries(QBarCategory *category, QObject *parent)
                 : QChartSeries(parent)
                 ,mModel(new BarChartModel(category, this))
             {
             }
-            void StackedBarChartSeries::addBarSet(QBarSet *set)
+            void QPercentBarChartSeries::addBarSet(QBarSet *set)
             {
                 mModel->addBarSet(set);
             }
-            void StackedBarChartSeries::removeBarSet(QBarSet *set)
+            void QPercentBarChartSeries::removeBarSet(QBarSet *set)
             {
                 mModel->removeBarSet(set);
             }
-            int StackedBarChartSeries::countSets()
+            int QPercentBarChartSeries::countSets()
             {
                 return mModel->countSets();
             }
-            QBarSet* StackedBarChartSeries::nextSet(bool getFirst)
+            QBarSet* QPercentBarChartSeries::nextSet(bool getFirst)
             {
                 return mModel->nextSet(getFirst);
             }
-            int StackedBarChartSeries::countCategories()
+            int QPercentBarChartSeries::countCategories()
             {
                 return mModel->countCategories();
             }
-            qreal StackedBarChartSeries::min()
+            qreal QPercentBarChartSeries::min()
             {
                 return mModel->min();
             }
-            qreal StackedBarChartSeries::max()
+            qreal QPercentBarChartSeries::max()
             {
                 return mModel->max();
             }
-            qreal StackedBarChartSeries::valueAt(int set, int category)
+            qreal QPercentBarChartSeries::valueAt(int set, int category)
             {
                 return mModel->valueAt(set,category);
             }
-            qreal StackedBarChartSeries::maxCategorySum()
+            qreal QPercentBarChartSeries::maxCategorySum()
             {
                 return mModel->maxCategorySum();
             }
-            BarChartModel& StackedBarChartSeries::model()
+            BarChartModel& QPercentBarChartSeries::model()
             {
                 return *mModel;
             }
-            #include "moc_stackedbarchartseries.cpp"
+            #include "moc_qpercentbarchartseries.cpp"
             QTCOMMERCIALCHART_END_NAMESPACE

src/barchart/qpercentbarchartseries.h ~~src/barchart/percentbarchartseries.h~~ renamed +4 -4

             QTCOMMERCIALCHART_BEGIN_NAMESPACE
-            class PercentBarGroup;
+            class PercentBarPresenter;
             class QBarCategory;
             class QBarSet;
             class BarChartModel;
-            class QTCOMMERCIALCHART_EXPORT PercentBarChartSeries : public QChartSeries
+            class QTCOMMERCIALCHART_EXPORT QPercentBarChartSeries : public QChartSeries
             {
                 Q_OBJECT
             public:
-                PercentBarChartSeries(QBarCategory *category, QObject* parent=0);
+                QPercentBarChartSeries(QBarCategory *category, QObject* parent=0);
                 // from BarChartSeriesBase
                 virtual QChartSeriesType type() const { return QChartSeries::SeriesTypePercentBar; }
             private:
-                PercentBarGroup* mPercentBarGroup;
+                PercentBarPresenter* mPercentBarGroup;
                 BarChartModel* mModel;
             };

src/barchart/qstackedbarchartseries.cpp ~~src/barchart/percentbarchartseries.cpp~~ renamed +14 -16

-            #include "percentbarchartseries.h"
             #include <limits.h>
             #include <QDebug>
-            #include "percentbarchartseries.h"
+            #include "qstackedbarchartseries.h"
-            #include "qbarset.h"
             #include "qbarcategory.h"
+            #include "qbarset.h"
             #include "barchartmodel_p.h"
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
-            PercentBarChartSeries::PercentBarChartSeries(QBarCategory *category, QObject *parent)
+            QStackedBarChartSeries::QStackedBarChartSeries(QBarCategory *category, QObject *parent)
                 : QChartSeries(parent)
                 ,mModel(new BarChartModel(category, this))
             {
             }
-            void PercentBarChartSeries::addBarSet(QBarSet *set)
+            void QStackedBarChartSeries::addBarSet(QBarSet *set)
             {
                 mModel->addBarSet(set);
             }
-            void PercentBarChartSeries::removeBarSet(QBarSet *set)
+            void QStackedBarChartSeries::removeBarSet(QBarSet *set)
             {
                 mModel->removeBarSet(set);
             }
-            int PercentBarChartSeries::countSets()
+            int QStackedBarChartSeries::countSets()
             {
                 return mModel->countSets();
             }
-            QBarSet* PercentBarChartSeries::nextSet(bool getFirst)
+            QBarSet* QStackedBarChartSeries::nextSet(bool getFirst)
             {
                 return mModel->nextSet(getFirst);
             }
-            int PercentBarChartSeries::countCategories()
+            int QStackedBarChartSeries::countCategories()
             {
                 return mModel->countCategories();
             }
-            qreal PercentBarChartSeries::min()
+            qreal QStackedBarChartSeries::min()
             {
                 return mModel->min();
             }
-            qreal PercentBarChartSeries::max()
+            qreal QStackedBarChartSeries::max()
             {
                 return mModel->max();
             }
-            qreal PercentBarChartSeries::valueAt(int set, int category)
+            qreal QStackedBarChartSeries::valueAt(int set, int category)
             {
                 return mModel->valueAt(set,category);
             }
-            qreal PercentBarChartSeries::maxCategorySum()
+            qreal QStackedBarChartSeries::maxCategorySum()
             {
                 return mModel->maxCategorySum();
             }
-            BarChartModel& PercentBarChartSeries::model()
+            BarChartModel& QStackedBarChartSeries::model()
             {
                 return *mModel;
             }
-            #include "moc_percentbarchartseries.cpp"
+            #include "moc_qstackedbarchartseries.cpp"
             QTCOMMERCIALCHART_END_NAMESPACE

src/barchart/qstackedbarchartseries.h ~~src/barchart/stackedbarchartseries.h~~ renamed +4 -4

             QTCOMMERCIALCHART_BEGIN_NAMESPACE
-            class StackedBarGroup;
+            class StackedBarPresenter;
             class QBarCategory;
             class QBarSet;
             class BarChartModel;
-            class QTCOMMERCIALCHART_EXPORT StackedBarChartSeries : public QChartSeries
+            class QTCOMMERCIALCHART_EXPORT QStackedBarChartSeries : public QChartSeries
             {
                 Q_OBJECT
             public:
-                StackedBarChartSeries(QBarCategory *category, QObject* parent=0);
+                QStackedBarChartSeries(QBarCategory *category, QObject* parent=0);
                 // from QChartSeries
                 virtual QChartSeriesType type() const { return QChartSeries::SeriesTypeStackedBar; }
             private:
-                StackedBarGroup* mStackedBarGroup;
+                StackedBarPresenter* mStackedBarGroup;
                 BarChartModel* mModel;
             };

src/barchart/stackedbarpresenter.cpp ~~src/barchart/stackedbargroup.cpp~~ renamed +4 -4

-            #include "stackedbargroup.h"
+            #include "stackedbarpresenter.h"
             #include "bar_p.h"
             #include "barlabel_p.h"
             #include "separator_p.h"
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
-            StackedBarGroup::StackedBarGroup(BarChartModel& model, QGraphicsItem *parent) :
+            StackedBarPresenter::StackedBarPresenter(BarChartModel& model, QGraphicsItem *parent) :
-                BarGroupBase(model,parent)
+                BarPresenterBase(model,parent)
             {
             }
-            void StackedBarGroup::layoutChanged()
+            void StackedBarPresenter::layoutChanged()
             {
             //    qDebug() << "StackedBarGroup::layoutChanged";
                 // Scale bars to new layout

src/barchart/stackedbarpresenter.h ~~src/barchart/stackedbargroup.h~~ renamed +4 -4

             #ifndef STACKEDBARGROUP_H
             #define STACKEDBARGROUP_H
-            #include "bargroupbase.h"
+            #include "barpresenterbase.h"
-            #include "stackedbarchartseries.h"
+            #include "qstackedbarchartseries.h"
             #include <QGraphicsItem>
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
-            class StackedBarGroup : public BarGroupBase
+            class StackedBarPresenter : public BarPresenterBase
             {
             public:
-                StackedBarGroup(BarChartModel& model, QGraphicsItem *parent = 0);
+                StackedBarPresenter(BarChartModel& model, QGraphicsItem *parent = 0);
             private:
                 // From BarGroupBase

src/chartdataset.cpp +6 -6

             #include "chartdataset_p.h"
             //series
             #include "qlinechartseries.h"
-            #include "barchartseries.h"
+            #include "qbarchartseries.h"
-            #include "stackedbarchartseries.h"
+            #include "qstackedbarchartseries.h"
-            #include "percentbarchartseries.h"
+            #include "qpercentbarchartseries.h"
             #include "qpieseries.h"
             #include "qscatterseries.h"
                     }
                     case QChartSeries::SeriesTypeBar: {
                     qDebug() << "QChartSeries::SeriesTypeBar";
-                        BarChartSeries* barSeries = static_cast<BarChartSeries*>(series);
+                        QBarChartSeries* barSeries = static_cast<QBarChartSeries*>(series);
                         qreal x = barSeries->countCategories();
                         qreal y = barSeries->max();
                         domain.m_minX = qMin(domain.m_minX,x);
                     case QChartSeries::SeriesTypeStackedBar: {
                     qDebug() << "QChartSeries::SeriesTypeStackedBar";
-                        StackedBarChartSeries* stackedBarSeries = static_cast<StackedBarChartSeries*>(series);
+                        QStackedBarChartSeries* stackedBarSeries = static_cast<QStackedBarChartSeries*>(series);
                         qreal x = stackedBarSeries->countCategories();
                         qreal y = stackedBarSeries->maxCategorySum();
                         domain.m_minX = qMin(domain.m_minX,x);
                     case QChartSeries::SeriesTypePercentBar: {
                     qDebug() << "QChartSeries::SeriesTypePercentBar";
-                        PercentBarChartSeries* percentBarSeries = static_cast<PercentBarChartSeries*>(series);
+                        QPercentBarChartSeries* percentBarSeries = static_cast<QPercentBarChartSeries*>(series);
                         qreal x = percentBarSeries->countCategories();
                         domain.m_minX = qMin(domain.m_minX,x);
                         domain.m_minY = 0;

src/chartpresenter.cpp +12 -12

             #include "chartdataset_p.h"
             #include "charttheme_p.h"
             //series
-            #include "barchartseries.h"
+            #include "qbarchartseries.h"
-            #include "stackedbarchartseries.h"
+            #include "qstackedbarchartseries.h"
-            #include "percentbarchartseries.h"
+            #include "qpercentbarchartseries.h"
             #include "qlinechartseries.h"
             #include "qpieseries.h"
             #include "qscatterseries.h"
             //items
             #include "axisitem_p.h"
-            #include "bargroup.h"
+            #include "barpresenter.h"
-            #include "stackedbargroup.h"
+            #include "stackedbarpresenter.h"
             #include "linechartitem_p.h"
-            #include "percentbargroup.h"
+            #include "percentbarpresenter.h"
             #include "linechartanimationitem_p.h"
             #include "piepresenter.h"
             #include "scatterpresenter_p.h"
                     }
                     case QChartSeries::SeriesTypeBar: {
-                        BarChartSeries* barSeries = static_cast<BarChartSeries*>(series);
+                        QBarChartSeries* barSeries = static_cast<QBarChartSeries*>(series);
-                        BarGroup* item = new BarGroup(barSeries->model(),m_chart);
+                        BarPresenter* item = new BarPresenter(barSeries->model(),m_chart);
                         m_chartTheme->decorate(item,barSeries,m_chartItems.count());
                         QObject::connect(this,SIGNAL(geometryChanged(const QRectF&)),item,SLOT(handleGeometryChanged(const QRectF&)));
                         QObject::connect(m_dataset,SIGNAL(domainChanged(const Domain&)),item,SLOT(handleDomainChanged(const Domain&)));
                     case QChartSeries::SeriesTypeStackedBar: {
-                        StackedBarChartSeries* stackedBarSeries = static_cast<StackedBarChartSeries*>(series);
+                        QStackedBarChartSeries* stackedBarSeries = static_cast<QStackedBarChartSeries*>(series);
-                        StackedBarGroup* item = new StackedBarGroup(stackedBarSeries->model(),m_chart);
+                        StackedBarPresenter* item = new StackedBarPresenter(stackedBarSeries->model(),m_chart);
                         m_chartTheme->decorate(item,stackedBarSeries,m_chartItems.count());
                         QObject::connect(this,SIGNAL(geometryChanged(const QRectF&)),item,SLOT(handleGeometryChanged(const QRectF&)));
                         QObject::connect(m_dataset,SIGNAL(domainChanged(const Domain&)),item,SLOT(handleDomainChanged(const Domain&)));
                     case QChartSeries::SeriesTypePercentBar: {
-                        PercentBarChartSeries* percentBarSeries = static_cast<PercentBarChartSeries*>(series);
+                        QPercentBarChartSeries* percentBarSeries = static_cast<QPercentBarChartSeries*>(series);
-                        PercentBarGroup* item = new PercentBarGroup(percentBarSeries->model(),m_chart);
+                        PercentBarPresenter* item = new PercentBarPresenter(percentBarSeries->model(),m_chart);
                         m_chartTheme->decorate(item,percentBarSeries ,m_chartItems.count());
                         QObject::connect(this,SIGNAL(geometryChanged(const QRectF&)),item,SLOT(handleGeometryChanged(const QRectF&)));
                         QObject::connect(m_dataset,SIGNAL(domainChanged(const Domain&)),item,SLOT(handleDomainChanged(const Domain&)));

src/charttheme.cpp +15 -15

             //series
             #include "qbarset.h"
-            #include "barchartseries.h"
+            #include "qbarchartseries.h"
-            #include "stackedbarchartseries.h"
+            #include "qstackedbarchartseries.h"
-            #include "percentbarchartseries.h"
+            #include "qpercentbarchartseries.h"
             #include "qlinechartseries.h"
             #include "qscatterseries.h"
             #include "qpieseries.h"
             //items
             #include "axisitem_p.h"
-            #include "bargroup.h"
+            #include "barpresenter.h"
-            #include "stackedbargroup.h"
+            #include "stackedbarpresenter.h"
             #include "linechartitem_p.h"
-            #include "percentbargroup.h"
+            #include "percentbarpresenter.h"
             #include "scatterpresenter_p.h"
             #include "piepresenter.h"
                         break;
                     }
                     case QChartSeries::SeriesTypeBar: {
-                        BarChartSeries* b = static_cast<BarChartSeries*>(series);
+                        QBarChartSeries* b = static_cast<QBarChartSeries*>(series);
-                        BarGroup* i = static_cast<BarGroup*>(item);
+                        BarPresenter* i = static_cast<BarPresenter*>(item);
                         decorate(i,b,count);
                         break;
                     }
                     case QChartSeries::SeriesTypeStackedBar: {
-                        StackedBarChartSeries* s = static_cast<StackedBarChartSeries*>(series);
+                        QStackedBarChartSeries* s = static_cast<QStackedBarChartSeries*>(series);
-                        StackedBarGroup* i = static_cast<StackedBarGroup*>(item);
+                        StackedBarPresenter* i = static_cast<StackedBarPresenter*>(item);
                         decorate(i,s,count);
                         break;
                     }
                     case QChartSeries::SeriesTypePercentBar: {
-                        PercentBarChartSeries* s = static_cast<PercentBarChartSeries*>(series);
+                        QPercentBarChartSeries* s = static_cast<QPercentBarChartSeries*>(series);
-                        PercentBarGroup* i = static_cast<PercentBarGroup*>(item);
+                        PercentBarPresenter* i = static_cast<PercentBarPresenter*>(item);
                         decorate(i,s,count);
                         break;
                     }
                 item->setPen(pen);
             }
-            void ChartTheme::decorate(BarGroup* item, BarChartSeries* series,int count)
+            void ChartTheme::decorate(BarPresenter* item, QBarChartSeries* 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(StackedBarGroup* item, StackedBarChartSeries* series,int count)
+            void ChartTheme::decorate(StackedBarPresenter* item, QStackedBarChartSeries* 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(PercentBarGroup* item, PercentBarChartSeries* series,int count)
+            void ChartTheme::decorate(PercentBarPresenter* item, QPercentBarChartSeries* 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 +9 -9

             class QChartSeries;
             class LineChartItem;
             class QLineChartSeries;
-            class BarGroup;
+            class BarPresenter;
-            class BarChartSeries;
+            class QBarChartSeries;
-            class StackedBarGroup;
+            class StackedBarPresenter;
-            class StackedBarChartSeries;
+            class QStackedBarChartSeries;
-            class PercentBarChartSeries;
+            class QPercentBarChartSeries;
-            class PercentBarGroup;
+            class PercentBarPresenter;
             class QScatterSeries;
             class ScatterPresenter;
             class PiePresenter;
                 void decorate(QChart* chart);
                 void decorate(ChartItem* item, QChartSeries* series,int count);
                 void decorate(LineChartItem* item, QLineChartSeries*, int count);
-                void decorate(BarGroup* item, BarChartSeries* series,int count);
+                void decorate(BarPresenter* item, QBarChartSeries* series,int count);
-                void decorate(StackedBarGroup* item, StackedBarChartSeries* series,int count);
+                void decorate(StackedBarPresenter* item, QStackedBarChartSeries* series,int count);
-                void decorate(PercentBarGroup* item, PercentBarChartSeries* series,int count);
+                void decorate(PercentBarPresenter* item, QPercentBarChartSeries* 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);

src/qchart.cpp +3 -3

             #include "chartdataset_p.h"
             //series
-            #include "barchartseries.h"
+            #include "qbarchartseries.h"
-            #include "stackedbarchartseries.h"
+            #include "qstackedbarchartseries.h"
-            #include "percentbarchartseries.h"
+            #include "qpercentbarchartseries.h"
             #include "qlinechartseries.h"
             #include "qscatterseries.h"
             //#include "scatterseries_p.h"

src/qchart.h +1 -1

             class AxisItem;
             class QChartSeries;
             class PlotDomain;
-            class BarGroup;
+            class BarPresenter;
             class QChartAxis;
             class ChartTheme;
             class ChartItem;

src/src.pro +15 -14

                 gui
             CONFIG += debug_and_release
             CONFIG(debug, debug|release):TARGET = QtCommercialChartd
-            SOURCES += barchart/barchartseries.cpp \
+            SOURCES += \
-                barchart/bargroup.cpp \
                 barchart/bar.cpp \
-                barchart/stackedbarchartseries.cpp \
-                barchart/stackedbargroup.cpp \
-                barchart/percentbarchartseries.cpp \
-                barchart/percentbargroup.cpp \
                 barchart/barlabel.cpp \
                 barchart/barchartmodel.cpp \
                 barchart/separator.cpp \
-                barchart/bargroupbase.cpp \
                 barchart/qbarset.cpp \
                 barchart/qbarcategory.cpp \
+                barchart/qbarchartseries.cpp \
+                barchart/qpercentbarchartseries.cpp \
+                barchart/qstackedbarchartseries.cpp \
+                barchart/barpresenterbase.cpp \
+                barchart/barpresenter.cpp \
+                barchart/stackedbarpresenter.cpp \
+                barchart/percentbarpresenter.cpp \
                 linechart/linechartanimationitem.cpp \
                 linechart/linechartitem.cpp \
                 linechart/qlinechartseries.cpp \
                 chartpresenter_p.h \
                 domain_p.h
             PUBLIC_HEADERS += linechart/qlinechartseries.h \
-                barchart/barchartseries.h \
+                barchart/qbarchartseries.h \
-                barchart/bargroup.h \
+                barchart/barpresenter.h \
-                barchart/stackedbarchartseries.h \
+                barchart/qstackedbarchartseries.h \
-                barchart/stackedbargroup.h \
+                barchart/stackedbarpresenter.h \
-                barchart/percentbarchartseries.h \
+                barchart/qpercentbarchartseries.h \
-                barchart/percentbargroup.h \
+                barchart/percentbarpresenter.h \
-                barchart/bargroupbase.h \
+                barchart/barpresenterbase.h \
                 barchart/qbarset.h \
                 barchart/qbarcategory.h \
                 qchartseries.h \

test/chartwidgettest/mainwidget.cpp +3 -3

             #include <qlinechartseries.h>
             #include <qbarset.h>
             #include <qbarcategory.h>
-            #include <barchartseries.h>
+            #include <qbarchartseries.h>
-            #include <stackedbarchartseries.h>
+            #include <qstackedbarchartseries.h>
-            #include <percentbarchartseries.h>
+            #include <qpercentbarchartseries.h>
             #include <QPushButton>
             #include <QComboBox>
             #include <QSpinBox>

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