HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/qtcharts Commit - r377:a61a7697be62

replaced qbarcategory with qstringlist

sauimone -

r377:a61a7697be62

parent child

Context file:

r377:a61a7697be62

Collapse all files

example/barchart/main.cpp +5 -5

             #include <qchartview.h>
             #include <qbarseries.h>
             #include <qbarset.h>
-            #include <qbarcategory.h>
+            #include <QStringList>
             QTCOMMERCIALCHART_USE_NAMESPACE
                 QMainWindow window;
                 //! [1]
-                // Create category
+                // Define categories
-                QBarCategory *category = new QBarCategory;
+                QStringList catecories;
-                *category << "Jan" << "Feb" << "Mar" << "Apr" << "May" << "June" << "Jul" << "Aug" << "Sep" << "Oct" << "Nov" << "Dec";
+                catecories << "Jan" << "Feb" << "Mar" << "Apr" << "May" << "June" << "Jul" << "Aug" << "Sep" << "Oct" << "Nov" << "Dec";
                 //! [1]
                 //! [2]
                 //! [3]
                 // Create series and add sets to it
-                QBarSeries* series= new QBarSeries(category);
+                QBarSeries* series= new QBarSeries(catecories);
                 series->addBarSet(set0);
                 series->addBarSet(set1);

example/chartview/main.cpp +3 -3

             #include <qscatterseries.h>
             #include <qbarseries.h>
             #include <qbarset.h>
-            #include <qbarcategory.h>
             #include <qpieseries.h>
+            #include <QStringList>
             QTCOMMERCIALCHART_USE_NAMESPACE
                 //! [5]
                 // ...
                 // Add bar series
-                QBarCategory *barCategory = new QBarCategory();
+                QStringList barCategory;
-                *barCategory << "Jan"
+                barCategory << "Jan"
                              << "Feb"
                              << "Mar";
                 QBarSeries *bar = new QBarSeries(barCategory);

example/gdpbarchart/widget.cpp +3 -3

             #include <qscatterseries.h>
             #include <qchartview.h>
             #include <qchartaxis.h>
-            #include <qbarcategory.h>
             #include <qbarset.h>
             #include <QListWidget>
             #include <QPrinter>
             #include <QPrintDialog>
             #include <QRadioButton>
+            #include <QStringList>
             QTCOMMERCIALCHART_USE_NAMESPACE
                 if (barChartRadioButton->isChecked())
                 {
                     // use the sorted selected coutries list to initialize BarCategory
-                    QBarCategory* category = new QBarCategory;
+                    QStringList category;
                     for (int i = 0; i < selectedCountriesStrings.size(); i++)
-                        *category << selectedCountriesStrings[i];
+                        category << selectedCountriesStrings[i];
                     series0 = new QBarSeries(category);
                     // prepare the selected counries SQL query

example/percentbarchart/main.cpp +5 -5

             #include <QMainWindow>
             #include <QStandardItemModel>
             #include <qpercentbarseries.h>
-            #include <qbarcategory.h>
             #include <qchartview.h>
             #include <qbarset.h>
+            #include <QStringList>
             QTCOMMERCIALCHART_USE_NAMESPACE
                 QMainWindow window;
                 //! [1]
-                // Create category
+                // Define categories
-                QBarCategory *category = new QBarCategory;
+                QStringList categories;
-                *category << "Jan" << "Feb" << "Mar" << "Apr" << "May" << "June" << "Jul" << "Aug" << "Sep" << "Oct" << "Nov" << "Dec";
+                categories << "Jan" << "Feb" << "Mar" << "Apr" << "May" << "June" << "Jul" << "Aug" << "Sep" << "Oct" << "Nov" << "Dec";
                 //! [1]
                 //! [2]
                 //! [3]
                 // Create series and add sets to it
-                QPercentBarSeries* series = new QPercentBarSeries(category);
+                QPercentBarSeries* series = new QPercentBarSeries(categories);
                 series->addBarSet(set0);
                 series->addBarSet(set1);

example/stackedbarchart/main.cpp +5 -5

             #include <qchartview.h>
             #include <qstackedbarseries.h>
             #include <qbarset.h>
-            #include <qbarcategory.h>
+            #include <QStringList>
             QTCOMMERCIALCHART_USE_NAMESPACE
                 QMainWindow window;
                 //! [1]
-                // Create category
+                // Define categories
-                QBarCategory *category = new QBarCategory;
+                QStringList catecories;
-                *category << "Jan" << "Feb" << "Mar" << "Apr" << "May" << "June" << "Jul" << "Aug" << "Sep" << "Oct" << "Nov" << "Dec";
+                catecories << "Jan" << "Feb" << "Mar" << "Apr" << "May" << "June" << "Jul" << "Aug" << "Sep" << "Oct" << "Nov" << "Dec";
                 //! [1]
                 //! [2]
                 //! [3]
                 // Create series and add sets to it
-                QStackedBarSeries* series = new QStackedBarSeries(category);
+                QStackedBarSeries* series = new QStackedBarSeries(catecories);
                 series->addBarSet(set0);
                 series->addBarSet(set1);

src/barchart/barchart.pri 0 -2

                 $$PWD/barpresenter.cpp \
                 $$PWD/barpresenterbase.cpp \
                 $$PWD/percentbarpresenter.cpp \
-                $$PWD/qbarcategory.cpp \
                 $$PWD/qbarseries.cpp \
                 $$PWD/qbarset.cpp \
                 $$PWD/qpercentbarseries.cpp \
                 $$PWD/barvalue_p.h
             PUBLIC_HEADERS += \
-                $$PWD/qbarcategory.h \
                 $$PWD/qbarseries.h \
                 $$PWD/qbarset.h \
                 $$PWD/qpercentbarseries.h \

src/barchart/barchartmodel.cpp +5 -12

             #include <QVector>
             #include <QDebug>
             #include "barchartmodel_p.h"
-            #include "qbarcategory.h"
             #include "qbarset.h"
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
-            BarChartModel::BarChartModel(QBarCategory *category, QObject *parent) :
+            BarChartModel::BarChartModel(QStringList categories, QObject *parent) :
                 QObject(parent)
-                ,mCategory(category)
+                ,mCategory(categories)
             {
             }
-            BarChartModel::~BarChartModel()
+            QStringList BarChartModel::category()
             {
-                delete mCategory;
+                return mCategory;
-            QBarCategory& BarChartModel::category()
-                return *mCategory;
             }
             void BarChartModel::addBarSet(QBarSet *set)
             QString BarChartModel::label(int category)
             {
-                return mCategory->label(category);
+                return mCategory.at(category);
             }
             #include "moc_barchartmodel_p.cpp"

src/barchart/barchartmodel_p.h +4 -5

             #define BARCHARTMODEL_H
             #include <QObject>
+            #include <QStringList>
             #include "qchartglobal.h"
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
             // TODO: Implement as QAbstractItemModel?
             class QBarSet;
-            class QBarCategory;
             class BarChartModel : public QObject //, public QAbstractItemModel
             {
                 Q_OBJECT
             public:
-                explicit BarChartModel(QBarCategory *category, QObject *parent = 0);
+                explicit BarChartModel(QStringList categories, QObject *parent = 0);
-                ~BarChartModel();
-                QBarCategory& category();
+                QStringList category();
                 void addBarSet(QBarSet *set);
                 void removeBarSet(QBarSet *set);
                 QBarSet *setAt(int index);
             private:
                 QList<QBarSet*> mDataModel;
-                QBarCategory* mCategory;    // Owned
+                QStringList mCategory;
                 int mCurrentSet;

src/barchart/qbarseries.cpp +4 -6

             #include <QDebug>
             #include "qbarseries.h"
-            #include "qbarcategory.h"
             #include "qbarset.h"
             #include "barchartmodel_p.h"
                 QBarSeries represents a series of data shown as bars. One QBarSeries can contain multible
                 QBarSet data sets. QBarSeries groups the data from sets to categories, which are defined
-                by QBarCategory class.
+                by QStringList.
                 \mainclass
-                \sa QBarCategory, QBarSet, QStackedBarSeries, QPercentBarSeries
+                \sa QBarSet, QStackedBarSeries, QPercentBarSeries
             */
             /*!
             /*!
                 Constructs empty QBarSeries. Parameter \a category defines the categories for chart.
-                Takes ownership of \a category.
                 QBarSeries is QObject which is a child of a \a parent.
             */
-            QBarSeries::QBarSeries(QBarCategory *category, QObject *parent)
+            QBarSeries::QBarSeries(QStringList categories, QObject *parent)
                 : QSeries(parent)
-                ,mModel(new BarChartModel(category, this))
+                ,mModel(new BarChartModel(categories, this))
             {
             }

src/barchart/qbarseries.h +2 -2

             #define BARSERIES_H
             #include "qseries.h"
+            #include <QStringList>
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
-            class QBarCategory;
             class QBarSet;
             class BarChartModel;
             {
                 Q_OBJECT
             public:
-                QBarSeries(QBarCategory *category, QObject* parent=0);
+                QBarSeries(QStringList categories, QObject* parent=0);
                 virtual QSeriesType type() const { return QSeries::SeriesTypeBar; }

src/barchart/qbarset.cpp +1 -1

                 \mainclass
-                \sa QBarCategory, QBarSeries, QStackedBarSeries, QPercentBarSeries
+                \sa QBarSeries, QStackedBarSeries, QPercentBarSeries
             */
             /*!

src/barchart/qpercentbarseries.cpp +4 -4

                 QPercentBarSeries represents a series of data shown as bars. Each bar of QBarSet is shown as percentage
                 of all bars in category. One QPercentBarSeries can contain multible QBarSet data sets.
-                QBarSeries 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 QStringList.
                 \mainclass
-                \sa QBarCategory, QBarSet, QStackedBarSeries, QBarSeries
+                \sa QBarSet, QStackedBarSeries, QBarSeries
             */
             /*!
                 Constructs empty QPercentBarSeries. Parameter \a category defines the categories for chart.
                 QPercentBarSeries is QObject which is a child of a \a parent.
             */
-            QPercentBarSeries::QPercentBarSeries(QBarCategory *category, QObject *parent)
+            QPercentBarSeries::QPercentBarSeries(QStringList categories, QObject *parent)
-                : QBarSeries(category, parent)
+                : QBarSeries(categories, parent)
             {
             }

src/barchart/qpercentbarseries.h +2 -1

             #ifndef PERCENTBARSERIES_H
             #define PERCENTBARSERIES_H
+            #include <QStringList>
             #include "qbarseries.h"
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
             {
                 Q_OBJECT
             public:
-                QPercentBarSeries(QBarCategory *category, QObject* parent=0);
+                QPercentBarSeries(QStringList categories, QObject* parent=0);
                 virtual QSeriesType type() const { return QSeries::SeriesTypePercentBar; }
             };

src/barchart/qstackedbarseries.cpp +4 -4

                 QStackedBarSeries represents a series of data shown as bars. All bars in same category are
                 stacked on top of each other. One QStackedBarSeries can contain multible QBarSet data sets.
-                QStackedBarSeries 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 QStringList.
                 \mainclass
-                \sa QBarCategory, QBarSet, QPercentBarSeries, QBarSeries
+                \sa QBarSet, QPercentBarSeries, QBarSeries
             */
             /*!
                 Constructs empty QStackedBarSeries. Parameter \a category defines the categories for chart.
                 QStackedBarSeries is QObject which is a child of a \a parent.
             */
-            QStackedBarSeries::QStackedBarSeries(QBarCategory *category, QObject *parent)
+            QStackedBarSeries::QStackedBarSeries(QStringList categories, QObject *parent)
-                : QBarSeries(category, parent)
+                : QBarSeries(categories, parent)
             {
             }

src/barchart/qstackedbarseries.h +2 -3

             #ifndef STACKEDBARSERIES_H
             #define STACKEDBARSERIES_H
+            #include <QStringList>
             #include "qbarseries.h"
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
-            class QBarCategory;
             class QTCOMMERCIALCHART_EXPORT QStackedBarSeries : public QBarSeries
             {
                 Q_OBJECT
             public:
-                QStackedBarSeries(QBarCategory *category, QObject* parent=0);
+                QStackedBarSeries(QStringList categories, QObject* parent=0);
                 virtual QSeriesType type() const { return QSeries::SeriesTypeStackedBar; }
             };

test/chartwidgettest/mainwidget.cpp +2 -4

             #include "qscatterseries.h"
             #include <qlineseries.h>
             #include <qbarset.h>
-            #include <qbarcategory.h>
             #include <qbarseries.h>
             #include <qstackedbarseries.h>
             #include <qpercentbarseries.h>
                 } else if (seriesName == "Bar"
                            || seriesName == "Stacked bar"
                            || seriesName == "Percent bar") {
-                    // TODO: replace QBarCategory with QStringList?
+                    QStringList category;
-                    QBarCategory *category = new QBarCategory;
                     QStringList labels = generateLabels(rowCount);
                     foreach(QString label, labels)
-                        *category << label;
+                        category << label;
                     QBarSeries* series = 0;
                     if (seriesName == "Bar")
                         series = new QBarSeries(category, this);

src/barchart/qbarcategory.cpp removed 0 -56

NO CONTENT: file was removed

src/barchart/qbarcategory.h removed 0 -28

NO CONTENT: file was removed

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