HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/qtcharts Commit - r171:d4b8c60ed973

Barset and barcategory implememtation. Updated test application

sauimone -

r171:d4b8c60ed973

parent child

Context file:

r171:d4b8c60ed973

Collapse all files

example/barchart/main.cpp +1 -1

             #include <QApplication>
             #include <QMainWindow>
             #include <QStandardItemModel>
             #include <barchartseries.h>
             #include <qbarcategory.h>
             #include <qbarset.h>
             #include "chartwidget.h"
             QTCOMMERCIALCHART_USE_NAMESPACE
             int main(int argc, char *argv[])
             {
                 QApplication a(argc, argv);
                 QMainWindow window;
                 QBarCategory category;
-                category << "Jan" << "Feb" << "Mar" << "Apr" << "May" << "June" << "Jul" << "Aug" << "Sep" << "Nov" << "Dec";
+                category << "Jan" << "Feb" << "Mar" << "Apr" << "May" << "June" << "Jul" << "Aug" << "Sep" << "Oct" << "Nov" << "Dec";
                 BarChartSeries* series0 = new BarChartSeries(category);
                 QBarSet barSet0;
                 QBarSet barSet1;
                 QBarSet barSet2;
                 QBarSet barSet3;
                 QBarSet barSet4;
                 // Create some test data to chart
                 barSet0 << 1 << 2 << 3 << 4 << 5 << 6 << 7 << 8 << 9 << 10;
                 barSet1 << 5 << 0 << 0 << 4 << 0 << 7 << 8 << 9 << 9 << 0;
                 barSet2 << 3 << 5 << 8 << 13 << 8 << 5 << 3 << 2 << 1 << 1;
                 barSet3 << 5 << 6 << 7 << 3 << 4 << 5 << 8 << 9 << 10 << 5;
                 barSet4 << 9 << 7 << 5 << 3 << 1 << 2 << 4 << 6 << 8 << 10;
                 series0->addBarSet(barSet0);
                 series0->addBarSet(barSet1);
                 series0->addBarSet(barSet2);
                 series0->addBarSet(barSet3);
                 series0->addBarSet(barSet4);
                 ChartWidget* chartWidget =  new ChartWidget(&window);
                 chartWidget->addSeries(series0);
                 window.setCentralWidget(chartWidget);
                 window.resize(400, 300);
                 window.show();
                 return a.exec();
             }

example/percentbarchart/main.cpp +1 -1

             #include <QApplication>
             #include <QMainWindow>
             #include <QStandardItemModel>
             #include <percentbarchartseries.h>
             #include "chartwidget.h"
             #include <qbarcategory.h>
             #include <qbarset.h>
             QTCOMMERCIALCHART_USE_NAMESPACE
             int main(int argc, char *argv[])
             {
                 QApplication a(argc, argv);
                 QMainWindow window;
                 QBarCategory category;
-                category << "Jan" << "Feb" << "Mar" << "Apr" << "May" << "June" << "Jul" << "Aug" << "Sep" << "Nov" << "Dec";
+                category << "Jan" << "Feb" << "Mar" << "Apr" << "May" << "June" << "Jul" << "Aug" << "Sep" << "Oct" << "Nov" << "Dec";
                 PercentBarChartSeries* series0 = new PercentBarChartSeries(category);
                 QBarSet barSet0;
                 QBarSet barSet1;
                 QBarSet barSet2;
                 QBarSet barSet3;
                 QBarSet barSet4;
                 // Create some test data to chart
                 barSet0 << 1 << 2 << 3 << 4 << 5 << 6 << 7 << 8 << 9 << 10;
                 barSet1 << 5 << 0 << 0 << 4 << 0 << 7 << 8 << 9 << 9 << 0;
                 barSet2 << 3 << 5 << 8 << 13 << 8 << 5 << 3 << 2 << 1 << 1;
                 barSet3 << 5 << 6 << 7 << 3 << 4 << 5 << 8 << 9 << 10 << 5;
                 barSet4 << 9 << 7 << 5 << 3 << 1 << 2 << 4 << 6 << 8 << 10;
                 series0->addBarSet(barSet0);
                 series0->addBarSet(barSet1);
                 series0->addBarSet(barSet2);
                 series0->addBarSet(barSet3);
                 series0->addBarSet(barSet4);
                 ChartWidget* chartWidget =  new ChartWidget(&window);
                 chartWidget->addSeries(series0);
                 window.setCentralWidget(chartWidget);
                 window.resize(400, 300);
                 window.show();
                 return a.exec();
             }

example/stackedbarchart/main.cpp +1 -1

             #include <QApplication>
             #include <QMainWindow>
             #include <QStandardItemModel>
             #include <stackedbarchartseries.h>
             #include "chartwidget.h"
             #include <qbarset.h>
             #include <qbarcategory.h>
             QTCOMMERCIALCHART_USE_NAMESPACE
             int main(int argc, char *argv[])
             {
                 QApplication a(argc, argv);
                 QMainWindow window;
                 QBarCategory category;
-                category << "Jan" << "Feb" << "Mar" << "Apr" << "May" << "June" << "Jul" << "Aug" << "Sep" << "Nov" << "Dec";
+                category << "Jan" << "Feb" << "Mar" << "Apr" << "May" << "June" << "Jul" << "Aug" << "Sep" << "Oct" << "Nov" << "Dec";
                 StackedBarChartSeries* series0 = new StackedBarChartSeries(category);
                 QBarSet barSet0;
                 QBarSet barSet1;
                 QBarSet barSet2;
                 QBarSet barSet3;
                 QBarSet barSet4;
                 // Create some test data to chart
                 barSet0 << 1 << 2 << 3 << 4 << 5 << 6 << 7 << 8 << 9 << 10;
                 barSet1 << 5 << 0 << 0 << 4 << 0 << 7 << 8 << 9 << 9 << 0;
                 barSet2 << 3 << 5 << 8 << 13 << 8 << 5 << 3 << 2 << 1 << 1;
                 barSet3 << 5 << 6 << 7 << 3 << 4 << 5 << 8 << 9 << 10 << 5;
                 barSet4 << 9 << 7 << 5 << 3 << 1 << 2 << 4 << 6 << 8 << 10;
                 series0->addBarSet(barSet0);
                 series0->addBarSet(barSet1);
                 series0->addBarSet(barSet2);
                 series0->addBarSet(barSet3);
                 series0->addBarSet(barSet4);
                 ChartWidget* chartWidget =  new ChartWidget(&window);
                 chartWidget->addSeries(series0);
                 window.setCentralWidget(chartWidget);
                 window.resize(400, 300);
                 window.show();
                 return a.exec();
             }

src/barchart/barchartmodel.cpp +23 -60

             #include <limits.h>
             #include <QVector>
             #include <QDebug>
             #include "barchartmodel_p.h"
             #include "qbarcategory.h"
             #include "qbarset.h"
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
             BarChartModel::BarChartModel(QBarCategory &category, QObject *parent) :
                 QObject(parent)
-                ,mRunningId(1)
                 ,mCategory(category)
             {
             }
-            BarChartModel::~BarChartModel()
+            QBarCategory& BarChartModel::category()
             {
-            //    qDebug() << "BarChartModel::~BarChartModel";
+                return mCategory;
-                foreach (DataContainer* c, mDataModel) {
-                    delete c;
-            int BarChartModel::addData(QList<qreal> data)
-            //    qDebug() << "BarChartModel::addData" << data.count();
-                DataContainer* c = new DataContainer(data,mRunningId);
-                mDataModel.append(c);
-                mRunningId++;
-                emit modelUpdated();
-                return mRunningId-1;
-            void BarChartModel::removeData(int id)
-            //    qDebug() << "BarChartModel::removeData";
-                foreach(DataContainer* c, mDataModel) {
-                    if (c->mId == id) {
-                        mDataModel.removeOne(c);
-                        delete c;
-                emit modelUpdated();
             }
             void BarChartModel::addBarSet(QBarSet &set)
             {
-                DataContainer* c = new DataContainer(set.mValues,mRunningId);
+                mDataModel.append(&set);
-                mDataModel.append(c);
-                mRunningId++;
             }
             void BarChartModel::removeBarSet(QBarSet &set)
             {
-                // TODO:
+                mDataModel.removeOne(&set);
             }
-            int BarChartModel::countRows()
+            int BarChartModel::countSets()
             {
-            //    qDebug() << "BarChartModel::countRows";
                 return mDataModel.count();
             }
-            int BarChartModel::countColumns()
+            int BarChartModel::countCategories()
             {
-            //    qDebug() << "BarChartModel::countColumns";
                 int count(0);
                 for (int i=0; i<mDataModel.count(); i++){
                     // TODO: can we assume that all series have same number of values? If not. then which values are empty?
-                    int temp = mDataModel.at(i)->countColumns();
+                    int temp = mDataModel.at(i)->count();
                     if (temp > count) {
                         count = temp;
                     }
                 }
                 return count;
             }
             int BarChartModel::countTotalItems()
             {
-            //    qDebug() << "BarChartModel::countTotalItems";
+                int total = mDataModel.count() * countCategories();
-                int total = mDataModel.count() * countColumns();
                 return total;
             }
             qreal BarChartModel::min()
             {
-             //   qDebug() << "BarChartModel::min";
                 Q_ASSERT(mDataModel.count() > 0);
                 // TODO: make min and max members and update them when data changes.
                 // This is slower since they are checked every time, even if data is same since previous call.
                 qreal min = INT_MAX;
                 for (int i=0; i <mDataModel.count(); i++) {
-                    int itemCount = mDataModel.at(i)->countColumns();
+                    int itemCount = mDataModel.at(i)->count();
                     for (int j=0; j<itemCount; j++) {
                         qreal temp = mDataModel.at(i)->valueAt(j);
                         if (temp < min) {
                             min = temp;
                         }
                     }
                 }
                 return min;
             }
             qreal BarChartModel::max()
             {
-            //    qDebug() << "BarChartModel::max";
                 Q_ASSERT(mDataModel.count() > 0);
                 // TODO: make min and max members and update them when data changes.
                 // This is slower since they are checked every time, even if data is same since previous call.
                 qreal max = INT_MIN;
                 for (int i=0; i <mDataModel.count(); i++) {
-                    int itemCount = mDataModel.at(i)->countColumns();
+                    int itemCount = mDataModel.at(i)->count();
                     for (int j=0; j<itemCount; j++) {
                         qreal temp = mDataModel.at(i)->valueAt(j);
                         if (temp > max) {
                             max = temp;
                         }
                     }
                 }
                 return max;
             }
-            qreal BarChartModel::valueAt(int series, int item)
+            qreal BarChartModel::valueAt(int set, int category)
             {
-            //    qDebug() << "BarChartModel::valueAt" << series << item;
+                if ((set < 0) || (set >= mDataModel.count())) {
-                if ((series < 0) || (series >= mDataModel.count())) {
+                    // No set, no value.
-                    // No series, no value.
                     return 0;
-                } else if ((item < 0) || (item >= mDataModel.at(series)->countColumns())) {
+                } else if ((category < 0) || (category >= mDataModel.at(set)->count())) {
-                    // No item, no value.
+                    // No category, no value.
                     return 0;
                 }
-            //    qDebug() << "ValueAt" << series << item << "=" << mDataModel.at(series)->valueAt(item);
+                return mDataModel.at(set)->valueAt(category);
-                return mDataModel.at(series)->valueAt(item);
             }
-            qreal BarChartModel::columnSum(int column)
+            qreal BarChartModel::categorySum(int column)
             {
-            //    qDebug() << "BarChartModel::columnSum";
+                qreal sum(0);
-                int sum(0);
                 int count = mDataModel.count(); // Count rows
                 for (int row = 0; row < count; row++) {
-                    if (column < mDataModel.at(row)->countColumns()) {
+                    if (column < mDataModel.at(row)->count()) {
                         sum += mDataModel.at(row)->valueAt(column);
                     }
                 }
                 return sum;
             }
-            qreal BarChartModel::maxColumnSum()
+            qreal BarChartModel::maxCategorySum()
             {
-            //    qDebug() << "BarChartModel::maxColumnSum";
+                qreal max = INT_MIN;
-                int max = INT_MIN;
+                int count = countCategories();
-                int count = countColumns();
                 for (int col=0; col<count; col++) {
-                    int sum = columnSum(col);
+                    qreal sum = categorySum(col);
                     if (sum > max) {
                         max = sum;
                     }
                 }
                 return max;
             }
             #include "moc_barchartmodel_p.cpp"
             QTCOMMERCIALCHART_END_NAMESPACE

src/barchart/barchartmodel_p.h +10 -29

             #ifndef BARCHARTMODEL_H
             #define BARCHARTMODEL_H
             #include <QObject>
             #include "qchartglobal.h"
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
             // Model for bar chart. Internal class.
             // TODO: Implement as QAbstractItemModel?
             class QBarSet;
             class QBarCategory;
             class BarChartModel : public QObject //, public QAbstractItemModel
             {
                 Q_OBJECT
             public:
                 explicit BarChartModel(QBarCategory &category, QObject *parent = 0);
-                ~BarChartModel();
-                // TODO: remove these after add and remove QBarSet works.
-                int addData(QList<qreal> data);
-                void removeData(int id);
+                QBarCategory& category();
                 void addBarSet(QBarSet &set);
                 void removeBarSet(QBarSet &set);
-                int countRows();            // Number of series in model
+                int countSets();            // Number of sets in model
-                int countColumns();         // Maximum number of items in series
+                int countCategories();      // Number of categories
-                int countTotalItems();      // Total items in all series. Includes empty items.
+                int countTotalItems();      // Total items in all sets. Includes empty items.
-                qreal max();  // Maximum value of all series
+                qreal max();                // Maximum value of all sets
-                qreal min();  // Minimum value of all series
+                qreal min();                // Minimum value of all sets
-                qreal valueAt(int series, int item);
+                qreal valueAt(int set, int category);
-                qreal columnSum(int column);
+                qreal categorySum(int column);
-                qreal maxColumnSum();   // returns maximum sum of items in all columns.
+                qreal maxCategorySum();     // returns maximum sum of sets in all categories.
             signals:
                 void modelUpdated();
             public slots:
             private:
-                // Little helper class.
+                QList<QBarSet*> mDataModel;
-                class DataContainer {
-                    public:
-                        DataContainer(QList<qreal> data, int id) : mId(id), mData(data) {}
-                        int countColumns() { return mData.count(); }
-                        qreal valueAt(int item) { return mData.at(item); }
-                        int mId; // TODO: Is this needed?
-                    private:
-                        QList<qreal> mData;
-                };
-                // Owned. N series. each has a list of values.
-                QList<DataContainer*> mDataModel;
-                int mRunningId;
-                int mMaxColumns;    // longest series in datamodel
                 QBarCategory& mCategory;
             };
             QTCOMMERCIALCHART_END_NAMESPACE
             #endif // BARCHARTMODEL_H

src/barchart/barchartseries.cpp +10 0

             #include <QDebug>
             #include "barchartseries.h"
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
             BarChartSeries::BarChartSeries(QBarCategory &category, QObject *parent)
                 : BarChartSeriesBase(category, parent)
             {
             }
+            void BarChartSeries::addBarSet(QBarSet &set)
+            {
+                BarChartSeriesBase::addBarSet(set);
+            }
+            void BarChartSeries::removeBarSet(QBarSet &set)
+            {
+                BarChartSeriesBase::removeBarSet(set);
+            }
             #include "moc_barchartseries.cpp"
             QTCOMMERCIALCHART_END_NAMESPACE

src/barchart/barchartseries.h +5 0

             #ifndef BARCHARTSERIES_H
             #define BARCHARTSERIES_H
             #include <QList>
             #include <QAbstractItemModel>
             #include "barchartseriesbase.h"
             class BarGroup;
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
             // Container for series
             class QTCOMMERCIALCHART_EXPORT BarChartSeries : public BarChartSeriesBase
             {
                 Q_OBJECT
             public:
                 BarChartSeries(QBarCategory &category, QObject* parent=0);
                 // from BarChartSeriesBase
                 virtual QChartSeriesType type() const { return QChartSeries::SeriesTypeBar; }
+                void addBarSet(QBarSet &set);
+                void removeBarSet(QBarSet &set);
+            public Q_SLOTS:
             private:
                 BarGroup* mBarGroup;
             };
             QTCOMMERCIALCHART_END_NAMESPACE
             #endif // BARCHARTSERIES_H

src/barchart/barchartseriesbase.cpp +4 -17

             #include <limits.h>
             #include <QDebug>
             #include "barchartseriesbase.h"
             #include "bargroup.h"
             #include "barchartmodel_p.h"
             #include "qbarset.h"
+            #include "qbarcategory.h"
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
             BarChartSeriesBase::BarChartSeriesBase(QBarCategory &category, QObject *parent)
                 : QChartSeries(parent)
                 ,mModel(new BarChartModel(category, this))
             {
+                mLabels.append(category.items());
-            int BarChartSeriesBase::addData(QList<qreal> data)
-                return mModel->addData(data);
-            void BarChartSeriesBase::removeData(int id)
-                mModel->removeData(id);
-            void BarChartSeriesBase::setLabels(QList<QString> labels)
-                mLabels = labels;
             }
             void BarChartSeriesBase::addBarSet(QBarSet &set)
             {
                 mModel->addBarSet(set);
             }
             void BarChartSeriesBase::removeBarSet(QBarSet &set)
             {
                 mModel->removeBarSet(set);
             }
             qreal BarChartSeriesBase::min()
             {
                 return mModel->min();
             }
             qreal BarChartSeriesBase::max()
             {
                 return mModel->max();
             }
             int BarChartSeriesBase::countColumns()
             {
-                return mModel->countColumns();
+                return mModel->countCategories();
             }
             qreal BarChartSeriesBase::valueAt(int series, int item)
             {
             //    qDebug() << "BarChartSeriesBase::valueAt" << series << item;
                 return mModel->valueAt(series,item);
             }
             qreal BarChartSeriesBase::maxColumnSum()
             {
             //    qDebug() << "BarChartSeriesBase::maxColumnSum" << mModel->maxColumnSum();
-                return mModel->maxColumnSum();
+                return mModel->maxCategorySum();
             }
             BarChartModel& BarChartSeriesBase::model()
             {
                 return *mModel;
             }
             QString BarChartSeriesBase::label(int item)
             {
                 if ((item>=0) && (item < mLabels.count()))  {
                     return mLabels.at(item);
                 }
                 return QString("");
             }
             #include "moc_barchartseriesbase.cpp"
             QTCOMMERCIALCHART_END_NAMESPACE

src/barchart/barchartseriesbase.h +5 -8

             #ifndef BARCHARTSERIESBASE_H
             #define BARCHARTSERIESBASE_H
             #include <QList>
             #include <QAbstractItemModel>
             #include "qchartseries.h"
             #include "qchartglobal.h"
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
             class BarGroupBase;
             class BarChartModel;
             class QBarSet;
             class QBarCategory;
             // Container for series
             class QTCOMMERCIALCHART_EXPORT BarChartSeriesBase : public QChartSeries
             {
                 Q_OBJECT
             protected:
             //    BarChartSeriesBase(QObject* parent=0);
                 BarChartSeriesBase(QBarCategory &category, QObject* parent=0);
             public:
                 // from QChartSeries
                 virtual QChartSeriesType type() const { return QChartSeries::SeriesTypeInvalid; }
-                // TODO: These 3 will be removed.
+            protected:
-                int addData(QList<qreal> data);
+                // Used by derived series
-                void removeData(int id);
+                void addBarSet(QBarSet &set);
-                void setLabels(QList<QString> labels);
+                void removeBarSet(QBarSet &set);
-                // TODO: Expose these to user in derived class instead of here? Common implementation for all bar charts, but not visible to user
-                void addBarSet(QBarSet &set);        // Bob[1,5,6,2,15,4] first value goes to category 1 etc..
-                void removeBarSet(QBarSet &set);     //
+            public:
                 // These shouldn't be visible to chart series user. However, ChartDataSet needs to access them, and friends are evil.
                 qreal min();
                 qreal max();
                 int countColumns();     // Count items in one series.
                 qreal valueAt(int series, int item);
                 qreal maxColumnSum();
                 BarChartModel& model();
                 QString label(int item);
             signals:
                 void changed(int index);
             public Q_SLOTS:
             private:
                 BarChartModel* mModel;
                 QList<QString> mLabels;
             };
             QTCOMMERCIALCHART_END_NAMESPACE
             #endif // BARCHARTSERIESBASE_H

src/barchart/bargroup.cpp +3 -3

             #include "bargroup.h"
             #include "bar_p.h"
             #include "barlabel_p.h"
             #include <QDebug>
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
             BarGroup::BarGroup(BarChartSeries& series, QGraphicsItem *parent) :
                 BarGroupBase(series,parent)
             {
                 mBarDefaultWidth = 10;
             }
             void BarGroup::layoutChanged()
             {
             //    qDebug() << "BarGroup::layoutChanged";
                 // Scale bars to new layout
                 // Layout for bars:
-                if (mModel.countRows() <= 0) {
+                if (mModel.countSets() <= 0) {
                     return;
                 }
                 if (childItems().count() == 0) {
                     qDebug() << "WARNING: BarGroup::layoutChanged called before graphics items are created!";
                     return;
                 }
                 // TODO: better way to auto-layout?
                 // Use reals for accurancy (we might get some compiler warnings... :)
-                int itemCount = mModel.countColumns();
+                int itemCount = mModel.countCategories();
-                int seriesCount = mModel.countRows();
+                int seriesCount = mModel.countSets();
                 qreal tW = mWidth;
                 qreal tH = mHeight;
                 qreal tM = mModel.max();
                 qreal scale = (tH/tM);
                 qreal tC = itemCount+1;
                 qreal xStepPerSeries = (tW/tC);
                 // Scaling.
                 int itemIndex(0);
                 int labelIndex = itemCount * seriesCount;
                 for (int item=0; item < itemCount; item++) {
                     qreal xPos = xStepPerSeries * item + ((tW + mBarDefaultWidth*seriesCount)/(itemCount*2));
                     qreal yPos = mHeight;
                     for (int series = 0; series < seriesCount; series++) {
                         qreal barHeight = mModel.valueAt(series, item) * scale;
                         Bar* bar = reinterpret_cast<Bar*> (childItems().at(itemIndex));
                         // TODO: width settable per bar?
                         bar->resize(mBarDefaultWidth, barHeight);
                         bar->setColor(mColors.at(series));
                         bar->setPos(xPos, yPos-barHeight); // item*posStep+startPos + series * mBarDefaultWidth, mHeight);
                         itemIndex++;
                         xPos += mBarDefaultWidth;
                     }
                     // TODO: Layout for labels, remove magic number
                     xPos = xStepPerSeries * item + ((tW + mBarDefaultWidth*seriesCount)/(itemCount*2));
                     BarLabel* label = reinterpret_cast<BarLabel*> (childItems().at(labelIndex));
                     label->setPos(xPos, mHeight + 20);
                     labelIndex++;
                 }
                 mLayoutDirty = true;
             }
             QTCOMMERCIALCHART_END_NAMESPACE

src/barchart/bargroupbase.cpp +2 -2

             #include "bargroupbase.h"
             #include "bar_p.h"
             #include "barlabel_p.h"
             #include "separator_p.h"
             #include "barchartseriesbase.h"
             #include <QDebug>
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
             BarGroupBase::BarGroupBase(BarChartSeriesBase& series, QGraphicsItem *parent)
                 : ChartItem(parent)
                 ,mBarDefaultWidth(20) // TODO: remove hard coding, when we have layout code ready
                 ,mLayoutSet(false)
                 ,mLayoutDirty(true)
                 ,mSeparatorsVisible(true)
                 ,mModel(series.model())
                 ,mSeries(series)
             {
                 dataChanged();
             }
             void BarGroupBase::setSeparatorsVisible(bool visible)
             {
                 mSeparatorsVisible = visible;
             }
             void BarGroupBase::paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget)
             {
             //    qDebug() << "BarGroupBase::paint" << childItems().count();
                 if (!mLayoutSet) {
                     qDebug() << "BarGroupBase::paint called without layout set. Aborting.";
                     return;
                 }
             //    if (mLayoutDirty) {
                     // Layout or data has changed. Need to redraw.
                     foreach(QGraphicsItem* i, childItems()) {
                         i->paint(painter,option,widget);
                     }
             //    }
             }
             QRectF BarGroupBase::boundingRect() const
             {
                 return QRectF(0,0,mWidth,mHeight);
             }
             void BarGroupBase::setBarWidth( int w )
             {
                 mBarDefaultWidth = w;
             }
             int BarGroupBase::addColor( QColor color )
             {
             //    qDebug() << "BarGroupBase::addColor";
                 int colorIndex = mColors.count();
                 mColors.append(color);
                 return colorIndex;
             }
             void BarGroupBase::resetColors()
             {
             //    qDebug() << "BarGroupBase::resetColors";
                 mColors.clear();
             }
             void BarGroupBase::dataChanged()
             {
             //    qDebug() << "BarGroupBase::dataChanged";
                 // Delete old bars
                 foreach (QGraphicsItem* item, childItems()) {
                     delete item;
                 }
                 // Create new graphic items for bars
                 int totalItems = mModel.countTotalItems();  // mSeries.countTotalItems();
                 for (int i=0; i<totalItems; i++) {
                     Bar *bar = new Bar(this);
                     childItems().append(bar);
                 }
                 // TODO: labels from series. This creates just some example labels
-                int count = mModel.countColumns();    // mSeries.countColumns();
+                int count = mModel.countCategories();    // mSeries.countColumns();
                 for (int i=0; i<count; i++) {
                     BarLabel* label = new BarLabel(this);
             //        QString text("Label " + QString::number(i));
                     label->set(mSeries.label(i));
                     childItems().append(label);
                 }
-                count = mModel.countColumns() - 1;    // mSeries.countColumns() - 1; // There is one less separator than columns
+                count = mModel.countCategories() - 1;    // mSeries.countColumns() - 1; // There is one less separator than columns
                 for (int i=0; i<count; i++) {
                     Separator* sep = new Separator(this);
                     sep->setColor(QColor(255,0,0,255));     // TODO: color for separations from theme
                     childItems().append(sep);
                 }
                 // TODO: if (autolayout) { layoutChanged() } or something
                 mLayoutDirty = true;
             }
             //handlers
             void BarGroupBase::handleModelChanged(int index)
             {
                 qDebug() << "BarGroupBase::handleModelChanged" << index;
                 dataChanged();
             }
             void BarGroupBase::handleDomainChanged(const Domain& domain)
             {
             //    qDebug() << "BarGroupBase::handleDomainChanged";
                 // TODO: Figure out the use case for this.
                 // Affects the size of visible item, so layout is changed.
             //    layoutChanged();
             }
             void BarGroupBase::handleGeometryChanged(const QRectF& rect)
             {
             //    qDebug() << "BarGroupBase::handleGeometryChanged";
                 mWidth = rect.width();
                 mHeight = rect.height();
                 layoutChanged();
                 mLayoutSet = true;
                 setPos(rect.topLeft());
             }
             #include "moc_bargroupbase.cpp"
             QTCOMMERCIALCHART_END_NAMESPACE

src/barchart/percentbarchartseries.cpp +10 0

             #include "percentbarchartseries.h"
             #include <limits.h>
             #include <QDebug>
             #include "percentbarchartseries.h"
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
             PercentBarChartSeries::PercentBarChartSeries(QBarCategory &category, QObject *parent) :
                 BarChartSeriesBase(category, parent)
             {
             }
+            void PercentBarChartSeries::addBarSet(QBarSet &set)
+            {
+                BarChartSeriesBase::addBarSet(set);
+            }
+            void PercentBarChartSeries::removeBarSet(QBarSet &set)
+            {
+                BarChartSeriesBase::removeBarSet(set);
+            }
             #include "moc_percentbarchartseries.cpp"
             QTCOMMERCIALCHART_END_NAMESPACE

src/barchart/percentbarchartseries.h +3 0

             #ifndef PERCENTBARCHARTSERIES_H
             #define PERCENTBARCHARTSERIES_H
             #include <QList>
             #include <QAbstractItemModel>
             #include "barchartseriesbase.h"
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
             class PercentBarGroup;
             class QTCOMMERCIALCHART_EXPORT PercentBarChartSeries : public BarChartSeriesBase
             {
                 Q_OBJECT
             public:
                 PercentBarChartSeries(QBarCategory &category, QObject* parent=0);
                 // from BarChartSeriesBase
                 virtual QChartSeriesType type() const { return QChartSeries::SeriesTypePercentBar; }
+                void addBarSet(QBarSet &set);
+                void removeBarSet(QBarSet &set);
             public Q_SLOTS:
             private:
                 PercentBarGroup* mPercentBarGroup;
             };
             QTCOMMERCIALCHART_END_NAMESPACE
             #endif // PERCENTBARCHARTSERIES_H

src/barchart/percentbargroup.cpp +7 -7

             #include "percentbargroup.h"
             #include "bar_p.h"
             #include "barlabel_p.h"
             #include "separator_p.h"
             #include <QDebug>
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
             PercentBarGroup::PercentBarGroup(PercentBarChartSeries& series, QGraphicsItem *parent) :
                 BarGroupBase(series, parent)
             {
             }
             void PercentBarGroup::layoutChanged()
             {
                 // Scale bars to new layout
                 // Layout for bars:
-                if (mModel.countRows() <= 0) {
+                if (mModel.countSets() <= 0) {
                     // Nothing to do.
                     return;
                 }
                 if (childItems().count() == 0) {
                     qDebug() << "WARNING: PercentBarGroup::layoutChanged called before graphics items are created!";
                     return;
                 }
                 // TODO: better way to auto-layout
                 // Use reals for accurancy (we might get some compiler warnings... :)
-                int count = mModel.countColumns();
+                int count = mModel.countCategories();
                 int itemIndex(0);
                 qreal tW = mWidth;
                 qreal tC = count+1;
                 qreal xStep = (tW/tC);
                 qreal xPos = ((tW/tC) - mBarDefaultWidth / 2);
-                int labelIndex = mModel.countColumns() * mModel.countRows();
+                int labelIndex = mModel.countCategories() * mModel.countSets();
-                for (int column = 0; column < mModel.countColumns(); column++) {
+                for (int column = 0; column < mModel.countCategories(); column++) {
-                    qreal colSum = mModel.columnSum(column);
+                    qreal colSum = mModel.categorySum(column);
                     qreal h = mHeight;
                     qreal scale = (h / colSum);
                     qreal yPos = h;
-                    for (int row=0; row < mModel.countRows(); row++) {
+                    for (int row=0; row < mModel.countSets(); row++) {
                         qreal barHeight = mModel.valueAt(row, column) * scale;
                         Bar* bar = reinterpret_cast<Bar*> (childItems().at(itemIndex));
                         // TODO: width settable per bar?
                         bar->resize(mBarDefaultWidth, barHeight);
                         bar->setColor(mColors.at(row));
                         bar->setPos(xPos, yPos-barHeight);
                         itemIndex++;
                         yPos -= barHeight;
                     }
                     // TODO: Layout for labels, remove magic number
                     BarLabel* label = reinterpret_cast<BarLabel*> (childItems().at(labelIndex));
                     label->setPos(xPos, mHeight + 20);
                     labelIndex++;
                     xPos += xStep;
                 }
                 // Position separators
                 int separatorIndex = labelIndex;    // Separators are after labels in childItems(). TODO: better way to store these?
                 xPos = xStep + xStep/2;             // Initial position is between first and second group. ie one and half steps from left.
-                for (int s=0; s < mModel.countColumns() - 1; s++) {
+                for (int s=0; s < mModel.countCategories() - 1; s++) {
                     Separator* sep = reinterpret_cast<Separator*> (childItems().at(separatorIndex));
                     sep->setPos(xPos,0);
                     sep->setSize(QSizeF(1,mHeight));
                     xPos += xStep;
                     separatorIndex++;
                 }
                 mLayoutDirty = true;
             }
             QTCOMMERCIALCHART_END_NAMESPACE

src/barchart/qbarset.cpp +15 0

             #include "qbarset.h"
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
             QBarSet::QBarSet()
             {
             }
             void QBarSet::setName(QString name)
             {
                 mName = name;
             }
+            QString QBarSet::name()
+            {
+                return mName;
+            }
             QBarSet& QBarSet::operator << (const qreal &value)
             {
                 mValues.append(value);
                 return *this;
             }
+            int QBarSet::count()
+            {
+                return mValues.count();
+            }
+            qreal QBarSet::valueAt(int index)
+            {
+                return mValues.at(index);
+            }
             QTCOMMERCIALCHART_END_NAMESPACE

src/barchart/qbarset.h +7 -5

             #ifndef QBARSET_H
             #define QBARSET_H
             #include "qchartglobal.h"
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
             class QTCOMMERCIALCHART_EXPORT QBarSet // : pubclic QObject // TODO: Need for this?
             {
             public:
                 QBarSet();
                 void setName(QString name);
-            //    void setValues(QList<qreal> &values);
+                QString name();
-                // TODO:
                 QBarSet& operator << (const qreal &value);
-                // TODO: Hide these from user of QBarSet. (but data model needs access to these)
+                //TODO: What is the way to set a single value to n:th item? Is there need for such functionality?
-            public:
+                int count();
+                qreal valueAt(int index);
+            private:
                 QString mName;
                 QList<qreal> mValues;
             };
             QTCOMMERCIALCHART_END_NAMESPACE
             #endif // QBARSET_H

src/barchart/stackedbarchartseries.cpp +10 0

             #include <limits.h>
             #include <QDebug>
             #include "stackedbarchartseries.h"
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
             StackedBarChartSeries::StackedBarChartSeries(QBarCategory &category, QObject *parent) :
                 BarChartSeriesBase(category, parent)
             {
             }
+            void StackedBarChartSeries::addBarSet(QBarSet &set)
+            {
+                BarChartSeriesBase::addBarSet(set);
+            }
+            void StackedBarChartSeries::removeBarSet(QBarSet &set)
+            {
+                BarChartSeriesBase::removeBarSet(set);
+            }
             #include "moc_stackedbarchartseries.cpp"
             QTCOMMERCIALCHART_END_NAMESPACE

src/barchart/stackedbarchartseries.h +3 0

             #ifndef STACKEDBARCHARTSERIES_H
             #define STACKEDBARCHARTSERIES_H
             #include <QList>
             #include <QAbstractItemModel>
             #include "barchartseriesbase.h"
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
             class StackedBarGroup;
             class QTCOMMERCIALCHART_EXPORT StackedBarChartSeries : public BarChartSeriesBase
             {
                 Q_OBJECT
             public:
                 StackedBarChartSeries(QBarCategory &category, QObject* parent=0);
                 // from QChartSeries
                 virtual QChartSeriesType type() const { return QChartSeries::SeriesTypeStackedBar; }
+                void addBarSet(QBarSet &set);
+                void removeBarSet(QBarSet &set);
             public Q_SLOTS:
             private:
                 StackedBarGroup* mStackedBarGroup;
             };
             QTCOMMERCIALCHART_END_NAMESPACE
             #endif // STACKEDBARCHARTSERIES_H

src/barchart/stackedbargroup.cpp +8 -8

             #include "stackedbargroup.h"
             #include "bar_p.h"
             #include "barlabel_p.h"
             #include "separator_p.h"
             #include <QDebug>
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
             StackedBarGroup::StackedBarGroup(StackedBarChartSeries& series, QGraphicsItem *parent) :
                 BarGroupBase(series,parent)
             {
             }
             void StackedBarGroup::layoutChanged()
             {
             //    qDebug() << "StackedBarGroup::layoutChanged";
                 // Scale bars to new layout
                 // Layout for bars:
-                if (mModel.countRows() <= 0) {
+                if (mModel.countSets() <= 0) {
                     // Nothing to do.
                     return;
                 }
-                if (mModel.countColumns() == 0) {
+                if (mModel.countCategories() == 0) {
                     // Nothing to do
                     return;
                 }
                 if (childItems().count() == 0) {
                     qDebug() << "WARNING: StackedBarGroup::layoutChanged called before graphics items are created!";
                     return;
                 }
                 // TODO: better way to auto-layout
                 // Use reals for accurancy (we might get some compiler warnings... :)
                 // TODO: use temp variable for column count...
-                qreal maxSum = mModel.maxColumnSum();
+                qreal maxSum = mModel.maxCategorySum();
                 qreal h = mHeight;
                 qreal scale = (h / maxSum);
                 int itemIndex(0);
                 qreal tW = mWidth;
-                qreal tC = mModel.countColumns() + 1;
+                qreal tC = mModel.countCategories() + 1;
                 qreal xStep = (tW/tC);
                 qreal xPos = ((tW/tC) - mBarDefaultWidth / 2);
-                int labelIndex = mModel.countRows() * mModel.countColumns();
+                int labelIndex = mModel.countSets() * mModel.countCategories();
-                for (int column = 0; column < mModel.countColumns(); column++) {
+                for (int column = 0; column < mModel.countCategories(); column++) {
                     qreal yPos = h;
-                    for (int row=0; row < mModel.countRows(); row++) {
+                    for (int row=0; row < mModel.countSets(); row++) {
                         qreal barHeight = mModel.valueAt(row, column) * scale;
                         Bar* bar = reinterpret_cast<Bar*> (childItems().at(itemIndex));
                         bar->resize(mBarDefaultWidth, barHeight);
                         bar->setColor(mColors.at(row));
                         bar->setPos(xPos, yPos-barHeight);
                         itemIndex++;
                         yPos -= barHeight;
                     }
                     // TODO: Layout for labels, remove magic number
                     BarLabel* label = reinterpret_cast<BarLabel*> (childItems().at(labelIndex));
                     label->setPos(xPos, mHeight + 20);
                     labelIndex++;
                     xPos += xStep;
                 }
                 // Position separators
                 int separatorIndex = labelIndex;    // Separators are after labels in childItems(). TODO: better way to store these?
                 xPos = xStep + xStep/2;             // Initial position is between first and second group. ie one and half steps from left.
-                for (int s=0; s < mModel.countColumns() - 1; s++) {
+                for (int s=0; s < mModel.countCategories() - 1; s++) {
                     Separator* sep = reinterpret_cast<Separator*> (childItems().at(separatorIndex));
                     sep->setPos(xPos,0);
                     sep->setSize(QSizeF(1,mHeight));
                     xPos += xStep;
                     separatorIndex++;
                 }
                 mLayoutDirty = true;
             }
             QTCOMMERCIALCHART_END_NAMESPACE

test/chartwidgettest/mainwidget.cpp +51 -40

             #include "mainwidget.h"
             #include "dataseriedialog.h"
             #include "qchartseries.h"
             #include "qpieseries.h"
             #include <qlinechartseries.h>
+            #include <qbarset.h>
+            #include <qbarcategory.h>
             #include <barchartseries.h>
             #include <stackedbarchartseries.h>
             #include <percentbarchartseries.h>
             #include <QPushButton>
             #include <QComboBox>
             #include <QSpinBox>
             #include <QCheckBox>
             #include <QGridLayout>
             #include <QHBoxLayout>
             #include <QLabel>
             #include <QSpacerItem>
             #include <QMessageBox>
             #include <cmath>
             #include <QDebug>
             #include <QStandardItemModel>
             QTCOMMERCIALCHART_USE_NAMESPACE
             MainWidget::MainWidget(QWidget *parent) :
                 QWidget(parent)
             {
                 m_chartWidget = new QChartView(this);
                 m_chartWidget->setRubberBandPolicy(QChartView::HorizonalRubberBand);
                 // Grid layout for the controls for configuring the chart widget
                 QGridLayout *grid = new QGridLayout();
                 QPushButton *addSeriesButton = new QPushButton("Add series");
                 connect(addSeriesButton, SIGNAL(clicked()), this, SLOT(addSeries()));
                 grid->addWidget(addSeriesButton, 0, 1);
                 initBackroundCombo(grid);
                 initScaleControls(grid);
                 initThemeCombo(grid);
                 QCheckBox *zoomCheckBox = new QCheckBox("Drag'n drop Zoom");
                 connect(zoomCheckBox, SIGNAL(toggled(bool)), m_chartWidget, SLOT(setZoomEnabled(bool)));
                 zoomCheckBox->setChecked(true);
                 grid->addWidget(zoomCheckBox, grid->rowCount(), 0);
                 // add row with empty label to make all the other rows static
                 grid->addWidget(new QLabel(""), grid->rowCount(), 0);
                 grid->setRowStretch(grid->rowCount() - 1, 1);
                 // Another grid layout as a main layout
                 QGridLayout *mainLayout = new QGridLayout();
                 mainLayout->addLayout(grid, 0, 0);
                 // Init series type specific controls
                 initPieControls();
                 mainLayout->addLayout(m_pieLayout, 2, 0);
                 // Scatter series specific settings
             //    m_scatterLayout = new QGridLayout();
             //    m_scatterLayout->addWidget(new QLabel("scatter"), 0, 0);
             //    m_scatterLayout->setEnabled(false);
             //    mainLayout->addLayout(m_scatterLayout, 1, 0);
                 // Add layouts and the chart widget to the main layout
                 mainLayout->addWidget(m_chartWidget, 0, 1, 3, 1);
                 setLayout(mainLayout);
                 // force an update to test data
                 testDataChanged(0);
             }
             // Combo box for selecting the chart's background
             void MainWidget::initBackroundCombo(QGridLayout *grid)
             {
                 QComboBox *backgroundCombo = new QComboBox(this);
                 backgroundCombo->addItem("Color");
                 backgroundCombo->addItem("Gradient");
                 backgroundCombo->addItem("Image");
                 connect(backgroundCombo, SIGNAL(currentIndexChanged(int)),
                         this, SLOT(backgroundChanged(int)));
                 grid->addWidget(new QLabel("Background:"), grid->rowCount(), 0);
                 grid->addWidget(backgroundCombo, grid->rowCount() - 1, 1);
             }
             // Scale related controls (auto-scale vs. manual min-max values)
             void MainWidget::initScaleControls(QGridLayout *grid)
             {
                 m_autoScaleCheck = new QCheckBox("Automatic scaling");
                 connect(m_autoScaleCheck, SIGNAL(stateChanged(int)), this, SLOT(autoScaleChanged(int)));
                 // Allow setting also non-sense values (like -2147483648 and 2147483647)
                 m_xMinSpin = new QSpinBox();
                 m_xMinSpin->setMinimum(INT_MIN);
                 m_xMinSpin->setMaximum(INT_MAX);
                 m_xMinSpin->setValue(0);
                 connect(m_xMinSpin, SIGNAL(valueChanged(int)), this, SLOT(xMinChanged(int)));
                 m_xMaxSpin = new QSpinBox();
                 m_xMaxSpin->setMinimum(INT_MIN);
                 m_xMaxSpin->setMaximum(INT_MAX);
                 m_xMaxSpin->setValue(10);
                 connect(m_xMaxSpin, SIGNAL(valueChanged(int)), this, SLOT(xMaxChanged(int)));
                 m_yMinSpin = new QSpinBox();
                 m_yMinSpin->setMinimum(INT_MIN);
                 m_yMinSpin->setMaximum(INT_MAX);
                 m_yMinSpin->setValue(0);
                 connect(m_yMinSpin, SIGNAL(valueChanged(int)), this, SLOT(yMinChanged(int)));
                 m_yMaxSpin = new QSpinBox();
                 m_yMaxSpin->setMinimum(INT_MIN);
                 m_yMaxSpin->setMaximum(INT_MAX);
                 m_yMaxSpin->setValue(10);
                 connect(m_yMaxSpin, SIGNAL(valueChanged(int)), this, SLOT(yMaxChanged(int)));
                 grid->addWidget(m_autoScaleCheck, grid->rowCount(), 0);
                 grid->addWidget(new QLabel("x min:"), grid->rowCount(), 0);
                 grid->addWidget(m_xMinSpin, grid->rowCount() - 1, 1);
                 grid->addWidget(new QLabel("x max:"), grid->rowCount(), 0);
                 grid->addWidget(m_xMaxSpin, grid->rowCount() - 1, 1);
                 grid->addWidget(new QLabel("y min:"), grid->rowCount(), 0);
                 grid->addWidget(m_yMinSpin, grid->rowCount() - 1, 1);
                 grid->addWidget(new QLabel("y max:"), grid->rowCount(), 0);
                 grid->addWidget(m_yMaxSpin, grid->rowCount() - 1, 1);
                 m_autoScaleCheck->setChecked(true);
             }
             // Combo box for selecting theme
             void MainWidget::initThemeCombo(QGridLayout *grid)
             {
                 QComboBox *chartTheme = new QComboBox();
                 chartTheme->addItem("Default");
                 chartTheme->addItem("Vanilla");
                 chartTheme->addItem("Icy");
                 chartTheme->addItem("Grayscale");
                 chartTheme->addItem("Scientific");
                 chartTheme->addItem("Unnamed1");
                 connect(chartTheme, SIGNAL(currentIndexChanged(int)),
                         this, SLOT(changeChartTheme(int)));
                 grid->addWidget(new QLabel("Chart theme:"), 8, 0);
                 grid->addWidget(chartTheme, 8, 1);
             }
             void MainWidget::initPieControls()
             {
                 // Pie series specific settings
                 // Pie size factory
                 QDoubleSpinBox *pieSizeSpin = new QDoubleSpinBox();
                 pieSizeSpin->setMinimum(LONG_MIN);
                 pieSizeSpin->setMaximum(LONG_MAX);
                 pieSizeSpin->setValue(1.0);
                 pieSizeSpin->setSingleStep(0.1);
                 connect(pieSizeSpin, SIGNAL(valueChanged(double)), this, SLOT(setPieSizeFactor(double)));
                 // Pie position
                 QComboBox *piePosCombo = new QComboBox(this);
                 piePosCombo->addItem("Maximized");
                 piePosCombo->addItem("Top left");
                 piePosCombo->addItem("Top right");
                 piePosCombo->addItem("Bottom left");
                 piePosCombo->addItem("Bottom right");
                 connect(piePosCombo, SIGNAL(currentIndexChanged(int)),
                         this, SLOT(setPiePosition(int)));
                 m_pieLayout = new QGridLayout();
                 m_pieLayout->setEnabled(false);
                 m_pieLayout->addWidget(new QLabel("Pie size factor"), 0, 0);
                 m_pieLayout->addWidget(pieSizeSpin, 0, 1);
                 m_pieLayout->addWidget(new QLabel("Pie position"), 1, 0);
                 m_pieLayout->addWidget(piePosCombo, 1, 1);
             }
             void MainWidget::addSeries()
             {
                 DataSerieDialog dialog(m_defaultSeriesName, this);
                 connect(&dialog, SIGNAL(accepted(QString, QString)), this, SLOT(addSeries(QString, QString)));
                 dialog.exec();
             }
             void MainWidget::addSeries(QString series, QString data)
             {
                 qDebug() << "addSeries: " << series << " data: " << data;
                 m_defaultSeriesName = series;
                 // TODO: a dedicated data class for storing x and y values
                 QList<qreal> x;
                 QList<qreal> y;
-                QList<qreal> data0;
+                QBarSet set0;
-                QList<qreal> data1;
+                QBarSet set1;
-                QList<qreal> data2;
+                QBarSet set2;
-                QList<qreal> data3;
+                QBarSet set3;
-                QList<qreal> data4;
+                QBarSet set4;
                 if (data == "linear") {
                     for (int i = 0; i < 20; i++) {
                         x.append(i);
                         y.append(i);
                     }
                 } else if (data == "linear, 1M") {
                     // 1 million data points from 0.0001 to 100
                     // TODO: What is the requirement? Should we be able to show this kind of data with
                     // reasonable performance, or can we expect the application developer to do "data mining"
                     // for us, so that the count of data points given to QtCommercial Chart is always
                     // reasonable?
                     for (qreal i = 0; i < 100; i += 0.0001) {
                         x.append(i);
                         y.append(20);
                     }
                 } else if (data == "SIN") {
                     for (int i = 0; i < 100; i++) {
                         x.append(i);
                         y.append(abs(sin(3.14159265358979 / 50 * i) * 100));
                     }
                 } else if (data == "SIN + random") {
                     for (qreal i = 0; i < 100; i += 0.1) {
                         x.append(i + (rand() % 5));
                         y.append(abs(sin(3.14159265358979 / 50 * i) * 100) + (rand() % 5));
                     }
                 } else if (data == "Table, 5 series"){
-                    // Create some test data to chart
+                     // Create some test data to chart
-                    data0 << 1 << 2 << 3 << 4 << 5 << 6 << 7 << 8 << 9 << 10 << 5;
+                    set0 << 1 << 2 << 3 << 4 << 5 << 6 << 7 << 8 << 9 << 10 << 11 << 12;
-                    data1 << 5 << 0 << 0 << 4 << 0 << 7 << 8 << 9 << 9 << 0 << 4;
+                    set1 << 5 << 0 << 0 << 4 << 0 << 7 << 8 << 9 << 9 << 0 << 4 << 2;
-                    data2 << 3 << 5 << 8 << 13 << 8 << 5 << 3 << 2 << 1 << 1 << 3;
+                    set2 << 3 << 5 << 8 << 13 << 8 << 5 << 3 << 2 << 1 << 1 << 3 << 5;
-                    data3 << 5 << 6 << 7 << 3 << 4 << 5 << 8 << 9 << 10 << 5 << 2;
+                    set3 << 5 << 6 << 7 << 3 << 4 << 5 << 8 << 9 << 10 << 5 << 2 << 7;
-                    data4 << 9 << 7 << 5 << 3 << 1 << 2 << 4 << 6 << 8 << 10 << 1;
+                    set4 << 9 << 7 << 5 << 3 << 1 << 2 << 4 << 6 << 8 << 10 << 1 << 6;
                 } else {
                     // TODO: check if data has a valid file name
                     Q_ASSERT(false);
                 }
                 // TODO: color of the series
                 QChartSeries *newSeries = 0;
                 if (series == "Scatter") {
                     newSeries = m_chartWidget->createSeries(QChartSeries::SeriesTypeScatter);
                     Q_ASSERT(newSeries->setData(x, y));
                 } else if (series == "Pie") {
                     newSeries = m_chartWidget->createSeries(QChartSeries::SeriesTypePie);
                     Q_ASSERT(newSeries->setData(y));
                 } else if (series == "Line") {
                     // TODO: adding data to an existing line series does not give any visuals for some reason
             //        newSeries = m_chartWidget->createSeries(QChartSeries::SeriesTypeLine);
             //        QXYChartSeries *lineSeries = static_cast<QXYChartSeries *>(newSeries);
             //        lineSeries->setColor(Qt::blue);
             //        for (int i(0); i < x.count() && i < y.count(); i++) {
             //            lineSeries->add(x.at(i), y.at(i));
             //        }
                     //Q_ASSERT(newSeries->setData(x, y));
                     QLineChartSeries* series0 = new QLineChartSeries();
                     for (int i(0); i < x.count() && i < y.count(); i++)
                         series0->add(x.at(i), y.at(i));
                     m_chartWidget->addSeries(series0);
                     newSeries = series0;
                 } else if (series == "Bar") {
                     qDebug() << "Bar chart series";
-                    BarChartSeries* series0 = new BarChartSeries(this);
-                    series0->addData(data0);
+                    QBarCategory category;
-                    series0->addData(data1);
+                    category << "Jan" << "Feb" << "Mar" << "Apr" << "May" << "June" << "Jul" << "Aug" << "Sep" << "Oct" << "Nov" << "Dec";
-                    series0->addData(data2);
-                    series0->addData(data3);
+                    BarChartSeries* series0 = new BarChartSeries(category, this);
-                    series0->addData(data4);
-                    QList<QString> labels;
+                    series0->addBarSet(set0);
-                    labels << "Jan" << "Feb" << "Mar" << "Apr" << "May" << "June" << "Jul" << "Aug" << "Sep" << "Nov" << "Dec";
+                    series0->addBarSet(set1);
-                    series0->setLabels(labels);
+                    series0->addBarSet(set2);
+                    series0->addBarSet(set3);
+                    series0->addBarSet(set4);
                     m_chartWidget->addSeries(series0);
                     newSeries = series0;
                 } else if (series == "StackedBar") {
-                    qDebug() << "Bar chart series";
+                    qDebug() << "Stacked bar chart series";
-                    StackedBarChartSeries* series0 = new StackedBarChartSeries(this);
-                    series0->addData(data0);
+                    QBarCategory category;
-                    series0->addData(data1);
+                    category << "Jan" << "Feb" << "Mar" << "Apr" << "May" << "June" << "Jul" << "Aug" << "Sep" << "Oct" << "Nov" << "Dec";
-                    series0->addData(data2);
-                    series0->addData(data3);
+                    StackedBarChartSeries* series0 = new StackedBarChartSeries(category, this);
-                    series0->addData(data4);
-                    QList<QString> labels;
+                    series0->addBarSet(set0);
-                    labels << "Jan" << "Feb" << "Mar" << "Apr" << "May" << "June" << "Jul" << "Aug" << "Sep" << "Nov" << "Dec";
+                    series0->addBarSet(set1);
-                    series0->setLabels(labels);
+                    series0->addBarSet(set2);
+                    series0->addBarSet(set3);
+                    series0->addBarSet(set4);
                     m_chartWidget->addSeries(series0);
                     newSeries = series0;
                 } else if (series == "PercentBar") {
-                    qDebug() << "Bar chart series";
+                    qDebug() << "Percent bar chart series";
-                    PercentBarChartSeries* series0 = new PercentBarChartSeries(this);
-                    series0->addData(data0);
+                    QBarCategory category;
-                    series0->addData(data1);
+                    category << "Jan" << "Feb" << "Mar" << "Apr" << "May" << "June" << "Jul" << "Aug" << "Sep" << "Oct" << "Nov" << "Dec";
-                    series0->addData(data2);
-                    series0->addData(data3);
+                    PercentBarChartSeries* series0 = new PercentBarChartSeries(category, this);
-                    series0->addData(data4);
-                    QList<QString> labels;
+                    series0->addBarSet(set0);
-                    labels << "Jan" << "Feb" << "Mar" << "Apr" << "May" << "June" << "Jul" << "Aug" << "Sep" << "Nov" << "Dec";
+                    series0->addBarSet(set1);
-                    series0->setLabels(labels);
+                    series0->addBarSet(set2);
+                    series0->addBarSet(set3);
+                    series0->addBarSet(set4);
                     m_chartWidget->addSeries(series0);
                     newSeries = series0;
                 } else {
                     qDebug() << "Something weird going on in MainWidget::addSeries";
                 }
                 setCurrentSeries(newSeries);
             }
             void MainWidget::setCurrentSeries(QChartSeries *series)
             {
                 m_currentSeries = series;
                 switch (m_currentSeries->type()) {
                 case QChartSeries::SeriesTypeLine:
                     break;
                 case QChartSeries::SeriesTypeScatter:
                     break;
                 case QChartSeries::SeriesTypePie:
                     break;
                 case QChartSeries::SeriesTypeBar:
                     qDebug() << "setCurrentSeries (bar)";
                     break;
                 case QChartSeries::SeriesTypeStackedBar:
                     qDebug() << "setCurrentSeries (Stackedbar)";
                     break;
                 case QChartSeries::SeriesTypePercentBar:
                     qDebug() << "setCurrentSeries (Percentbar)";
                     break;
                 default:
                     Q_ASSERT(false);
                     break;
                 }
             }
             void MainWidget::testDataChanged(int itemIndex)
             {
                 qDebug() << "testDataChanged: " << itemIndex;
             //    switch (itemIndex) {
             //    case 0: {
             //        QList<QChartDataPoint> data;
             //        for (int x = 0; x < 20; x++) {
             //            data.append(QChartDataPoint() << x << x / 2);
             //        }
             //        m_chartWidget->setData(data);
             //        break;
             //    }
             //    case 1: {
             //        QList<QChartDataPoint> data;
             //        for (int x = 0; x < 100; x++) {
             //            data.append(QChartDataPoint() << x - 200 << 2 * (uint(sin(3.14159/50*x)*80) % 100));
             //        }
             //        m_chartWidget->setData(data);
             //        break;
             //    }
             //    case 2: {
             //        QList<QChartDataPoint> data;
             //        for (int x = 0; x < 1000; x++) {
             //            data.append(QChartDataPoint() << x - 200 << 2 * (uint(sin(3.14159/50*x)*80) % 100) + (rand() % 100 * 0.2));
             //            data.append(QChartDataPoint() << x - 200 << 2 * (uint(sin(3.14159/50*x)*80) % 100) + (rand() % 100 * 0.2));
             //            data.append(QChartDataPoint() << x - 200 << 2 * (uint(sin(3.14159/50*x)*80) % 100) + (rand() % 100 * 0.2));
             //        }
             //        m_chartWidget->setData(data);
             //        break;
             //    }
             //    default:
             //        break;
             //    }
             }
             void MainWidget::backgroundChanged(int itemIndex)
             {
                 qDebug() << "backgroundChanged: " << itemIndex;
             }
             void MainWidget::autoScaleChanged(int value)
             {
                 if (value) {
                     // TODO: enable auto scaling
                 } else {
                     // TODO: set scaling manually (and disable auto scaling)
                 }
                 m_xMinSpin->setEnabled(!value);
                 m_xMaxSpin->setEnabled(!value);
                 m_yMinSpin->setEnabled(!value);
                 m_yMaxSpin->setEnabled(!value);
             }
             void MainWidget::xMinChanged(int value)
             {
                 qDebug() << "xMinChanged: " << value;
             }
             void MainWidget::xMaxChanged(int value)
             {
                 qDebug() << "xMaxChanged: " << value;
             }
             void MainWidget::yMinChanged(int value)
             {
                 qDebug() << "yMinChanged: " << value;
             }
             void MainWidget::yMaxChanged(int value)
             {
                 qDebug() << "yMaxChanged: " << value;
             }
             void MainWidget::changeChartTheme(int themeIndex)
             {
                 qDebug() << "changeChartTheme: " << themeIndex;
                 m_chartWidget->setChartTheme((QChart::ChartTheme) themeIndex);
                 //TODO: remove this hack. This is just to make it so that theme change is seen immediately.
                 QSize s = size();
                 s.setWidth(s.width()+1);
                 resize(s);
             }
             void MainWidget::setPieSizeFactor(double size)
             {
                 QPieSeries *pie = qobject_cast<QPieSeries *>(m_currentSeries);
                 if (pie)
                     pie->setSizeFactor(qreal(size));
             }
             void MainWidget::setPiePosition(int position)
             {
                 QPieSeries *pie = qobject_cast<QPieSeries *>(m_currentSeries);
                 if (pie)
                     pie->setPosition((QPieSeries::PiePosition) position);
             }

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